From 3bd54055f8885dfe17639fca06c772ff6c4ec3a2 Mon Sep 17 00:00:00 2001
From: Nico Dietrich
Date: Thu, 26 Jan 2006 21:59:47 +0000
Subject: einige bugfixes

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@44 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/distro-specs/suse/functions-10.0   |  4 ++--
 initrd/distro-specs/suse/functions-9.3    | 12 ++++++------
 initrd/distro-specs/ubuntu/functions-5.10 | 10 +++++-----
 initrd/initrd-stuff/bin/hwautocfg         |  6 +++---
 initrd/initrd-stuff/etc/functions         |  2 +-
 initrd/initrd-stuff/init                  |  9 ++++++---
 6 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'initrd')

diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index eee06b52..449a552b 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -15,8 +15,8 @@
 config_acpi () {
 local start_acpi=10
 local stop_acpi=12
-local start_powersave=`expr $1 + 5`
-local stop_powersave=`expr $1 - 1`
+local start_powersave=11
+local stop_powersave=11
 rllinker acpid "$start_acpi" "$stop_acpi"
 rllinker powersaved "$start_powersave" "$stop_powersave"
 }
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 88fa7f59..f9d2ef63 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -35,8 +35,8 @@ done
 # second stop
 # function for ntp configuration
 config_ntp () {
-local start=$1
-local stop=$2
+local start="07"
+local stop="14"
 if [ -f /mnt/etc/init.d/ntp ] ; then
   strinfile "ntp:" /mnt/etc/passwd || \
     echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
@@ -56,7 +56,7 @@ fi
 # function for atd
 config_atd () {
 if [ "x$start_atd" = "xyes" ]; then
-  rllinker "atd" "$1" "$2"
+  rllinker "atd" "14" "04"
 fi
 }
 
@@ -88,7 +88,7 @@ if [ "x$start_syslog" = "xyes" ] ; then
     sed -e "s,.*dhcp/dev.*,," -e "s,.*named/dev.*,," \
       /mnt/etc/syslog-ng/syslog-ng.conf >> /etc/syslog-ng.conf
       cp /etc/syslog-ng.conf /mnt/etc/syslog-ng/syslog-ng.conf
-      rllinker syslog "$1" "$2"
+      rllinker syslog "02" "20"
   fi
 fi
 }
@@ -98,7 +98,7 @@ config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/sshd ] ; then
     testmkd /mnt/var/lib/sshd; testmkd /mnt/var/lib/empty
-    rllinker "sshd" "$1" "$2"
+    rllinker "sshd" "12" "10"
   fi
 fi
 }
@@ -107,7 +107,7 @@ fi
 config_snmp () {
 if [ "x$start_snmp" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/snmpd ] ; then
-    rllinker "snmpd" "$1" "$2"
+    rllinker "snmpd" "24" "02"
     testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
   fi
     # fixme!!
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 02d696f1..48b7cd9b 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -34,8 +34,8 @@ done
 # second stop
 # function for ntp configuration
 config_ntp () {
-local start=$1
-local stop=$2
+local start=07
+local stop=14
 if [ -f /mnt/etc/init.d/ntp ] ; then
   echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
     >>/mnt/etc/passwd
@@ -54,7 +54,7 @@ fi
 # function for atd
 config_atd () {
 if [ "x$start_atd" = "xyes" ]; then
-  rllinker "atd" "$1" "$2"
+  rllinker "atd" "14" "04"
 fi
 }
 
@@ -87,7 +87,7 @@ config_sshd () {
 if [ "x$start_sshd" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/sshd ] ; then
     testmkd /mnt/var/lib/sshd; testmkd /mnt/var/lib/empty
-    rllinker "sshd" "$1" "$2"
+    rllinker "sshd" "12" "10"
   fi
 fi
 }
@@ -96,7 +96,7 @@ fi
 config_snmp () {
 if [ "x$start_snmp" = "xyes" ] ; then
   if [ -f /mnt/etc/init.d/snmpd ] ; then
-    rllinker "snmpd" "$1" "$2"
+    rllinker "snmpd" "24" "02"
     testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
   fi
     # fixme!!
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index 392ab93b..d722015e 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -174,8 +174,8 @@ for section in Files ServerFlags Module InputDevice Monitor \
       echo -e ${ServerFlags} >>$xfc
     ;;
     Device)
-      echo -e ${Device} | sed -e "s,XMODULE,${XMODULE},g" \
-        -e "s,XDESC,${XDESC}," >>$xfc
+      echo -e ${Device} | \
+        sed -e "s,XMODULE,${XMODULE}," -e "s%XDESC%${XDESC}%" >>$xfc
             # special options may be needed for some drivers
             [ $DEBUGLEVEL -gt 1 ] && msg "X setup" \
 "adding for some Xfree86 modules \
@@ -303,7 +303,7 @@ waitfor /tmp/hwrun1 50000 || \
 Please check that\n  hwsetup is properly installed and executable."
 
 # "drivers" (pseudo, placeholder strings, ...) to exclude from loading
-DRIVERLIST="disabled unknown ignore pcspkr synaptics"
+DRIVERLIST="disabled unknown ignore pcspkr synaptics keybdev"
 # driver blacklist (real modules which fail to load)
 DRIVERLIST=${DRIVERLIST}" hw_random"
 # check for USB, pcmcia and ieee1394 hardware drivers
diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions
index 15237680..586c1854 100644
--- a/initrd/initrd-stuff/etc/functions
+++ b/initrd/initrd-stuff/etc/functions
@@ -31,7 +31,7 @@ if [ -n "$2" ] ; then
     echo -e "$message  This error is not fatal - continuing ...\n"
   [ "$DEBUGLEVEL" -gt 2 ] && usleep 20
 else
-  echo -e "Running shell for debugging purposes now ...\n"
+  echo -e "$message  Running shell for debugging purposes now ...\n"
   /bin/sh
 fi
 }
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index a81bbcb1..4f9333ac 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -113,8 +113,8 @@ in $0\ncountry=\"${COUNTRY}\"" >> /etc/machine-setup
     tmpfssize=*)
       TMPFSSIZE=${opts#tmpfssize=};;
     # vendor code identifier for dhcp requests
-    vci=*|VCI=*)
-      VCI=${opts#VCI=};;
+    vci=*)
+      VCI=${opts#vci=};;
   esac
 done
 # check if at least one type of IP configuration is availabe
@@ -190,6 +190,10 @@ echo "dhcp:x:101:" > /etc/group
 if [ -n "$noipyet" ] ; then
   waitfor /tmp/dhcp-done 20000
   . /etc/machine-setup
+  [ -z "$clientip" -o -z "$subnet_mask" -o -z "$gateway" \
+    -o -z "$broadcast_address" ] && error "  Did not get complete IP \
+configuration via DHCP. You may want to add\n  a vendor code identifier \
+via kernel commandline (vci=VCI)."
   ipsetup $clientip $subnet_mask $gateway $broadcast_address eth0
 fi
 [ -n "$LDAP" ] && ldapconf &
@@ -377,7 +381,6 @@ and list the modules loaded until\n  now."
 waitfor /tmp/svcfg 20000 || error "  For some reason the software config \
 of this client did not finish in\n  time. You might check the process list \
 and list the modules loaded until\n  now."
-bash
 # IP configuration is made and should not be updated automatically
 killall -9 dhcpcd dhclient pump 2>/dev/null
 # unmount the bind mounted modules directory
-- 
cgit v1.2.3-55-g7522