summaryrefslogtreecommitdiffstats
path: root/builder
diff options
context:
space:
mode:
authortorben2015-11-05 16:30:39 +0100
committertorben2015-11-05 16:30:39 +0100
commit029748c414acfe36ac3ab0a11beec5f230f19463 (patch)
treeb8d2dcbc946297bbfbcb77929ca9feb53828224a /builder
parentFix utils. (diff)
downloadsystemd-init-029748c414acfe36ac3ab0a11beec5f230f19463.tar.gz
systemd-init-029748c414acfe36ac3ab0a11beec5f230f19463.tar.xz
systemd-init-029748c414acfe36ac3ab0a11beec5f230f19463.zip
Fix.
Diffstat (limited to 'builder')
-rwxr-xr-xbuilder/build-initramfs.sh15
-rwxr-xr-xbuilder/dnbd3-rootfs/module-setup.sh6
2 files changed, 10 insertions, 11 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 4ac686ac..0f9147f6 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -70,8 +70,8 @@ function build_initramfs() {
local _SCOPE='export'
fi
# NOTE: Only initialize environment if current scope wasn't set yet.
- if [ "$_VERBOSE" == '' ]; then
- "$_SCOPE" _VERBOSE='no'
+ if [ "$UTILS_VERBOSE" == '' ]; then
+ "$_SCOPE" UTILS_VERBOSE='no'
"$_SCOPE" _LOAD_ENVIRONMENT='no'
"$_SCOPE" _CREATE_SYSTEM_IMAGE='no'
local dependencies=(bash cpio git test shift echo mktemp cat rm sed \
@@ -138,7 +138,7 @@ EOF
;;
-v|--verbose)
shift
- _VERBOSE='yes'
+ UTILS_VERBOSE='yes'
;;
-d|--debug)
shift
@@ -160,7 +160,7 @@ EOF
break
;;
*)
- build_initramfs_log 'critical' \
+ utils_log 'critical' \
"Given argument: \"$1\" is not available." '\n' && \
if [[ "$_SCOPE" == 'local' ]]; then
build_initramfs_print_help_message "$0"
@@ -169,7 +169,7 @@ EOF
esac
done
if [[ "$UID" != '0' ]]; then
- build_initramfs_log 'critical' \
+ utils_log 'critical' \
"You have to run this script as \"root\" not as \"${USER}\"."
exit 2
fi
@@ -186,7 +186,7 @@ EOF
# >>> build_initramfs_initialize_dracut
# ...
mkdir dracut 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
- build_initramfs_log 'Download and extract dracut.' && \
+ utils_log 'Download and extract dracut.' && \
curl --location \
https://www.kernel.org/pub/linux/utils/boot/dracut/dracut-043.tar.gz | \
tar --extract --gzip --directory dracut --strip-components 1 \
@@ -194,7 +194,7 @@ EOF
pushd dracut 1>"$UTILS_STANDARD_OUTPUT" 2>"$UTILS_ERROR_OUTPUT" && \
# NOTE: On virtualbox shared folder symlinks are not allowed.
# make the dracut-install binary (dracut-install resolves dependencies etc.)
- build_initramfs_log 'Compile dracut.' && \
+ utils_log 'Compile dracut.' && \
make install/dracut-install 1>"$UTILS_STANDARD_OUTPUT" \
2>"$UTILS_ERROR_OUTPUT" && \
# NOTE: We have to copy the binary to current instead of symlinking
@@ -221,7 +221,6 @@ EOF
utils_dependency_check "${_DEPENDENCIES[*]}" || \
utils_log 'error' 'Satisfying main dependencies failed.'
build_initramfs_command_line_interface "$@" || return $?
-
utils_log 'Checking dracut.' && \
if ! [[ -d ./dracut ]]; then
utils_log "Dracut isn't available yet loading it." && \
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index b9134871..672c1b3e 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -3,9 +3,9 @@
source "$moddir/scripts/utils.sh"
check() {
- compile_nbd && \
- compile_dnbd3 && \
- compile_systemd_preserve_process_marker
+ utils_compile_nbd && \
+ utils_compile_dnbd3 && \
+ utils_compile_systemd_preserve_process_marker
return $?
}