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

This commit is contained in:
udeved 2015-01-26 19:59:34 +01:00
commit 8da4a757d4

View file

@ -63,14 +63,6 @@ configure_calamares_live
[[ -e "/etc/skel/Manjaro/Beginner_User_Guide.pdf" ]] && ln -sf \
/etc/skel/Manjaro/Beginner_User_Guide.pdf "/home/${username}/Desktop/Beginner User Guide.pdf"
# disable network (workaround for lightdm)
if [[ -d /run/systemd ]] && [[ -e "/usr/bin/lightdm" ]]; then
for eth in $(ifconfig | grep ': ' | cut -d: -f1); do
ifconfig $eth down
echo "$eth" >> /tmp/ifconfig.devices
done
fi
configure_alsa_live "${DESTDIR}"
# save settings