fixed ugly bug with ldd library detection, fixed bug for dhcpcd use,

started to integrate gentoo, minor fixes ...



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

3 files changed, 44 insertions, 22 deletions

diff --git a/initrd/distro-specs/gentoo/config-2005.1 b/initrd/distro-specs/gentoo/config-2005.1
index 5a544e30..1e47f8ee 100644
--- a/initrd/distro-specs/gentoo/config-2005.1
+++ b/initrd/distro-specs/gentoo/config-2005.1
@@ -39,7 +39,7 @@ D_BINDMNT="# spielspass fuer splash"
 D_INITDIR="/init.d"
 D_INITBOOTD="/runlevels/boot"
 D_RCDIRS="/runlevels/default /runlevels/nonetwork /runlevels/single"
-D_INITSCRIPTS="bootmisc clock modules urandom"
+D_INITSCRIPTS="bootmisc clock urandom consolefont keymaps"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index 6fa20cdd..ddc70fc9 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -1,36 +1,58 @@
+# Description:  configuration script for Ubuntu V5.10 to configure
+#		linux diskless clients (executed within initial
+#		ramdisk after genconfig) 
+#
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 26-03-2006
+#
+# Copyright:    (c) 2006 - RZ Universitaet Freiburg
+# 
+# Version:      0.0.1c
+
+# distro specific stuff to initialize
+preinit () {
+ :
+}
+
+postinit () {
+  :
+}
+
 # udev service - not checked!
 udev_hotplug () {
-local result=0
 echo "Starting udev"
-udevstart || result=1
+ln -s /bin/udevd /bin/udevstart && udevstart &
 if [ -x /bin/udevd ] ; then
   export UDEVD_EXPECTED_SEQNUM=$(cat /sys/kernel/hotplug_seqnum)
   export UDEVD_EVENT_TIMEOUT=1
   echo "" > /proc/sys/kernel/hotplug
-  udevd --daemon || result=1
+  udevd &
 else error "  udev daemon is not available. Some devices might not \
 apprear." nonfatal
 fi
-return $result
 }
 
 # initialize boot.ld - skript to be executed during early system startup
 # (before most of the normal boot init scripts)
 # this script should operate like a normal runlevel script
-d_mkbootld () {
-case "$1" in
+# initialize boot.ld - skript to be executed during early system startup
+# (before most of the normal boot init scripts)
+# this script should operate like a normal runlevel script (fixme!!)
+d_mkrlscript () {
+local switch="$1"
+local name="$2"
+local info="$3"
+case "$switch" in
   init)
-    echo -e "#!/sbin/runskript\n# skeleton of /etc/${D_INITDIR}/boot.ld \
-written from $0" >/mnt/etc/${D_INITDIR}/boot.ld
-    echo -e '\n\nstart() {' \
-      >>/mnt/etc/${D_INITDIR}/boot.ld
-    echo -e '\tebegin "Running post configuration required by initrd"' \
-      >>/mnt/etc/${D_INITDIR}/boot.ld
-    chmod u+x /mnt/etc/${D_INITDIR}/boot.ld
+    echo -e "#!/sbin/runskript\n# skeleton of /etc/${D_INITDIR}/$name \
+generated by $0" >/mnt/etc/${D_INITDIR}/$name
+    echo -e "\n\nstart() {\tebegin \"$info\"" \
+      >>/mnt/etc/${D_INITDIR}/$name
+    chmod u+x /mnt/etc/${D_INITDIR}/$name
   ;;
   close)
-    echo -e "\teend ${?}\n}" \
-      >>/mnt/etc/${D_INITDIR}/boot.ld
+    echo -e "\t;;\n    stop)\n\t;;\nesac\nexit 0" \
+      >>/mnt/etc/${D_INITDIR}/$name
   ;;
 esac
 }
+
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index fbd74586..bd988d52 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -58,8 +58,8 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
   fi
   testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null
   if [ "x$start_ntp" = "xinitial" ] ; then
-    echo -e "\t# entry added by $0: $date\n\t( ntpdate -s -b $ntp_servers\
-  >${LOGFILE} 2>&1 && \\n\t  which hwclock &>/dev/null && hwclock -w ) &" \
+    echo -e "\t# entries added by $0: $date\n\t( ntpdate -s -b $ntp_servers\
+  >${LOGFILE} 2>&1 && {\n\t  which hwclock &>/dev/null && hwclock -w;} ) &" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
   elif [ "x$start_ntp" = "xyes" ] ; then
     rllinker "ntp" "$start" "$stop"
@@ -145,8 +145,8 @@ cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager
 # started twice during bootup - quickhack ...
 #ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITDIR}/rc5.d/S01xdm
 ln -sf ../xdm /mnt/etc/${D_INITDIR}/rc5.d/K20xdm
-echo -e "\t/etc/init.d/xdm start >${LOGFILE} 2>&1\n\t( sleep 60; \
-ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm \
+echo -e "\t/etc/init.d/xdm start >${LOGFILE} 2>&1\n\
+\t( sleep 120; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm \
 >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
@@ -416,8 +416,8 @@ local name="$2"
 local info="$3"
 case "$1" in
   init)
-    echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name written \
-from $0\n. /etc/rc.status\n. /etc/sysconfig/logfile\nrc_reset\ncase \
+    echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name created \
+by $0\n. /etc/rc.status\n. /etc/sysconfig/logfile\nrc_reset\ncase \
 \"\$1\" in\n    start)\n\techo -n \"$info\"" >>/mnt/etc/${D_INITDIR}/$name
     chmod u+x /mnt/etc/${D_INITDIR}/$name
   ;;