From 1276271ec18fb8c585bef293aae45011b4500744 Mon Sep 17 00:00:00 2001
From: Felix Endres
Date: Mon, 5 Feb 2007 22:06:58 +0000
Subject: Adjustments for Ubuntu 6.10

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@688 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 initramfs/distro-specs/ubuntu/config-6.10    |  3 ++-
 initramfs/distro-specs/ubuntu/functions-6.10 | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'initramfs')

diff --git a/initramfs/distro-specs/ubuntu/config-6.10 b/initramfs/distro-specs/ubuntu/config-6.10
index a75090a1..0a5fe449 100644
--- a/initramfs/distro-specs/ubuntu/config-6.10
+++ b/initramfs/distro-specs/ubuntu/config-6.10
@@ -27,4 +27,5 @@
 # D_BOOTLOCAL - script for user specified stuff which should be started
 # during client bootup, path and file relative to /etc
 
-# no changes from default
+# mountvirtfs does not exist anymore -> use mountkernfs.sh
+D_INITSCRIPTS="mountkernfs.sh keymap.sh procps.sh bootlogd hwclock.sh sudo"
diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
index e439df4f..50abd87a 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ b/initramfs/distro-specs/ubuntu/functions-6.10
@@ -26,17 +26,17 @@ preinit () {
 # skip that function here!! 
 # Result: 1 is bad, 0 is good
 udev_hotplug () {
-#  local result=0
-#  [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
-#  echo "Enabling hotplug/udev"
-#  #udevstart && result=0
-#  #udevtrigger && result=0
-#  udevd --daemon || result=1
-#  [ ! -e /sbin/udevsend ] && result=1
-#  echo "/sbin/udevsend/" > /proc/sys/kernel/hotplug
-#  mkdir -p /dev/.udev/db /dev/.udev/queue
-#  trigger_device_events
-#  return $result
+  local result=0
+  [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
+  echo "Enabling hotplug/udev"
+  #udevstart && result=0
+  #udevtrigger && result=0
+  udevd --daemon || result=1
+  [ ! -e /sbin/udevsend ] && result=1
+  echo "/sbin/udevsend/" > /proc/sys/kernel/hotplug
+  mkdir -p /dev/.udev/db /dev/.udev/queue
+  trigger_device_events
+  return $result
 :
 }
 
-- 
cgit v1.2.3-55-g7522