diff options
| author | jandob | 2015-11-05 17:48:38 +0100 |
|---|---|---|
| committer | jandob | 2015-11-05 17:48:38 +0100 |
| commit | c31f32860d7b926e41bea88b122ba2fc5c7657df (patch) | |
| tree | 3701453b810b8070d40f3381149259b405c46af7 /builder | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
| download | systemd-init-c31f32860d7b926e41bea88b122ba2fc5c7657df.tar.gz systemd-init-c31f32860d7b926e41bea88b122ba2fc5c7657df.tar.xz systemd-init-c31f32860d7b926e41bea88b122ba2fc5c7657df.zip | |
bug fixing
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/build-initramfs.sh | 10 | ||||
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 2 | ||||
| -rw-r--r-- | builder/dnbd3-rootfs/scripts/utils.sh | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index 291ca8fd..20ba04a7 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -142,6 +142,7 @@ EOF ;; -d|--debug) shift + _DEBUG='yes' UTILS_STANDARD_OUTPUT=/dev/stdout UTILS_ERROR_OUTPUT=/dev/stderr ;; @@ -236,7 +237,14 @@ EOF cp --recursive --force --no-target-directory \ dnbd3-rootfs/ dracut/modules.d/90dndb3-rootfs \ 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ - dracut/dracut.sh --local --verbose --force \ + local loglevel='' + if [ "$UTILS_VERBOSE" == 'yes' ]; then + loglevel='--verbose' + fi + if [ "$_DEBUG" == 'yes' ]; then + loglevel="$loglevel --stdlog 4" + fi + dracut/dracut.sh --local $loglevel --force \ 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" fi diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 33d12441..f29a71c9 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -2,6 +2,8 @@ check() { source "$moddir/scripts/utils.sh" + UTILS_STANDARD_OUTPUT=/dev/stdout + UTILS_ERROR_OUTPUT=/dev/stderr utils_compile_nbd "$moddir/binaries/nbd/" && \ utils_compile_dnbd3 "$moddir/binaries/dnbd3" && \ diff --git a/builder/dnbd3-rootfs/scripts/utils.sh b/builder/dnbd3-rootfs/scripts/utils.sh index 66d370ba..4c0ffee2 100644 --- a/builder/dnbd3-rootfs/scripts/utils.sh +++ b/builder/dnbd3-rootfs/scripts/utils.sh @@ -42,7 +42,7 @@ function utils_compile_nbd() { # ... # Provides the following file: # "$1/nbd.ko" - pushd "$1" 1>"$UTILS_STANDARD_OUTPUT" 2>"$_ERROR_OUTPUT" && \ + pushd "$1" 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ utils_log 'Compile the nbd kernel module.' && \ make 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ popd 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" @@ -58,9 +58,9 @@ function utils_compile_dnbd3() { # ... # Provides the following file: # "$1/build/dnbd3.ko" + pushd "$1/.." 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ rm --recursive --force "$1" 1>"$UTILS_STANDARD_OUTPUT" \ 2>"$UTILS_ERROR_OUTPUT" && \ - pushd "$1" 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ git clone git://git.openslx.org/dnbd3.git \ 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ cd dnbd3 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \ @@ -69,7 +69,7 @@ function utils_compile_dnbd3() { return $? # TODO rm -rf build } -function compile_systemd_preserve_process_marker() { +function utils_compile_systemd_preserve_process_marker() { # Compiles simple c program. # # Examples: |