summaryrefslogtreecommitdiffstats
path: root/testModule
diff options
context:
space:
mode:
Diffstat (limited to 'testModule')
-rw-r--r--testModule/hooks/pre-mount.sh4
-rw-r--r--testModule/hooks/pre-pivot.sh7
-rw-r--r--testModule/module-setup.sh2
3 files changed, 6 insertions, 7 deletions
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
index 7798622e..210ea26f 100644
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -4,7 +4,3 @@ warn '............START.............'
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)"
-#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
-#systemd_preserve_process_marker qemu-nbd -c /dev/nbd0 /test.qcow2
diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh
index 8b01779a..7fb6cd9d 100644
--- a/testModule/hooks/pre-pivot.sh
+++ b/testModule/hooks/pre-pivot.sh
@@ -1,12 +1,13 @@
# TODO
warn '............MOUNT.............'
# TODO
-dnbd3_device_node='/dev/dnbd0'
mount -o remount,rw /sysroot
rm /sysroot/test.qcow2
+dnbd3_device_node='/dev/dnbd0'
qemu-img create -f qcow2 -o \
backing_file="$dnbd3_device_node",backing_fmt=qcow2 /sysroot/test.qcow2
insmod /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko
-systemd_preserve_process_marker qemu-nbd --connect /dev/nbd0 /sysroot/test.qcow2 --socket /sysroot/var/lock/qemu-nbd-TEST
-mount /dev/nbd0 /sysroot/TEST
+systemd_preserve_process_marker /usr/bin/qemu-nbd --connect /dev/nbd0 \
+ /sysroot/test.qcow2 --socket /sysroot/qemu-nbd-TEST #--aio=native --nocache
+#mount /dev/nbd0 /sysroot/TEST
# strace -ff -o /sysroot/log.txt -p PID
diff --git a/testModule/module-setup.sh b/testModule/module-setup.sh
index 0e41856d..4a5c4331 100644
--- a/testModule/module-setup.sh
+++ b/testModule/module-setup.sh
@@ -32,9 +32,11 @@ install() {
inst "$moddir/binaries/systemd_preserve_process_marker" /usr/bin/systemd_preserve_process_marker
inst "$moddir/binaries/endless" /usr/bin/endless
+ inst "$moddir/binaries/endless" /usr/bin/@endless
inst "$moddir/binaries/dnbd3-client" /usr/bin/dnbd3-client
inst "$moddir/binaries/busybox" /usr/bin/busybox
inst "$moddir/binaries/qemu-nbd" /usr/bin/qemu-nbd
+ inst "$moddir/binaries/qemu-nbd" /usr/bin/@qemu-nbd
inst "$moddir/kernel_modules/dnbd3.ko" /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/dnbd3.ko
inst "$moddir/kernel_modules/nbd.ko" /usr/lib/modules/3.10.0-229.1.2.el7.x86_64/extra/nbd.ko