Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel
This commit is contained in:
commit
b3b27b358b
3 changed files with 9 additions and 0 deletions
|
@ -146,3 +146,10 @@ configure_thus(){
|
||||||
chmod a+x $1/home/${username}/Desktop/thus.desktop
|
chmod a+x $1/home/${username}/Desktop/thus.desktop
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configure_cli(){
|
||||||
|
if [[ -f $1/usr/bin/setup ]];then
|
||||||
|
msg2 "Configuring cli-installer ..."
|
||||||
|
chmod a+x $1/etc/skel/Desktop/installer-launcher-cli.desktop
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
|
@ -145,6 +145,7 @@ configure_livecd_image(){
|
||||||
configure_services_live "$1"
|
configure_services_live "$1"
|
||||||
configure_calamares "$1"
|
configure_calamares "$1"
|
||||||
configure_thus "$1"
|
configure_thus "$1"
|
||||||
|
configure_cli "$1"
|
||||||
msg "Done configuring [livecd-image]"
|
msg "Done configuring [livecd-image]"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
[[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh
|
[[ -r /opt/livecd/util.sh ]] && source /opt/livecd/util.sh
|
||||||
|
[[ -r /opt/livecd/util-livecd.sh ]] && source /opt/livecd/util-livecd.sh
|
||||||
|
|
||||||
USENONFREE="$(kernel_cmdline nonfree no)"
|
USENONFREE="$(kernel_cmdline nonfree no)"
|
||||||
VIDEO="$(kernel_cmdline xdriver no)"
|
VIDEO="$(kernel_cmdline xdriver no)"
|
||||||
|
|
Loading…
Reference in a new issue