From: Victor Lowther <victor.lowther@gmail.com>
Date: Mon, 25 May 2009 16:44:42 +0000 (-0500)
Subject: Get rid of dependency on e2mkdir
X-Git-Tag: 0.1~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0c2cee947c7d174a1595bfb7e2a8bd9c5702d40;p=thirdparty%2Fdracut.git

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 fe9f57ae9..d183aa65d 100755
--- 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 b6f491269..29f349c9a 100755
--- 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 e54f4094d..f7abe54d8 100755
--- 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
     )