Improve exception handling..

2 files changed, 5 insertions, 4 deletions

diff --git a/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh b/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh
deleted file mode 100755
index 9103afd9..00000000
--- a/builder/dnbd3-rootfs/hooks/pre-udev/setup-loopback-device.sh
+++ /dev/null
@@ -1 +0,0 @@
-/sbin/initqueue --name ifup-lo --unique --onetime /sbin/ifup lo -m
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 9ee50ce4..2d5528f8 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -15,6 +15,7 @@ clean() {
         utils_clean_systemd_preserve_process_marker \
             "$moddir/binaries/systemd-preserve-process-marker/"
     fi
+    return 0
 }
 
 check() {
@@ -28,7 +29,7 @@ check() {
     logging_set_log_level 'info'
     logging_set_commands_log_level 'info'
 
-    # TODO uncomment if rebash is fixed: exceptions_init
+    exceptions_activate
 
     if [[ ! -f "$moddir/binaries/nbd/nbd.ko" ]]; then
         utils_compile_nbd "$moddir/binaries/nbd/"
@@ -57,6 +58,9 @@ check() {
     if [[ ! -f /usr/bin/sh ]] && [[ -f /bin/sh ]]; then
         ln --symbolic --force /bin/sh /usr/bin/sh
     fi
+
+    exceptions_deactivate
+
     return 0
 }
 
@@ -107,8 +111,6 @@ install() {
 
     # load nbd.ko, dnbd3.ko
     inst_hook pre-udev 00 "$moddir/hooks/pre-udev/load-custom-kernel-modules.sh"
-    # TODO needed?
-    inst_hook pre-udev 00 "$moddir/hooks/pre-udev/setup-loopback-device.sh"
 
     # get the openslx config from the servers configured in the kernel command
     # line (${SLX_SERVER}/${SLX_SERVER_BASE}/config)