From f5d2b425f0ebf5822cf676c63f7ab20e5088e284 Mon Sep 17 00:00:00 2001
From: Felix Endres
Date: Wed, 15 Feb 2006 17:54:27 +0000
Subject: Laden des unix-modul zu den Ubuntuspezifische Funktionen Starten des
 dbus-daemon für den HAL gdm beim Boot starten

git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@74 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initrd/distro-specs/ubuntu/config-5.10    |  2 +-
 initrd/distro-specs/ubuntu/functions-5.10 | 34 +++++++++++++++++++++++++++++++
 initrd/initrd-stuff/init                  |  5 +----
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/initrd/distro-specs/ubuntu/config-5.10 b/initrd/distro-specs/ubuntu/config-5.10
index 319f3f59..7ec484b0 100644
--- a/initrd/distro-specs/ubuntu/config-5.10
+++ b/initrd/distro-specs/ubuntu/config-5.10
@@ -41,7 +41,7 @@ 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_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo"
+D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus gdm"
 D_XF86CONFFILE="/etc/X11/xorg.conf"
 D_XFONTPATH="/usr/share/fonts/*"
 D_DEFAULTCOUNTRY="de"
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index a82e0111..fd1cd0f1 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -14,6 +14,10 @@
 preinit () {
   echo "dhcp:x:101:">>/etc/group
   echo "dhcp:x:101:101::/nonexistent:/bin/false">>/etc/passwd
+
+  # load unix module to provide sockets
+  modprobe ${MODPRV} unix || error " Failed to load the \"unix\" module. \
+  Problems with Hardware detection will probably arise"
 }
 # AUS SuSE-9.3
 # udev/hotplug - auto device discovery service
@@ -260,3 +264,33 @@ config_nscd () {
 :
 }
 
+# configure automounter
+config_automount () {
+if [ -f /mnt/etc/init.d/autofs ] ; then
+  testmkd /var/lock/subsys
+  echo -e "# /etc/auto.master - file generated by $0:\n\
+/misc\t/etc/auto.misc" >/mnt/etc/auto.master
+  echo -e "# /etc/auto.misc - file generated by $0:\n" \
+    > /mnt/etc/auto.misc
+  if [ -n "${automnt_src}" ] ; then
+    # local directory and home directory server from machine-setup
+    [ -z "${automnt_dir}" ] && automnt_dir="/home"
+    strinstr "/" "${automnt_dir}" && error "  Only toplevel directories \
+are allowed as mount points for user home\n  directories. Please set the \
+variable \${automnt_dir} appropriately in\n  machine-setup file." nonfatal
+    automnt_dir=${automnt_dir#/}
+    echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master
+    echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
+      > /mnt/etc/auto.${automnt_dir}
+    echo -e "*\t-rsize=32768,wsize=32768,rw\t${automnt_src}/&" \
+      >> /mnt/etc/auto.${automnt_dir}
+  fi
+  echo -e "# /etc/sysconfig/autofs - file modified by\n#\t$0:\n#" \
+    > /etc/autofs
+  sed -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
+    /mnt/etc/sysconfig/autofs >> /etc/autofs
+  cp /etc/autofs /mnt/etc/sysconfig/autofs
+  config_portmap
+  rllinker "autofs" "18" "04"
+fi
+}
diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init
index 5452aaaf..77ff0212 100755
--- a/initrd/initrd-stuff/init
+++ b/initrd/initrd-stuff/init
@@ -47,9 +47,6 @@ exec < /dev/console > /dev/console 2>&1
 
 # run pre init script
 preinit
-# load unix module to provide sockets
-modprobe ${MODPRV} unix || error " Failed to load the \"unix\" module. \
-Problems with Hardware detection will probably arise"
 # start device auto discovery service - distro specific function
 udev_hotplug
 # read kernel commandline
@@ -402,7 +399,7 @@ d_mkbootld close
 killall -9 dhcpcd dhclient pump 2>/dev/null
 # unmount the bind mounted modules directory
 
-bash
+#bash
 
 for i in 0 40 100 200 300 500 800 1000 1200; do
   usleep $i && umount -n /lib/modules/${KERNEL} 2>/dev/null && break
-- 
cgit v1.2.3-55-g7522