Massive changes for distro specific configurations (mkdxsinitrd,

distro-specs/*) ...



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

2 files changed, 18 insertions, 31 deletions

diff --git a/initrd/distro-specs/gentoo/config-2005.1 b/initrd/distro-specs/gentoo/config-2005.1
index 2cf9331f..2bae4d17 100644
--- a/initrd/distro-specs/gentoo/config-2005.1
+++ b/initrd/distro-specs/gentoo/config-2005.1
@@ -1,6 +1,6 @@
-# Description:  distro specific settings for Gentoo
+# Description:  distro specific settings for Gentoo 2005.1
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 09-04-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
 #
 # Copyright:    (c) 2005,6 - RZ Universitaet Freiburg
 
@@ -14,34 +14,10 @@
 # TempFS usage
 # D_DIRINDXS - directories in client filesystem which should be present 
 # anyhow
-# D_BINDMNT - any code which is specific in bind mount environment
 # D_RCDIRS - runlevel directories relative to /etc
 # D_HWMODTOIGNORE - hardware modules which should not tried to load (because
 # already in kernel, nonexistent, ...)
 # D_BOOTLOCAL - script for user specified stuff which should be started 
 # during client bootup, path and file relative to /etc
 
-D_SYSCONFDIR=conf.d
-D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n\
-etc/autoinstall\nlogrotate*\nbootloader\n*~\n\
-pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\
-X11/xdm/pixmaps\ndhclient.script\nrunlevels/boot/*\n\
-runlevels/default/*\nrunlevels/nonetwork/*"
-D_BINDMPTS="tmp root home"
-D_DIRINBINDMNT="/var/run /var/log /var/tmp"
-D_RODIRSINRW="/var/adm /var/lib/texmf"
-D_DIRINDXS="/var/X11R6/compose-cache \
-/var/run/sysconfig/tmp /var/lib/init.d/started /var/lib/nobody \
-/var/lib/bluetooth \
-/var/lib/texmf /var/lib/nfs/sm /var/lib/nfs/state \
-/var/lib/misc /var/lib/acpi /var/spool/cron \
-/var/lock/subsys/sysconfig"
-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 urandom boot.ld"
-D_XF86CONFFILE="/etc/X11/xorg.conf"
-D_XFONTPATH="/usr/share/fonts/*"
-D_DEFAULTCOUNTRY="de"
-D_BOOTLOCAL="conf.d/local.start"
\ No newline at end of file
+# nothing changed yet
diff --git a/initrd/distro-specs/gentoo/functions-2005.1 b/initrd/distro-specs/gentoo/functions-2005.1
index d1b7d3d7..4eae04a3 100644
--- a/initrd/distro-specs/gentoo/functions-2005.1
+++ b/initrd/distro-specs/gentoo/functions-2005.1
@@ -1,8 +1,8 @@
 # Description:  configuration script for Gentoo V2005.1 to configure
-#		linux diskless clients (executed within initial
-#		ramdisk after genconfig) 
+#               linux diskless clients (executed within initial ramdisk 
+#               after genconfig) 
 #
-# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 28-05-2006
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
 #
 # Copyright:    (c) 2006 - RZ Universitaet Freiburg
 # 
@@ -48,6 +48,17 @@ echo $1 >> /mnt/etc/runlevels/default/.critical
 #fi
 }
 
+# setup initial boot scripts (rather strange concept I did not get 
+# completely)
+initial_boot () {
+rm /mnt/etc/runlevels/*/.critical 2>/dev/null
+for i in ${D_INITSCRIPTS}; do
+  ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/$i
+  echo $i >> /mnt/etc/${D_INITBOOTD}/.critical
+  echo $i >> /mnt/etc/runlevels/default/.critical
+done
+}
+
 # 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
@@ -76,7 +87,7 @@ esac
 # group of functions for the normal runlevels
 # function for ntp configuration (unchecked)
 config_ntp () {
-if [ -f /mnt/etc/${D_INITDIR}/ntp ] ; then
+if [ -e /mnt/etc/${D_INITDIR}/ntp ] ; then
   if ! strinfile "ntp:" /mnt/etc/passwd ; then
     echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \
       >>/mnt/etc/passwd