Get rid of dependency on e2mkdir

If we install copy-root as a mount hook, it will be run after the root fs
is mounted and it will make hte proc directory, allowing root filesystem
creation to finish without error.

diff --git a/test/TEST-10-RAID/copy-root.sh b/test/TEST-10-RAID/copy-root.sh
index fe9f57ae9969c9ee8ab0a885043f1a58beb07a39..d183aa65da83840ecabc9dc2a5e9317f429a0274 100755 (executable)
--- a/test/TEST-10-RAID/copy-root.sh
+++ b/test/TEST-10-RAID/copy-root.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-cp -a -t "$NEWROOT" /source/*
\ No newline at end of file
+cp -a -t "$NEWROOT" /source/*

diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index b6f491269f666caf4d17998eca3cd103bf668954..29f349c9a9319f41a245ec758e367c2482a3570b 100755 (executable)
--- a/test/TEST-10-RAID/create-root.sh
+++ b/test/TEST-10-RAID/create-root.sh
@@ -16,4 +16,3 @@ lvm lvcreate -l 100%FREE -n root dracut
 udevadm settle --timeout=4
 [ -b /dev/dracut/root ] || emergency_shell
 mke2fs /dev/dracut/root
-e2mkdir /dev/dracut/root:/proc

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index e54f4094d5b92023bbad2874c816b213f1897074..f7abe54d8a990f5c6b8cc573d654cb1da338c91c 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 TEST_DESCRIPTION="root filesystem on an encrypted LVM PV"
 
 test_run() {
@@ -32,9 +31,9 @@ test_setup() {
     (
        initdir=overlay
        . $basedir/dracut-functions
-       dracut_install sfdisk mke2fs poweroff cp umount e2mkdir
+       dracut_install sfdisk mke2fs poweroff cp umount 
        inst_simple ./halt.sh /pre-pivot/02halt.sh
-       inst_simple ./copy-root.sh /pre-pivot/01copy-root.sh
+       inst_simple ./copy-root.sh /mount/01copy-root.sh
        inst_simple ./create-root.sh /pre-mount/01create-root.sh
     )