Ticket #3298: mkinitramfs-udevd.patch

postlfs/filesystems/initramfs.xml

@@ -62 +62 @@
 {
   local file
 
-  if [ "$2" == "lib" ]; then
-    file=$(PATH=/lib:/usr/lib type -p $1)
+  if [ "$2" = "lib" ]; then
+    file=$(find /lib /usr/lib -maxdepth 1 -name $1 | head -n 1)
   else
-    file=$(type -p $1)
+    file=$(find /bin /usr/bin /sbin /usr/sbin -maxdepth 1 -name $1 | head -n 1)
   fi
 
   if [ -n $file ] ; then
@@ -91 +91 @@
 
 printf "Creating $INITRAMFS_FILE... "
 
-binfiles="sh cat cp dd killall ls lsmod mkdir mknod mount "
+binfiles="bash cat cp dd killall ls mkdir mknod mount"
 binfiles="$binfiles umount sed sleep ln rm uname"
 
-sbinfiles="udevadm udevd modprobe blkid switch_root mdadm"
+sbinfiles="udevadm modprobe blkid switch_root"
 
 unsorted=$(mktemp /tmp/unsorted.XXXXXXXXXX)
 
 DATADIR=/usr/share/mkinitramfs
 INITIN=init.in
 
-# Create a temporrary working directory
+# Create a temporary working directory
 WDIR=$(mktemp -d /tmp/initrd-work.XXXXXXXXXX)
 
 # Create base directory structure
@@ -146 +146 @@
 # Add lvm if present
 if [ -x /sbin/lvm ] ; then sbinfiles="$sbinfiles lvm"; fi
 
+# Add mdadm if present
+if [ -x /sbin/mdadm ] ; then sbinfiles="$sbinfiles mdadm"; fi
+
+# Add udevd if present in /sbin (newer versions of udev have it in
+# /lib/udev)
+if [ -x /sbin/udevd ] ; then sbinfiles="$sbinfiles udevd"; fi
+
 for f in $sbinfiles ; do
   ldd /sbin/$f | sed "s/\t//" | cut -d " " -f1 >> $unsorted
   copy $f sbin
@@ -157 +164 @@
   ln -s kmod $WDIR/bin/insmod
 fi
 
+ln -s bash $WDIR/bin/sh
+
 # Add lvm symlinks if appropriate
 if  [ -x /sbin/lvm ] ; then
   ln -s lvm $WDIR/sbin/lvchange
-  ln -s lvm $WDIR/sbin/lvchange
-  ln -s lvm $WDIR/sbin/lvchange
   ln -s lvm $WDIR/sbin/lvcreate
   ln -s lvm $WDIR/sbin/lvdisplay
   ln -s lvm $WDIR/sbin/lvscan
@@ -180 +187 @@
 
 # Install libraries
 sort $unsorted | uniq | while read lib ; do
+  lib=$(basename $lib)
   if [ "$lib" == "linux-vdso.so.1" ] ||
      [ "$lib" == "linux-gate.so.1" ]; then
     continue
   fi
 
-  copy $library lib
+  copy $lib lib
 done
 
 cp -a /lib/udev $WDIR/lib
@@ -198 +206 @@
      /lib/modules/$KERNEL_VERSION/kernel/drivers/{scsi,message,pcmcia,virtio} \
      /lib/modules/$KERNEL_VERSION/kernel/drivers/usb/{host,storage}           \
      -type f 2> /dev/null | cpio --make-directories -p --quiet $WDIR
+  cp /lib/modules/$KERNEL_VERSION/modules.{builtin,order} \
+        $WDIR/lib/modules/$KERNEL_VERSION
 
   depmod -b $WDIR $KERNEL_VERSION
 fi
@@ -296 +306 @@
   esac
 done
 
-udevd --daemon --resolve-names=never
+if [ -x /sbin/udevd ]; then
+UDEV_PATH=/sbin
+else
+UDEV_PATH=/lib/udev
+fi
+
+${UDEV_PATH}/udevd --daemon --resolve-names=never
 udevadm trigger
 udevadm settle
 
@@ -306 +322 @@
 
 do_mount_root
 
-killall -w /sbin/udevd
+killall -w $UDEV_PATH/udevd
 
 exec switch_root /.root "$init" "$@"