update of config_language and config_local_net

diff --git a/autoconfig.functions b/autoconfig.functions
index 40ad6b3..1e6798a 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.

-# Latest change: Mon Feb 19 18:59:09 CET 2007 [mika]
+# Latest change: Sam Mär 17 23:52:56 CET 2007 [mika]

 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh


@@ -261,6 +261,7 @@ config_language(){
    [[ "$KKEYBOARD" == 'at' ]] && KEYTABLE=de-latin1-nodeadkeys
 
    # write keyboard related variables to file for later use
    [[ "$KKEYBOARD" == 'at' ]] && KEYTABLE=de-latin1-nodeadkeys
 
    # write keyboard related variables to file for later use

+   [ -d /etc/sysconfig ] || mkdir /etc/sysconfig

    echo "KEYTABLE=\"$KEYTABLE\""          > /etc/sysconfig/keyboard
    echo "XKEYBOARD=\"$XKEYBOARD\""       >> /etc/sysconfig/keyboard
    echo "KDEKEYBOARD=\"$KDEKEYBOARD\""   >> /etc/sysconfig/keyboard
    echo "KEYTABLE=\"$KEYTABLE\""          > /etc/sysconfig/keyboard
    echo "XKEYBOARD=\"$XKEYBOARD\""       >> /etc/sysconfig/keyboard
    echo "KDEKEYBOARD=\"$KDEKEYBOARD\""   >> /etc/sysconfig/keyboard


@@ -514,7 +515,11 @@ done
 # {{{ Bring up loopback interface now
 config_local_net(){
  if [ -z "$INSTALLED" ] ; then
 # {{{ Bring up loopback interface now
 config_local_net(){
  if [ -z "$INSTALLED" ] ; then

-    grep -q lo=lo /etc/network/run/ifstate 2>/dev/null || ifup lo
+    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
 }
 # }}}
  fi
 }
 # }}}

diff --git a/debian/changelog b/debian/changelog
index 2f5422b..78d61a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 grml-autoconfig (0.6.20) unstable; urgency=low
 
   * Add rsync to depends.
 grml-autoconfig (0.6.20) unstable; urgency=low
 
   * Add rsync to depends.

+  * config_language(): make sure /etc/sysconfig exists
+  * config_local_net(): check for entry in /etc/network/interfaces
+    before using ifup, fall back to ifconfig otherwise

 
  -- Michael Prokop <mika@grml.org>  Sat, 17 Mar 2007 23:48:12 +0100
 
 
  -- Michael Prokop <mika@grml.org>  Sat, 17 Mar 2007 23:48:12 +0100