From 3828cf7cca22287a52c3165e5419b78a8d7bf165 Mon Sep 17 00:00:00 2001
From: torben
Date: Thu, 16 Apr 2015 15:40:19 +0200
Subject: Fixes blockdevice killing during systemd-switch-root.

---
 testModule/hooks/cmdline.sh   | 0
 testModule/hooks/mount.sh     | 3 +++
 testModule/hooks/pre-mount.sh | 8 +++++++-
 testModule/hooks/pre-pivot.sh | 8 +-------
 4 files changed, 11 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 testModule/hooks/cmdline.sh
 create mode 100755 testModule/hooks/mount.sh
 mode change 100644 => 100755 testModule/hooks/pre-mount.sh
 mode change 100644 => 100755 testModule/hooks/pre-pivot.sh

(limited to 'testModule/hooks')

diff --git a/testModule/hooks/cmdline.sh b/testModule/hooks/cmdline.sh
old mode 100644
new mode 100755
diff --git a/testModule/hooks/mount.sh b/testModule/hooks/mount.sh
new file mode 100755
index 00000000..f0a34f6a
--- /dev/null
+++ b/testModule/hooks/mount.sh
@@ -0,0 +1,3 @@
+# TODO
+warn '............MOUNT.............'
+mount /dev/nbd0 /sysroot/TEST
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
old mode 100644
new mode 100755
index 210ea26f..00871764
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -1,6 +1,12 @@
 # TODO
-warn '............START.............'
+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
diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh
old mode 100644
new mode 100755
index 48591219..3326fae7
--- a/testModule/hooks/pre-pivot.sh
+++ b/testModule/hooks/pre-pivot.sh
@@ -1,10 +1,4 @@
 # TODO
-warn '............MOUNT.............'
-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
-# --verbose &
+warn '............PRE-PIVOT.............'
 #mount /dev/nbd0 /sysroot/TEST
 # strace -ff -o /sysroot/log.txt -p PID
-- 
cgit v1.2.3-55-g7522