Fix for problem with cdrom device nodes and deletion of obsolete udev function

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

2 files changed, 1 insertions, 21 deletions

diff --git a/initramfs/distro-specs/ubuntu/functions-6.10 b/initramfs/distro-specs/ubuntu/functions-6.10
index 7f8ed4b9..e37b37ef 100644
--- a/initramfs/distro-specs/ubuntu/functions-6.10
+++ b/initramfs/distro-specs/ubuntu/functions-6.10
@@ -33,26 +33,6 @@ config_distro () {
   # how that is done for upstart??
 }
 
-# udev/hotplug - auto device discovery service
-# fixme: why does nothing happens here!? If default should be used just
-# 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
-:
-}
-
-
 
 
 
diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 815f8d75..1fce58ff 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -359,7 +359,7 @@ if strinfile "SCSI" /tmp/hwsetup.info ; then
     modprobe ${MODPRV} sg;
     # just for compatibility to hwsetup (which generates links to scd*)
     ( waitfor /dev/sr0 1000 && for i in /dev/sr* ; do 
-      [ -e /dev/scd${i#/dev/sr} ] || ln -s $i /dev/scd${i#/dev/sr} ; done; ) &
+      [ -e /dev/scd${i#/dev/sr} ] || cp -a -f $i /dev/scd${i#/dev/sr} ; done; ) &
     }
   strinfile "HD" /tmp/hwsetup.info && {
     modprobe ${MODPRV} sd_mod