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

3 files changed, 36 insertions, 49 deletions

diff --git a/initrd/distro-specs/ubuntu/config-6.06 b/initrd/distro-specs/ubuntu/config-6.06
new file mode 100644
index 00000000..a75090a1
--- /dev/null
+++ b/initrd/distro-specs/ubuntu/config-6.06
@@ -0,0 +1,30 @@
+# Description:  distro specific settings for Ubuntu Dapper Dake (6.06)
+#               defaults are taken from config-default file
+#
+# Author(s):    Dirk von Suchodoletz <dirk@goe.net>, 23-06-2006
+#
+# Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
+#
+
+# D_SYSCONFDIR - system wide configuration settings - /etc/sysconfig in SuSE 
+# and RedHat, /etc/default in Debian and Ubuntu
+# D_ETCEXCL - list of files, wildcards to be excluded from /etc when using 
+# bind mounts
+# D_DIRINBINDMNT - lists of directories to be created in bind mounted rw
+# part of the client filesystem
+# D_RODIRSINRW - ReadOnly Directories in RW part of filesystem to save on 
+# 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_XF86CONFFILE - name and location of XFree/Xorg config file, e.g.
+# /etc/X11/xorg.conf or /etc/X11/XF86config, ...
+# D_XFONTPATH - path(es) where X11 fonts are installed (with trailing /*)
+# D_DEFAULTCOUNTRY - localization (see common functions)
+# 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
+
+# no changes from default
diff --git a/initrd/distro-specs/ubuntu/config-default b/initrd/distro-specs/ubuntu/config-default
index 580aef36..8eee5753 100644
--- a/initrd/distro-specs/ubuntu/config-default
+++ b/initrd/distro-specs/ubuntu/config-default
@@ -41,12 +41,11 @@ D_DIRINDXS="/var/X11R6/compose-cache \
 /var/lib/texmf /var/lib/nfs/sm \
 /var/lib/misc /var/lib/acpi /var/spool/cron \
 /var/lock/subsys/sysconfig"
-D_BINDMNT="# "
 D_INITDIR="/init.d"
 D_INITBOOTD="/rcS.d"
 D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
-D_INITDEFAULT="3"
-D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd boot.ld hwclock.sh sudo dbus"
+D_INITDEFAULT="2"
+D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd hwclock.sh sudo dbus"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06
index ea7fb0ad..7d3840ae 100644
--- a/initrd/distro-specs/ubuntu/functions-6.06
+++ b/initrd/distro-specs/ubuntu/functions-6.06
@@ -49,21 +49,20 @@ udev_hotplug () {
 
 #}
 
-# linking runlevel scripts
+# linking runlevel 2,3 scripts
 rllinker () {
 local script="$1"
 local start="$2"
 local stop="$3"
 # empty runlevel links - decision on running certain services is
 # passed via configuration
-for i in rc0.d/K$stop$script rc.S/S$start$script \
-	 rc2.d/K$stop$script rc3.d/K$stop$script \
+for i in rc2.d/K$stop$script rc3.d/K$stop$script \
          rc2.d/S$start$script rc3.d/S$start$script ; do
   if ! [ -f /mnt/etc/init.d/$script ]; then
     echo "Target `pwd`../$script does not exist. Skipping links"
     break
   else 
-    ln -sf /mnt/etc/init.d/$script /mnt/etc/$i
+    ln -sf ../init.d/$script /mnt/etc/$i
     echo "Linked $script"
   fi
 done
@@ -74,48 +73,7 @@ done
 # function for ntp configuration
 
 config_ntp () {
-
- local start=13
- local stop=14
-
-echo -e "#!/bin/sh
-PATH=/sbin:/bin
-
-test -f /usr/sbin/ntpdate || exit 0
-
-if test -f /etc/default/ntpdate ; then
-. /etc/default/ntpdate
-else
-NTPSERVERS=\"pool.ntp.org\"
-fi
-
-test -n \"\$NTPSERVERS\" || exit 0
-
-. /lib/lsb/init-functions
-
-case \"\$1\" in
-start|force-reload)
-  log_begin_msg \"Synchronizing clock to \$NTPSERVERS...\"
-  /usr/sbin/ntpdate -b -s \$NTPOPTIONS \$NTPSERVERS
-  log_end_msg \$?
-  ;;
-restart|reload)
-  # Drop -b to slew clock rather than step it if called after system is up
-  log_begin_msg \"Synchronizing clock to \$NTPSERVERS...\"
-  /usr/sbin/ntpdate -s \$NTPOPTIONS \$NTPSERVERS
-  log_end_msg \$?
-  ;;
-stop)
-  ;;
-*)
-  log_success_msg \"Usage: /etc/init.d/ntpdate {start|stop|restart|reload|force-reload}\"
-  exit 1
-esac
-
-exit 0" > /mnt/etc/init.d/ntpdate
-
- chmod a+x /mnt/etc/init.d/ntpdate
- rllinker "ntpdate" "$start" "$stop"
+:
 }
 
 # function for atd