X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=3a8dca903f03e59efb51d1dce7919bf2f903c955;hp=3ae79ee12f32140e5e662aa3e10644a16620f712;hb=430c060be15f60f508428edbc03ea70d9bf04399;hpb=583bdc68b6d5b31dd4bdcfec918405c5ac01d1e1 diff --git a/chroot-script b/chroot-script index 3ae79ee..3a8dca9 100755 --- a/chroot-script +++ b/chroot-script @@ -414,25 +414,6 @@ EOF } # }}} -# set up /etc/network/interfaces {{{ -interfaces() { - if ! [ -r /etc/network/interfaces ] || ! grep -q "auto lo" /etc/network/interfaces ; then - echo "Setting up /etc/network/interfaces" - cat >> /etc/network/interfaces << EOF - -# loopback device: -iface lo inet loopback -auto lo - -# eth0: -# iface eth0 inet dhcp -# auto eth0 - -EOF - fi -} -# }}} - # set default locales {{{ default_locales() { if [ -n "$DEFAULT_LOCALES" ] ; then @@ -442,7 +423,7 @@ default_locales() { return 0 fi - /usr/sbin/update-locale LANG="$DEFAULT_LOCALES" + /usr/sbin/update-locale LANGUAGE="$DEFAULT_LANGUAGE" LANG="$DEFAULT_LOCALES" fi } # }}} @@ -626,7 +607,7 @@ trap signal_handler HUP INT QUIT TERM install_policy_rcd for i in chrootmirror grmlrepos backportrepos kernelimg_conf \ - kernel packages extrapackages reconfigure hosts interfaces \ + kernel packages extrapackages reconfigure hosts \ default_locales timezone fstab hostname initrd grub_install passwords \ custom_scripts upgrade_system remove_apt_cache services \ remove_chrootmirror; do