X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=autoconfig.functions;h=47fcc119fe9ba3cd258ea30856ffb6b89c1e7f3c;hb=28c2a31c8e74fdecbacfec3934ef7c4f3e584d67;hp=2c75fdda4df437958b5e49a850dd61f75b05a713;hpb=cd68869e72d137823298bc6b10eb76948b237f6d;p=grml-autoconfig.git

diff --git a/autoconfig.functions b/autoconfig.functions
index 2c75fdd..47fcc11 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(){
@@ -1391,8 +1379,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
   if [ -z "$INSTALLED" ] ; then
    WINDOWMANAGER="$(getbootparam 'startx' 2>>$DEBUG)"
    if [ -z "$WINDOWMANAGER" ] ; then
-     einfo "No window manager specified. Taking ${WHITE}wm-ng${NORMAL} as default." && eend 0
-     WINDOWMANAGER="wm-ng"
+     einfo "No window manager specified. Using default one." && eend 0
    else
      einfo "Window manager ${WHITE}${WINDOWMANAGER}${NORMAL} found as bootoption." && eend 0
    fi
@@ -1400,7 +1387,7 @@ if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
    config_userfstab || fstabuser='grml'
  cat>|/etc/init.d/xstartup<<EOF
 #!/bin/sh
-su $fstabuser -c "/usr/bin/grml-x $WINDOWMANAGER"
+su $fstabuser -c "/usr/bin/grml-x"
 EOF
    chmod 755 /etc/init.d/xstartup