Merge branch 'nobash' into centos8

1 files changed, 1 insertions, 19 deletions

diff --git a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
index 86116098..b3d3eb75 100755
--- a/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
+++ b/builder/modules.d/dnbd3-rootfs/hooks/load-custom-kernel-modules.sh
@@ -1,30 +1,12 @@
 #!/usr/bin/env bash
 # -*- coding: utf-8 -*-
-# region imports
-source '/usr/lib/rebash/core.sh'
-core.import exceptions
-core.import logging
 type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh
-# endregion
-exceptions.try
-{
 for kmod in dnbd3 \
             "loop max_loop=8"  \
             loop_file_fmt_qcow \
             loop_file_fmt_raw; do
     if ! modprobe ${kmod}; then
-        logging.warn "Failed to load kernel module: $kmod"
+        warn "Failed to load kernel module: $kmod"
         ! :
     fi
 done
-
-}
-exceptions.catch
-{
-    logging.error "$exceptions_last_traceback"
-    emergency_shell "error in ${BASH_SOURCE[0]}"
-}
-# region vim modline
-# vim: set tabstop=4 shiftwidth=4 expandtab:
-# vim: foldmethod=marker foldmarker=region,endregion:
-# endregion