Heftiges Bugfixing in mkdxsinitrd ... intensiv gecheckt mit SuSE 10.0 -

wieder funktionsfähig.



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

5 files changed, 39 insertions, 58 deletions

diff --git a/initrd/distro-specs/gentoo/functions-gentoo b/initrd/distro-specs/gentoo/functions-gentoo
new file mode 100644
index 00000000..5f7afa09
--- /dev/null
+++ b/initrd/distro-specs/gentoo/functions-gentoo
@@ -0,0 +1,20 @@
+# 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
+  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
+  ;;
+  close)
+    echo -e "\teend ${?}\n}" \
+      >>/mnt/etc/${D_INITDIR}/boot.ld
+  ;;
+esac
+}
diff --git a/initrd/distro-specs/gentoo/servconf b/initrd/distro-specs/gentoo/servconf
deleted file mode 100644
index 36c10d3c..00000000
--- a/initrd/distro-specs/gentoo/servconf
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Description:  configuration script for Gentoo to configure
-#		linux diskless clients (executed within initial
-#		ramdisk after genconfig) 
-#
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 13-12-2005
-#		Blabla
-#		Blub
-#
-# Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
-# 
-# Version:      0.3.5k
-
-# check for configuration files to source
-
-# ldap, dhcp, file
-
-
diff --git a/initrd/distro-specs/suse-10.0/functions-suse-10.0 b/initrd/distro-specs/suse-10.0/functions-suse-10.0
index 3016d222..8b63085f 100644
--- a/initrd/distro-specs/suse-10.0/functions-suse-10.0
+++ b/initrd/distro-specs/suse-10.0/functions-suse-10.0
@@ -1,8 +1,9 @@
 # Description:  configuration script for SuSE 10.0 to configure
-#		linux diskless clients (executed within initial
-#		ramdisk after genconfig) 
+#		linux diskless clients (included by init, hwautocfg,
+#		servconfig, ... within initial ramdisk after inclusion
+#		of the main functions file) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 18-01-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 20-01-2006
 #		Blabla
 #		Blub
 #
@@ -41,9 +42,9 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
       >>/mnt/etc/passwd
   testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null
   if [ "x$start_ntp" = "xinitial" ] ; then
-    echo -e "# entry added by $0: $date" \
+    echo -e "\t# entry added by $0: $date" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
-    echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
+    echo -e "\tntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
   else
     rllinker "ntp" "$start" "$stop"
@@ -171,15 +172,15 @@ sed -e "s,DISPLAYMANAGER=.*,DISPLAYMANAGER=\"$start_xdmcp\"," \
     -e "s,.*_XSERVER.*,DISPLAYMANAGER_STARTS_XSERVER=\"$dm\"," \
   /mnt/etc/sysconfig/displaymanager > /etc/displaymanager
 cp /etc/displaymanager /mnt/etc/sysconfig/displaymanager
+# start the display manager as early as possible
+ln -sf /etc/init.d/xdm /mnt/etc/init.d/boot.d/S12boot.xdm
+ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
+ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
 }
 
 # configure X display manager (runlevel links and kind of manager)
 config_xdm () {
 config_dm_entry yes
-#  echo -e "#!/bin/sh\n# entry added by $0: $date\n\
-#(sleep 1; /etc/init.d/xdm start) &" >>/mnt/etc/${D_INITDIR}/boot.ld
-ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
-ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
 }
 
 # configure gdm as display manager
@@ -300,10 +301,6 @@ else
 [server-Standard]\nname=Standard server\ncommand=/usr/X11R6/bin/X\n\
 flexible=true\nhandled=true" >>/mnt/etc/opt/gnome/gdm/gdm.conf
 fi
-# start the display manager as early as possible
-ln -sf /etc/init.d/xdm /mnt/etc/init.d/boot.d/S01boot.xdm
-ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/S01xdm
-ln -sf /etc/init.d/xdm /mnt/etc/init.d/rc5.d/K20xdm
 }
 
 # configure gdm as display manager
@@ -314,7 +311,7 @@ config_dm_entry yes
 
 # consolefont
 consolefont () {
-echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
+echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
   >>/mnt/etc/${D_INITDIR}/boot.ld
 }
 
@@ -363,18 +360,19 @@ fi
 # 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_bootld () {
+d_mkbootld () {
 case "$1" in
   init)
     echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/boot.ld written \
 from $0" >/mnt/etc/${D_INITDIR}/boot.ld
-    echo -e '\n\n. /etc/rc.status\nrc_reset\ncase "$1" in    start)' \
+    echo -e '\n. /etc/rc.status\nrc_reset\ncase "$1" in\n    start)' \
       >>/mnt/etc/${D_INITDIR}/boot.ld
     echo -e '\techo -n "Running post configuration required by initrd"' \
       >>/mnt/etc/${D_INITDIR}/boot.ld
+    chmod u+x /mnt/etc/${D_INITDIR}/boot.ld
   ;;
   close)
-    echo -e "\trc_status -v\n\t;;\n    stop)\n\t;;esac\nrc_exit" \
+    echo -e "\trc_status -v\n\t;;\n    stop)\n\t;;\nesac\nrc_exit" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
 
   ;;
diff --git a/initrd/distro-specs/ubuntu/functions-ubuntu b/initrd/distro-specs/ubuntu/functions-ubuntu
index 47826957..02d696f1 100644
--- a/initrd/distro-specs/ubuntu/functions-ubuntu
+++ b/initrd/distro-specs/ubuntu/functions-ubuntu
@@ -204,18 +204,19 @@ fi
 # 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_bootld () {
+d_mkbootld () {
 case "$1" in
   init)
     echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/boot.ld written \
 from $0" >/mnt/etc/${D_INITDIR}/boot.ld
-    echo -e '\n\ncase "$1" in    start)' \
+    echo -e '\n\ncase "$1" in\n    start)' \
       >>/mnt/etc/${D_INITDIR}/boot.ld
     echo -e '\techo -n "Running post configuration required by initrd"' \
       >>/mnt/etc/${D_INITDIR}/boot.ld
+    chmod u+x /mnt/etc/${D_INITDIR}/boot.ld
   ;;
   close)
-    echo -e "\t;;\n    stop)\n\t;;esac\nexit 0" \
+    echo -e "\t;;\n    stop)\n\t;;\nesac\nexit 0" \
       >>/mnt/etc/${D_INITDIR}/boot.ld
 
   ;;
diff --git a/initrd/distro-specs/ubuntu/servconf b/initrd/distro-specs/ubuntu/servconf
deleted file mode 100644
index 9e711042..00000000
--- a/initrd/distro-specs/ubuntu/servconf
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# Description:  configuration script for Debian/Sarge to configure
-#		linux diskless clients (executed within initial
-#		ramdisk after genconfig) 
-#
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 13-12-2005
-#		Blabla
-#		Blub
-#
-# Copyright:    (c) 2003, 2005 - RZ Universitaet Freiburg
-# 
-# Version:      0.3.5k
-
-# check for configuration files to source
-
-# ldap, dhcp, file
-
-