From 0eb8a4d1fb4e6d44248814898a0643c2d7eec1aa Mon Sep 17 00:00:00 2001
From: jandob
Date: Tue, 1 Mar 2016 11:24:14 +0100
Subject: fix

---
 builder/dnbd3-rootfs/module-setup.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'builder/dnbd3-rootfs')

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index 2fbda708..3f0cb7a5 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -4,23 +4,23 @@ source "$(dirname "${BASH_SOURCE[0]}")/scripts/rebash/core.sh"
 core.import exceptions
 core.import logging
 core.import utils
+core.import "$(core_abs_path "$(dirname "${BASH_SOURCE[0]}")/scripts/build.sh")"
 
 # set log level via dracut logging options
 _parse_dracut_args() {
+    local verbose=false
+    local debug=false
     while true; do
         case "$1" in
             --stdlog)
                 shift
                 local level="$1"
                 shift
-                [[ "$level" -le 3 ]] && continue
-                logging.set_level debug
-                logging.set_commands_level debug
+                [[ "$level" -ge 4 ]] && debug=true
                 ;;
             --verbose)
                 shift
-                logging.set_level info
-                logging.set_commands_level info
+                verbose=true
                 ;;
             '')
                 break
@@ -29,12 +29,15 @@ _parse_dracut_args() {
                 shift
                 ;;
         esac
+        local level
+        $verbose && level=info
+        $debug && level=debug
+        logging.set_level "$level"
+        logging.set_commands_level "$level"
     done
 }
 _parse_dracut_args ${dracut_args[*]}
 
-core.import "$(core_abs_path "$(dirname "${BASH_SOURCE[0]}")/scripts/build.sh")"
-
 clean() {
     # NOTE: This method is currently triggered manually and not supported by
     # dracut itself.
-- 
cgit v1.2.3-55-g7522