summaryrefslogtreecommitdiffstats
path: root/testModule/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'testModule/hooks')
-rwxr-xr-xtestModule/hooks/mount.sh10
-rwxr-xr-xtestModule/hooks/pre-mount.sh27
-rwxr-xr-xtestModule/hooks/pre-pivot.sh12
3 files changed, 30 insertions, 19 deletions
diff --git a/testModule/hooks/mount.sh b/testModule/hooks/mount.sh
index f0a34f6a..93a11e7c 100755
--- a/testModule/hooks/mount.sh
+++ b/testModule/hooks/mount.sh
@@ -1,3 +1,7 @@
-# TODO
-warn '............MOUNT.............'
-mount /dev/nbd0 /sysroot/TEST
+if [ $MOUNT_READY ]; then
+ warn '............MOUNT ALREADY DONE.............'
+else
+ export MOUNT_READY=true
+ warn '............MOUNT.............'
+ #mount /dev/nbd0 /sysroot/TEST
+fi
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
index 00871764..548e748d 100755
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -1,12 +1,15 @@
-# TODO
-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)"
-dnbd3_device_node='/dev/dnbd0'
-qemu-img create -f qcow2 -o backing_file="$dnbd3_device_node",backing_fmt=qcow2 /test.qcow2
-insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
-# NOTE: "--persistent" doesn't work with wrapper.
-#systemd_preserve_process_marker /usr/bin/qemu-nbd --connect=/dev/nbd0 /test.qcow2 --socket /qemu-nbd-TEST
-/usr/bin/qemu-nbd-systemd-mark --connect=/dev/nbd0 /test.qcow2 --socket /qemu-nbd-TEST
+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)"
+ #dnbd3_device_node='/dev/dnbd0'
+ #qemu-img create -f qcow2 -o backing_file="$dnbd3_device_node",backing_fmt=qcow2 /test.qcow2
+ qemu-img create -f qcow2 /run/test.qcow2 100M
+ insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
+ /usr/bin/qemu-nbd-systemd-mark-alternate --connect=/dev/nbd0 /run/test.qcow2 --socket /run/qemu-nbd-TEST --aio=native
+ #--persistent
+fi
diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh
index 3326fae7..fcc6a977 100755
--- a/testModule/hooks/pre-pivot.sh
+++ b/testModule/hooks/pre-pivot.sh
@@ -1,4 +1,8 @@
-# TODO
-warn '............PRE-PIVOT.............'
-#mount /dev/nbd0 /sysroot/TEST
-# strace -ff -o /sysroot/log.txt -p PID
+if [ $PRE_PIVOT_READY ]; then
+ warn '............PRE-PIVOT ALREADY DONE.............'
+else
+ export PRE_PIVOT_READY=true
+ warn '............PRE-PIVOT.............'
+ #mount /dev/nbd0 /sysroot/TEST/
+ # strace -ff -o /sysroot/log.txt -p PID
+fi