diff options
| author | torben | 2015-11-20 15:05:15 +0100 |
|---|---|---|
| committer | torben | 2015-11-20 15:05:15 +0100 |
| commit | fce760faea91078f5cca4b88b53707fad8494861 (patch) | |
| tree | 5246d95279f68e77fa4d804bb52a1a4385398f26 | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
| download | systemd-init-fce760faea91078f5cca4b88b53707fad8494861.tar.gz systemd-init-fce760faea91078f5cca4b88b53707fad8494861.tar.xz systemd-init-fce760faea91078f5cca4b88b53707fad8494861.zip | |
Sync.
| -rwxr-xr-x | builder/build-initramfs.sh | 6 | ||||
| m--------- | builder/dnbd3-rootfs/scripts/rebash | 0 |
2 files changed, 4 insertions, 2 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh index eff41598..b45db534 100755 --- a/builder/build-initramfs.sh +++ b/builder/build-initramfs.sh @@ -203,8 +203,10 @@ function build_initramfs_create_qcow2_system() { # region controller utils.dependency_check "${build_initramfs_dependencies[*]}" -build_initramfs_parse_command_line "$@" || \ - build_initramfs_print_help_message "$0" && echo TEEEST +if ! build_initramfs_parse_command_line "$@"; then + build_initramfs_print_help_message "$0" + exit 1 +fi logging.info 'Checking dracut.' if ! [[ -d ./dracut ]]; then logging.info "Dracut isn't available yet loading it." diff --git a/builder/dnbd3-rootfs/scripts/rebash b/builder/dnbd3-rootfs/scripts/rebash -Subproject 71966ae6e5724804692cbce5c9295e52525214c +Subproject f7bcda12475d690c418c1c83b55c225f3423569 |