Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

This commit is contained in:
udeved 2015-06-25 11:22:28 +02:00
commit fffa6f85b7

View file

@ -343,6 +343,12 @@ configure_sysctl(){
fi
}
# Remove pamac auto-update when the network is up, it causes problems when booting in the livecd
# $1: chroot
configure_pamac_live() {
rm -f $1/etc/NetworkManager/dispatcher.d/99_update_pamac_tray
}
configure_root_image(){
msg "Configuring [root-image]"
configure_lsb "$1"
@ -369,6 +375,7 @@ configure_livecd_image(){
configure_services_live "$1"
configure_calamares "$1"
configure_thus "$1"
configure_pamac_live "$1"
msg "Done configuring [livecd-image]"
}