dhclient schreibt jetzt Konfiguration sauber nach machine-setup. Laden

von Modulen durch hwautocfg geht wieder (bind-mount des Modulverz.
wieder aktiv). servconfig leicht erweitert (acpi und powersave) ...





git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@16 95ad53e4-c205-0410-b2fa-d234c58c8868

3 files changed, 16 insertions, 21 deletions

diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig
index a7cbda19..9d622842 100755
--- a/initrd/initrd-stuff/bin/dhcpmkconfig
+++ b/initrd/initrd-stuff/bin/dhcpmkconfig
@@ -3,7 +3,7 @@
 # Description:  universal (distro independent) configuration writer for 
 #		several dhcp clients 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 07-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 17-01-2006
 #		Blabla
 #		Blub
 #
@@ -15,8 +15,8 @@
 # client variable should be exported via calling function
 echo -e "\n# ip configuration written by $0" \
   >>/etc/machine-setup
-case $client in
-  dhcpcd)
+case $0 in
+  *dhcpd*)
     cat /var/lib/dhcp/dhcpcd-eth0.info | sed -e "s,',\",g" \
       -e "s,IPADDR,clientip," -e "s,NETMASK,subnet_mask," \
       -e "s,GATEWAY,gateway," -e "s,BROADCAST,broadcast_address," \
@@ -30,12 +30,12 @@ case $client in
         >>/etc/machine-setup
     # empty lines should be removed somehow
   ;;
-  dhclient)
-    set | grep "new_" | sed \
+  *dhclient*)
+    set | sed -n -e '/^new/p' | sed \
       -e "s,^new_,," -e "s,fixed-address,clientip," \
       -e "s,routers,gateway," -e "s,dhcp-server-identifier,serverip," \
-      -e "s,.*-time.*,," -e "s,language=,country=," \
-        >>/etc/machine-setup    
+      -e "s,.*_t[iy][mp]e.*,," -e "s,.*_message_.*,," -e "/^$/d" \
+      -e "s,language=,country=," \
+        >>/etc/machine-setup
   ;;
 esac
-
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg
index ae9c691c..1f8ac180 100755
--- a/initrd/initrd-stuff/bin/hwautocfg
+++ b/initrd/initrd-stuff/bin/hwautocfg
@@ -4,7 +4,7 @@
 #		script for linux diskless clients, using hwconfig from 
 #		knoppix as base tool 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 06-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 16-01-2006
 #		Blabla
 #		Blub
 #
@@ -262,8 +262,8 @@ fi
 
 # ACPI configuration
 #if [ -d /proc/acpi ]; then
-#  if ! inkernelcmdline "noacpi" || ! inkernelcmdline "acpi=off"; then
-#    echo ACPIbla
+#  if ! strinstr "noacpi" ${KCMDLINE} || \
+#    ! strinstr "acpi=off" ${KCMDLINE} ; then
 #    found=""
 #    for acpi in /lib/modules/$KERNEL/kernel/drivers/acpi/*; do
 #      acpi=`basename acpi`
@@ -273,16 +273,7 @@ fi
 #    modprobe $basename >/dev/null 2>&1 && echo -n " ${YELLOW}$basename${GREEN}" && found="yes"
 #    done
 #  fi
-#else
-# APM
-#if checkbootparam "noapm"; then
-#echo " ${BLUE}Skipping APM Bios detection as requested on boot commandline.${NORMAL}"
-#else
-#modprobe apm power_off=1 >/dev/null 2>&1 && test -x /etc/init.d/apmd && /etc/init.d/apmd start && echo "${GREEN}APM Bios found, power management functions enabled.${NORMAL}"
 #fi
-#fi
-
-
 
 
 # AGP configuration (agpgart and chipset specific driver)
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index 0fda5df9..952c7521 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -4,7 +4,7 @@
 #		for linux diskless clients (executed within initial
 #		ramdisk) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 08-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 17-01-2006
 #		Blabla
 #		Blub
 #
@@ -130,6 +130,10 @@ config_atd "14" "04"
     echo -e "$crontab_entries" >> /mnt/etc/crontab
 config_cron "16" "04"
 
+# acpi and powersave
+config_acpi "10" "10"
+
+
 #######################################################################
 # network(ed) services