From a0c2cee947c7d174a1595bfb7e2a8bd9c5702d40 Mon Sep 17 00:00:00 2001 From: Victor Lowther Date: Mon, 25 May 2009 11:44:42 -0500 Subject: [PATCH] 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. --- test/TEST-10-RAID/copy-root.sh | 2 +- test/TEST-10-RAID/create-root.sh | 1 - test/TEST-10-RAID/test.sh | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/TEST-10-RAID/copy-root.sh b/test/TEST-10-RAID/copy-root.sh index fe9f57ae..d183aa65 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 b6f49126..29f349c9 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 e54f4094..f7abe54d 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 )