From 5c3fa3223a4de6eb3a62d1c97c52f1762faa07f4 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 18 Nov 2013 23:30:27 +0100 Subject: [PATCH] dracut: fixes for new udev and missing scsi_wait. --- lfs/dracut | 2 ++ src/patches/dracut-006_add_run_symlink.patch | 13 +++++++++++++ src/patches/dracut-006_remove_scsi_wait.patch | 12 ++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 src/patches/dracut-006_add_run_symlink.patch create mode 100644 src/patches/dracut-006_remove_scsi_wait.patch diff --git a/lfs/dracut b/lfs/dracut index d486950d8b..7b0cd8a605 100644 --- 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 index 0000000000..abe029fcc0 --- /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 index 0000000000..cfccf01db9 --- /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 + -- 2.39.2