summaryrefslogtreecommitdiffstats
path: root/testModule/hooks/pre-mount.sh
diff options
context:
space:
mode:
authortorben2015-05-04 13:57:16 +0200
committertorben2015-05-04 13:57:16 +0200
commit0ddd93e6daec1c2eadb025bbc7ab90b9e865516c (patch)
tree58d84520e5a7f802f1fc0abdca7933f47c4d5b4d /testModule/hooks/pre-mount.sh
parentPepare merge. (diff)
parentworking version - STILL TESTING (diff)
downloadsystemd-init-0ddd93e6daec1c2eadb025bbc7ab90b9e865516c.tar.gz
systemd-init-0ddd93e6daec1c2eadb025bbc7ab90b9e865516c.tar.xz
systemd-init-0ddd93e6daec1c2eadb025bbc7ab90b9e865516c.zip
Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init
Diffstat (limited to 'testModule/hooks/pre-mount.sh')
-rwxr-xr-xtestModule/hooks/pre-mount.sh24
1 files changed, 7 insertions, 17 deletions
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
index 5a93aef3..b22cdc35 100755
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -1,19 +1,9 @@
#!/usr/bin/bash
-if [ $PRE_MOUNT_READY ]; then
- warn '............PRE-MOUNT ALREADY DONE.............'
-else
- export PRE_MOUNT_READY=true
- warn '............PRE-MOUNT.............'
- insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko
- local dnbd3_device_node="$(dnbd3-client -h 132.230.4.1 -i \
- stage4/torben/test -r 1 -d /dev/dnbd0)"
- # NOTE: Out comment this line if you need more than on dnbd0 device and
- # determine it automatically.
- dnbd3_device_node=/dev/dnbd0
- qemu-img create -f qcow2 -o \
- backing_file="$dnbd3_device_node",backing_fmt=qcow2 /run/test.qcow2
- insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
- /usr/bin/systemd-preserve-process-marker /usr/bin/qemu-nbd \
- --connect=/dev/nbd0 /run/test.qcow2 --socket /run/qemu-nbd-TEST
-fi
+while ! /sbin/setup-qcow2; do
+ sleep 0.5
+done
+
+while ! /sbin/setup-nbdroot; do
+ sleep 0.5
+done