From 5c7c54adabd2494d67f98d89d6541e5c11cd7fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Sat, 14 Jan 2017 16:09:40 +0100
Subject: [PATCH] initramfs: move qubes_cow_setup hook to pre-trigger

This hook require new device nodes to appear in /dev. If devtmpfs is
used, it's not a problem ("simple" initramfs case), but otherwise udevd
is needed - and it isn't running in pre-udev hook yet.

QubesOS/qubes-issues#2577
---
 dracut/full-dmroot/module-setup.sh    | 2 +-
 dracut/full-dmroot/qubes_cow_setup.sh | 2 +-
 dracut/simple/init.sh                 | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dracut/full-dmroot/module-setup.sh b/dracut/full-dmroot/module-setup.sh
index a0f9303..8e9025b 100644
--- a/dracut/full-dmroot/module-setup.sh
+++ b/dracut/full-dmroot/module-setup.sh
@@ -14,7 +14,7 @@ depends() {
 }
 
 install() {
-    inst_hook pre-udev 90 $moddir/qubes_cow_setup.sh
+    inst_hook pre-trigger 90 $moddir/qubes_cow_setup.sh
     inst_multiple \
         sfdisk \
         mkswap
diff --git a/dracut/full-dmroot/qubes_cow_setup.sh b/dracut/full-dmroot/qubes_cow_setup.sh
index dd103cb..c02391d 100644
--- a/dracut/full-dmroot/qubes_cow_setup.sh
+++ b/dracut/full-dmroot/qubes_cow_setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This file should be placed in pre-mount directory in dracut's initramfs, or
+# This file should be placed in pre-trigger directory in dracut's initramfs, or
 # scripts/local-top in case of initramfs-tools
 #
 
diff --git a/dracut/simple/init.sh b/dracut/simple/init.sh
index 2572c5e..e61467d 100644
--- a/dracut/simple/init.sh
+++ b/dracut/simple/init.sh
@@ -87,7 +87,6 @@ if ! [ -d "$NEWROOT/lib/modules/$kver/kernel" ]; then
     rmdir /tmp/modules
 fi
 
-
 umount /dev /sys /proc
 
 exec switch_root $NEWROOT /sbin/init