Improvements in hwautocfg (checked against lots of machines), nscd

added, ...


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

4 files changed, 28 insertions, 6 deletions

diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1
index 4344ac96..f0446010 100644
--- a/initrd/distro-specs/debian/functions-3.1
+++ b/initrd/distro-specs/debian/functions-3.1
@@ -200,3 +200,9 @@ if [ "x$start_dreshal" = "xyes" ]; then
   echo >/dev/null
 fi
 }
+
+# start name service caching daemon
+config_nscd () {
+:
+}
+
diff --git a/initrd/distro-specs/suse/functions-10.0 b/initrd/distro-specs/suse/functions-10.0
index 30606fd0..df6239e4 100644
--- a/initrd/distro-specs/suse/functions-10.0
+++ b/initrd/distro-specs/suse/functions-10.0
@@ -3,13 +3,13 @@
 #		changes should be done there, version specific changes for
 #		the 10.0 here.
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 29-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 03-02-2006
 #		Blabla
 #		Blub
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
-# Version:      0.2.1b
+# Version:      0.2.1c
 
 # acpi and powersave have changed
 config_acpi () {
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 6a491160..2184f8f6 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -47,7 +47,7 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
       >>/mnt/etc/${D_INITDIR}/boot.ld
     echo -e "\tntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
-  else
+  elif [ "x$start_ntp" = "xyes" ] ; then
     rllinker "ntp" "$start" "$stop"
   fi
 fi
@@ -189,11 +189,12 @@ config_dm_entry yes
 config_gdm () {
 config_dm_entry yes
 testmkd /mnt/var/lib/gdm
+testmkd /mnt/var/log/gdm
 strinfile "gdm:" /mnt/etc/passwd || echo "gdm:x:50:15:Gnome Display Manager \
 Daemon:/var/lib/gdm:/bin/false" >>/mnt/etc/passwd
 # hack - gdm should be user 50 and shadow group 15
-chown 50:15 /mnt/var/lib/gdm
-chmod 0750 /mnt/var/lib/gdm
+chown 50:15 /mnt/var/lib/gdm /mnt/var/log/gdm
+chmod 0750 /mnt/var/lib/gdm /mnt/var/log/gdm
 xdmcp_hosts=`echo $x_display_manager|sed -e "s; ;,;"`
 if [ "${DEBUGLEVEL}" -gt 0 ] ; then
   debug="true"
@@ -348,7 +349,7 @@ if [ "x$start_dreshal" = "xyes" ]; then
     echo "messagebus:x:100:101:User for D-BUS:/var/run/dbus:/bin/false" \
       >> /mnt/etc/passwd
     testmkd /mnt/var/run/dbus
-    # chown 100:101 /mnt/var/run/dbus
+    chown 100:101 /mnt/var/run/dbus
     rllinker "dbus" "$start" "$stop"
   fi
   if [ -f /mnt/etc/init.d/resmgr ] ; then
@@ -361,6 +362,8 @@ if [ "x$start_dreshal" = "xyes" ]; then
     strinfile "haldaemon:" /mnt/etc/passwd || \
       echo "haldaemon:x:105:103:User for haldaemon:/var/run/hal:/bin/false" \
         >> /mnt/etc/passwd
+    testmkd /mnt/var/run/hal
+    chown 105:103 /mnt/var/run/hal
     start="0"`expr $start + 1`
     stop="0"`expr $start - 1`
     rllinker "hal" "$start" "$stop"
@@ -398,6 +401,13 @@ variable \${automnt_dir} appropriately in\n  machine-setup file." nonfatal
   rllinker "autofs" "18" "04"
 fi
 }
+# start name service caching daemon
+config_nscd () {
+if [ -f /mnt/etc/init.d/nscd ] ; then
+  testmkd /mnt/var/run/nscd
+  rllinker "nscd" "02" "16"
+fi
+}
 
 # start portmapper (needed at least for nfs and nis services)
 config_portmap () {
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 9c7c8ccc..0447cb33 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -227,3 +227,9 @@ from $0" >/mnt/etc/${D_INITDIR}/boot.ld
   ;;
 esac
 }
+
+# start name service caching daemon
+config_nscd () {
+:
+}
+