dracut: fixes for new udev and missing scsi_wait.

diff --git a/lfs/dracut b/lfs/dracut
index d486950d8b7dbe11626b87f427e2520a7835f459..7b0cd8a60588a9b5ea220794f89b830d33ddda95 100644 (file)
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -73,6 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_lzma.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_cdrom_wait.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_add_run_symlink.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dracut-006_remove_scsi_wait.patch
 
        cd $(DIR_APP) && cp -vf $(DIR_SRC)/src/dracut/switch_root.c .
 

diff --git a/src/patches/dracut-006_add_run_symlink.patch b/src/patches/dracut-006_add_run_symlink.patch
new file mode 100644 (file)
index 0000000..abe029f
--- /dev/null
+++ b/src/patches/dracut-006_add_run_symlink.patch
@@ -0,0 +1,13 @@
+diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init
+--- dracut-006.org/modules.d/99base/init       2010-06-17 10:46:29.000000000 +0200
++++ dracut-006/modules.d/99base/init   2013-10-31 16:51:17.658771341 +0100
+@@ -87,6 +87,9 @@
+ 
+ ln -s /proc/self/fd /dev/fd >/dev/null 2>&1
+ 
++# Add run symlink
++ln -s /var/run /run
++
+ if getarg rdinitdebug; then
+     getarg quiet && DRACUT_QUIET="yes"
+     mkfifo /dev/initlog.pipe

diff --git a/src/patches/dracut-006_remove_scsi_wait.patch b/src/patches/dracut-006_remove_scsi_wait.patch
new file mode 100644 (file)
index 0000000..cfccf01
--- /dev/null
+++ b/src/patches/dracut-006_remove_scsi_wait.patch
@@ -0,0 +1,12 @@
+diff -Naur dracut-006.org/modules.d/99base/init dracut-006/modules.d/99base/init
+--- dracut-006.org/modules.d/99base/init       2010-06-17 10:46:29.000000000 +0200
++++ dracut-006/modules.d/99base/init   2013-10-31 17:05:09.135475525 +0100
+@@ -175,7 +175,7 @@
+ 
+     $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue
+ 
+-    modprobe scsi_wait_scan && rmmod scsi_wait_scan
++    sleep 0.1
+ 
+     $UDEV_QUEUE_EMPTY >/dev/null 2>&1 || continue
+