From 29e7a5429ab9111be4fc634c6007220ae1dcc118 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Tue, 6 Dec 2011 14:58:58 +0100 Subject: [PATCH] Remove local_net as it is done by ifupdown nowadays --- autoconfig | 1 - autoconfig.functions | 12 ------------ grml-autoconfig | 2 -- 3 files changed, 15 deletions(-) diff --git a/autoconfig b/autoconfig index 29a6d67..620d9d2 100644 --- a/autoconfig +++ b/autoconfig @@ -70,7 +70,6 @@ CONFIG_HOSTNAME='yes' # set hostname to 'grml' on systems running from C CONFIG_KERNEL='yes' # display information on running kernel CONFIG_LANGUAGE='yes' # allow language specification via commandline CONFIG_LD_MOD='yes' # run ldconfig and depmod on systems running from harddisk; remove /etc/grml.first.boot for forcing -CONFIG_LOCAL_NET='yes' # bring up loopback interface CONFIG_LOG='yes' # DEBUG=/dev/null or logfile int /tmp/... CONFIG_LVM='yes' # logical volume setup CONFIG_MIXER='yes' # set audio volumes [only in live-cd mode relevant, except for bootoption nosound] diff --git a/autoconfig.functions b/autoconfig.functions index 2c75fdd..2f7e313 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -613,18 +613,6 @@ fi } # }}} -# {{{ Bring up loopback interface now -config_local_net(){ - if [ -z "$INSTALLED" ] ; then - if grep -q 'iface lo inet loopback' /etc/network/interfaces 2>/dev/null ; then - grep -q lo=lo /etc/network/run/ifstate 2>/dev/null || ifup lo - else - ifconfig lo up - fi - fi -} -# }}} - # {{{ copy passwd-lockfile to ramdisk (fix unionfs-behaviour) # otherwise we will get: passwd: Authentication token lock busy config_fix_passwd(){ diff --git a/grml-autoconfig b/grml-autoconfig index 1383981..c561418 100755 --- a/grml-autoconfig +++ b/grml-autoconfig @@ -116,8 +116,6 @@ checkvalue $CONFIG_LVM && config_lvm # No kernel messages while probing modules echo "0" > /proc/sys/kernel/printk -checkvalue $CONFIG_LOCAL_NET && config_local_net - checkvalue $CONFIG_TESTCD && config_testcd checkvalue $CONFIG_MODULES && config_modules -- 2.1.4