FIxes

5 files changed, 21 insertions, 21 deletions

diff --git a/builder/INSTALL b/builder/INSTALL
index a20a93a5..223d8942 100644
--- a/builder/INSTALL
+++ b/builder/INSTALL
@@ -1,18 +1,18 @@
 This subfolder is dedicated to dracut related files.
 
-The folder 'dnbd3-qcow2-rootfs' is a dracut module used to setup
+The folder 'dnbd3-rootfs' is a dracut module used to setup
 a client's rootfs based on a (read-only) dnbd3 export made writable
 through the kernel device mapper features.
 
 To use this module within dracut, you simply need to copy/link/mount
 the above mentioned folder to '/usr/lib/dracut/modules.d' prefixed
 with a numerical priority. We used '90' so far, so the module was linked
-to '/usr/lib/dracut/modules.d/90dnbd3-qcow2-rootfs'.
+to '/usr/lib/dracut/modules.d/90dnbd3-rootfs'.
 
 Once the module has been integrated in dracut's modules, you can build
 the initramfs with the following command:
 
-    dracut --no-hostonly --modules "dnbd3-qcow2-rootfs" <target_path>
+    dracut --no-hostonly --modules "dnbd3-rootfs" <target_path>
 
 Note that the '--no-hostonly' is critical if the machine dracut is
 executed on and the clients supposed to boot the resulting initramfs
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 20ba04a7..4f761f23 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -235,7 +235,7 @@ EOF
         utils_log 'Build initramfs.' && \
         utils_log 'Copy dnbd3 plugin into dracut modules folder.' && \
         cp --recursive --force --no-target-directory \
-            dnbd3-rootfs/ dracut/modules.d/90dndb3-rootfs \
+            dnbd3-rootfs/ dracut/modules.d/90dnbd3-rootfs \
             1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
         local loglevel=''
         if [ "$UTILS_VERBOSE" == 'yes' ]; then
@@ -244,8 +244,8 @@ EOF
         if [ "$_DEBUG" == 'yes' ]; then
             loglevel="$loglevel --stdlog 4"
         fi
-        dracut/dracut.sh --local $loglevel --force \
-            1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
+        dracut/dracut.sh --local $loglevel --force --modules "dnbd3-rootfs" \
+            --no-hostonly 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT"
 
     fi
     return 0
diff --git a/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh
index 29f9f210..05d569e3 100755
--- a/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh
+++ b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh
@@ -6,27 +6,27 @@ DNBD3_MOD_PATH="/usr/lib/modules/current/extra/dnbd3.ko"
 
 # do we actually have our modules?
 if [ ! -e "${NBD_MOD_PATH}" ]; then
-	warn "No such file of directory: ${NBD_MOD_PATH}"
-	emergency_shell -n "Error in $0"
-	return 1
+    warn "No such file of directory: ${NBD_MOD_PATH}"
+    emergency_shell -n "Error in $0"
+    return 1
 fi
 if [ ! -e "${DNBD3_MOD_PATH}" ]; then
-	warn "No such file of directory: ${DNBD3_MOD_PATH}"
-	emergency_shell -n "Error in $0"
-	return 1
+    warn "No such file of directory: ${DNBD3_MOD_PATH}"
+    emergency_shell -n "Error in $0"
+    return 1
 fi
 
 # load the kernel modules for dnbd3 and nbd
 if ! insmod "${DNBD3_MOD_PATH}"; then
-	warn "Failed to load DNBD3 kernel module..."
-	emergency_shell -n "Error in $0"
-	return 1
+    warn "Failed to load DNBD3 kernel module..."
+    emergency_shell -n "Error in $0"
+    return 1
 fi
 
 if ! insmod "${NBD_MOD_PATH}"; then
-	warn "Failed to load NBD kernel module..."
-	emergency_shell -n "Error in $0"
-	return 1
+    warn "Failed to load NBD kernel module..."
+    emergency_shell -n "Error in $0"
+    return 1
 fi
 
 return 0
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index b2307a77..a716cab3 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -38,7 +38,7 @@ install() {
     # region hooks
 
     inst_hook cmdline 00 "$moddir/hooks/cmdline/enable-sysrq.sh"
-    inst_hook cmdline 10 "$moddir/hooks/cmdline/prepare-network-kcl-parameter.sh"
+    # TODO inst_hook cmdline 10 "$moddir/hooks/cmdline/prepare-network-kcl-parameter.sh"
     inst_hook cmdline 90 "$moddir/hooks/cmdline/set-dracut-environment-variables.sh"
 
     inst_hook pre-udev 00 "$moddir/hooks/pre-udev/load-custom-kernel-modules.sh"
@@ -56,7 +56,7 @@ install() {
 
     inst_hook pre-pivot 00 "$moddir/hooks/pre-pivot/mount-tmp.sh"
 
-    # endregion 
+    # endregion
 
     # region scripts
 
diff --git a/dev-tools/startup.nsh b/dev-tools/startup.nsh
index 197beb46..3cf248c2 100755
--- a/dev-tools/startup.nsh
+++ b/dev-tools/startup.nsh
@@ -1,5 +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"
+    \vmlinuz-linux initrd=\initramfs-4.2.5-1-ARCH.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012" rd.debug rd.break ip=dhcp
 endif
 \vmlinuz-linux initrd=\initramfs-linux.img root=PARTLABEL=system rw rootflags=subvol=root quiet loglevel=2 acpi_osi="!Windows 2012"