Blame 0031-add-initqueue-to-hookdirs-and-create-them-in-dracut-.patch

Harald Hoyer ee76a0
From 4fed3ddf16431524f07fc8bbad6aec913b6c0777 Mon Sep 17 00:00:00 2001
Harald Hoyer ee76a0
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer ee76a0
Date: Fri, 2 Mar 2012 14:46:11 +0100
Harald Hoyer ee76a0
Subject: [PATCH] add "initqueue/*" to hookdirs and create them in dracut
Harald Hoyer ee76a0
 itsself
Harald Hoyer ee76a0
Harald Hoyer ee76a0
now we can just use
Harald Hoyer ee76a0
    inst_hook initqueue/settled 99 "$moddir/pollcdrom.sh"
Harald Hoyer ee76a0
---
Harald Hoyer ee76a0
 dracut-functions.sh              |    6 ++++--
Harald Hoyer ee76a0
 dracut.sh                        |    3 +++
Harald Hoyer ee76a0
 modules.d/99base/module-setup.sh |    4 ----
Harald Hoyer ee76a0
 3 files changed, 7 insertions(+), 6 deletions(-)
Harald Hoyer ee76a0
Harald Hoyer ee76a0
diff --git a/dracut-functions.sh b/dracut-functions.sh
Harald Hoyer ee76a0
index 5cf24a7..05c1d3a 100755
Harald Hoyer ee76a0
--- a/dracut-functions.sh
Harald Hoyer ee76a0
+++ b/dracut-functions.sh
Harald Hoyer ee76a0
@@ -34,8 +34,10 @@ fi
Harald Hoyer ee76a0
 
Harald Hoyer ee76a0
 # export standard hookdirs
Harald Hoyer ee76a0
 [[ $hookdirs ]] || {
Harald Hoyer ee76a0
-    hookdirs="cmdline pre-udev pre-trigger netroot initqueue pre-mount"
Harald Hoyer ee76a0
-    hookdirs+=" pre-pivot mount emergency shutdown-emergency shutdown cleanup"
Harald Hoyer ee76a0
+    hookdirs="cmdline pre-udev pre-trigger netroot "
Harald Hoyer ee76a0
+    hookdirs+="initqueue initqueue/settled initqueue/finished initqueue/timeout "
Harald Hoyer ee76a0
+    hookdirs+="pre-mount pre-pivot mount "
Harald Hoyer ee76a0
+    hookdirs+="emergency shutdown-emergency shutdown cleanup "
Harald Hoyer ee76a0
     export hookdirs
Harald Hoyer ee76a0
 }
Harald Hoyer ee76a0
 
Harald Hoyer ee76a0
diff --git a/dracut.sh b/dracut.sh
Harald Hoyer ee76a0
index 88691ae..417008c 100755
Harald Hoyer ee76a0
--- a/dracut.sh
Harald Hoyer ee76a0
+++ b/dracut.sh
Harald Hoyer ee76a0
@@ -674,6 +674,9 @@ fi
Harald Hoyer ee76a0
 
Harald Hoyer ee76a0
 if [[ $kernel_only != yes ]]; then
Harald Hoyer ee76a0
     mkdir -p "${initdir}/etc/cmdline.d"
Harald Hoyer ee76a0
+    for _d in $hookdirs; do
Harald Hoyer ee76a0
+        mkdir -m 0755 -p ${initdir}/lib/dracut/hooks/$_d
Harald Hoyer ee76a0
+    done
Harald Hoyer ee76a0
 fi
Harald Hoyer ee76a0
 
Harald Hoyer ee76a0
 mkdir -p "$initdir/.kernelmodseen"
Harald Hoyer ee76a0
diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
Harald Hoyer ee76a0
index fd92644..5a97770 100755
Harald Hoyer ee76a0
--- a/modules.d/99base/module-setup.sh
Harald Hoyer ee76a0
+++ b/modules.d/99base/module-setup.sh
Harald Hoyer ee76a0
@@ -33,10 +33,6 @@ install() {
Harald Hoyer ee76a0
     [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib
Harald Hoyer ee76a0
     mkdir -m 0755 -p ${initdir}/lib/dracut
Harald Hoyer ee76a0
     mkdir -m 0755 -p ${initdir}/lib/dracut/hooks
Harald Hoyer ee76a0
-    for _d in $hookdirs emergency \
Harald Hoyer ee76a0
-        initqueue initqueue/timeout initqueue/finished initqueue/settled; do
Harald Hoyer ee76a0
-        mkdir -m 0755 -p ${initdir}/lib/dracut/hooks/$_d
Harald Hoyer ee76a0
-    done
Harald Hoyer ee76a0
 
Harald Hoyer ee76a0
     mkdir -p ${initdir}/tmp
Harald Hoyer ee76a0