From 036ee5a6884540517bf95044d61d04947b266ee8 Mon Sep 17 00:00:00 2001
From: jandob
Date: Fri, 11 Dec 2015 16:53:37 +0100
Subject: fix bug

---
 builder/build-initramfs.sh           | 13 +++++++++----
 builder/dnbd3-rootfs/module-setup.sh |  6 +++---
 builder/dnbd3-rootfs/scripts/rebash  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'builder')

diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 66cbcdb3..4791ac39 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -155,14 +155,10 @@ function build_initramfs_parse_command_line() {
             -v|--verbose)
                 shift
                 build_initramfs_verbose='yes'
-                logging.set_commands_log_level debug
-                logging.set_log_level info
                 ;;
             -d|--debug)
                 shift
                 build_initramfs_debug='yes'
-                logging.set_commands_log_level debug
-                logging.set_log_level debug
                 ;;
             -c|--cleanup)
                 shift
@@ -203,6 +199,15 @@ function build_initramfs_parse_command_line() {
                 return 1
         esac
     done
+    if [ "$build_initramfs_verbose" == 'yes' ]; then
+        logging.set_commands_log_level debug
+        logging.set_log_level info
+    fi
+    if [ "$build_initramfs_debug" == 'yes' ]; then
+        logging.set_commands_log_level debug
+        logging.set_log_level debug
+    fi
+
     if [[ "$UID" != '0' ]]; then
         logging.critical \
             "You have to run this script as \"root\" not as \"${USER}\"."
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index ead0c99c..b4440ddd 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -6,10 +6,10 @@ core.import logging
 core.import utils
 
 # TODO set log level via dracut logging options
-logging.set_log_level 'info'
-logging.set_commands_log_level 'info'
+logging.set_log_level debug
+logging.set_commands_log_level debug
 
-core.import "$(dirname "${BASH_SOURCE[0]}")/scripts/build.sh"
+core.import "$(core_abs_path "$(dirname "${BASH_SOURCE[0]}")/scripts/build.sh")"
 
 clean() {
     # NOTE: This method is currently triggered manually and not supported by
diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash
index 7095248b..7a4c3502 160000
--- a/builder/dnbd3-rootfs/scripts/rebash
+++ b/builder/dnbd3-rootfs/scripts/rebash
@@ -1 +1 @@
-Subproject commit 7095248b24c776c9ad4e66a59342ecd9d84cd99c
+Subproject commit 7a4c3502ab266a53d6a883bf456829b449c3ac37
-- 
cgit v1.2.3-55-g7522