From 0e3150e11fa895661417417bebfd56cccc482713 Mon Sep 17 00:00:00 2001
From: jandob
Date: Thu, 29 Oct 2015 10:54:12 +0100
Subject: bugfix

---
 .gitignore                                       |   3 +++
 build_initram_dracut.sh                          |  17 -----------------
 build_initramfs.sh                               |  20 ++++++++++++++++++++
 builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko | Bin 463216 -> 0 bytes
 builder/dnbd3-qcow2-rootfs/module-setup.sh       |   6 +++---
 dev_tools/startup.nsh                            |   5 +++++
 6 files changed, 31 insertions(+), 20 deletions(-)
 create mode 100644 .gitignore
 delete mode 100755 build_initram_dracut.sh
 create mode 100755 build_initramfs.sh
 delete mode 100644 builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko
 mode change 100644 => 100755 builder/dnbd3-qcow2-rootfs/module-setup.sh
 create mode 100755 dev_tools/startup.nsh

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..b770329f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+dracut
+builder/dnbd3-qcow2-rootfs/kernel_modules
+!builder/dnbd3-qcow2-rootfs/kernel_modules/Makefile
diff --git a/build_initram_dracut.sh b/build_initram_dracut.sh
deleted file mode 100755
index 0eb09cff..00000000
--- a/build_initram_dracut.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-# dependencies: cpio
-mkdir dracut
-# download and extract dracut
-curl -L https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-043.tar.gz | tar -xz -C dracut --strip-components 1
-cd dracut
-
-## on virtualbox shared folder (symlinks are not allowed)
-# make the dracut-install binary (dracut-install resolves dependencies etc.)
-make install/dracut-install
-# copy the binary to current (instead of symlink)
-cp install/dracut-install dracut-install
-
-## if symlinks are available
-#make dracut-install
-
-# build initramfs
-./dracut.sh -l --verbose --force
diff --git a/build_initramfs.sh b/build_initramfs.sh
new file mode 100755
index 00000000..f2e5bd86
--- /dev/null
+++ b/build_initramfs.sh
@@ -0,0 +1,20 @@
+# dependencies: cpio
+mkdir dracut
+# download and extract dracut
+curl -L https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-043.tar.gz | tar -xz -C dracut --strip-components 1
+cd dracut
+
+## on virtualbox shared folder (symlinks are not allowed)
+# make the dracut-install binary (dracut-install resolves dependencies etc.)
+make install/dracut-install
+# copy the binary to current (instead of symlink)
+cp install/dracut-install dracut-install
+
+## if symlinks are available
+#make dracut-install
+
+# TODO build dnbd3.ko, nbd.ko (dnbd3-qcow2-rootfs/kernel_modules/Makefile)
+# TODO add dnbd3-qcow2-rootfs to modules.d
+
+# build initramfs
+./dracut.sh -l --verbose --force
diff --git a/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko b/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko
deleted file mode 100644
index e8c3f40f..00000000
Binary files a/builder/dnbd3-qcow2-rootfs/kernel_modules/nbd.ko and /dev/null differ
diff --git a/builder/dnbd3-qcow2-rootfs/module-setup.sh b/builder/dnbd3-qcow2-rootfs/module-setup.sh
old mode 100644
new mode 100755
index b3f14c1d..c19263a3
--- a/builder/dnbd3-qcow2-rootfs/module-setup.sh
+++ b/builder/dnbd3-qcow2-rootfs/module-setup.sh
@@ -22,7 +22,7 @@ check() {
             echo "The nbd-client major version is not 3, meaning its probably too old."
             return 1
         fi
-        if [ "${nbd_client_version_minor}" -gt 8 ]; then
+        if [ "${nbd_client_version_minor}" -gt 11 ]; then
             # TODO check if ver = 3.9 has the same new syntax...
             echo "The nbd-client minor version is greater than 8. A new syntax has been
                     introduced starting with 3.10 which we do not support."
@@ -55,8 +55,8 @@ install() {
 
     # NOTE: These modules are build again Kernel: 3.10.0-229.1.2.el7.x86_64
     # TODO: build these in check() !
-    inst "$moddir/kernel_modules/dnbd3.ko" \
-        /usr/lib/modules/current/extra/dnbd3.ko
+    #inst "$moddir/kernel_modules/dnbd3.ko" \
+        #/usr/lib/modules/current/extra/dnbd3.ko
     inst "$moddir/kernel_modules/nbd.ko" \
         /usr/lib/modules/current/extra/nbd.ko
 
diff --git a/dev_tools/startup.nsh b/dev_tools/startup.nsh
new file mode 100755
index 00000000..197beb46
--- /dev/null
+++ b/dev_tools/startup.nsh
@@ -0,0 +1,5 @@
+if exist fs0:\debug then
+    rm fs0:\debug
+    \vmlinuz-linux initrd=\initramfs-4.2.2-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012"
+endif
+\vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012"
-- 
cgit v1.2.3-55-g7522