From 81e7552e02341e6bff0ac1daccbe9156fbd1d147 Mon Sep 17 00:00:00 2001
From: torben
Date: Mon, 20 Apr 2015 14:44:12 +0200
Subject: Cleanup refactoring. Evaluate minimal needed dependencies.

---
 testModule/hooks/mount.sh     |  2 +-
 testModule/hooks/pre-mount.sh | 17 +++++++++--------
 testModule/hooks/pre-pivot.sh |  8 --------
 3 files changed, 10 insertions(+), 17 deletions(-)
 delete mode 100755 testModule/hooks/pre-pivot.sh

(limited to 'testModule/hooks')

diff --git a/testModule/hooks/mount.sh b/testModule/hooks/mount.sh
index 93a11e7c..28958fb6 100755
--- a/testModule/hooks/mount.sh
+++ b/testModule/hooks/mount.sh
@@ -3,5 +3,5 @@ if [ $MOUNT_READY ]; then
 else
     export MOUNT_READY=true
     warn '............MOUNT.............'
-    #mount /dev/nbd0 /sysroot/TEST
+    mount /dev/nbd0 /sysroot
 fi
diff --git a/testModule/hooks/pre-mount.sh b/testModule/hooks/pre-mount.sh
index 548e748d..ed36db84 100755
--- a/testModule/hooks/pre-mount.sh
+++ b/testModule/hooks/pre-mount.sh
@@ -1,15 +1,16 @@
+#!/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)"
-    #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/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 /run/test.qcow2
     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
+    /usr/bin/qemu-nbd-systemd-mark-alternate --connect=/dev/nbd0 \
+        /run/test.qcow2 --socket /run/qemu-nbd-TEST
 fi
diff --git a/testModule/hooks/pre-pivot.sh b/testModule/hooks/pre-pivot.sh
deleted file mode 100755
index fcc6a977..00000000
--- a/testModule/hooks/pre-pivot.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-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
-- 
cgit v1.2.3-55-g7522