summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-11-20 14:55:42 +0100
committertorben2015-11-20 14:55:42 +0100
commit7fdd9536b7b7673db3afd1c6d59c1fa0332d3074 (patch)
treeac141871dbf95960e55b6a109caaacc0e4c50cce
parentMerge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff)
downloadsystemd-init-7fdd9536b7b7673db3afd1c6d59c1fa0332d3074.tar.gz
systemd-init-7fdd9536b7b7673db3afd1c6d59c1fa0332d3074.tar.xz
systemd-init-7fdd9536b7b7673db3afd1c6d59c1fa0332d3074.zip
Sync.
-rwxr-xr-xbuilder/build-initramfs.sh19
1 files changed, 9 insertions, 10 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index a1824842..9ca1aa18 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -85,8 +85,8 @@ EOF
function build_initramfs_print_usage_examples() {
# Prints a description about how to use this program by providing examples.
logging.cat << EOF
-# Start install progress:
-# >>> ./build_initramfs.sh
+Start install progress:
+>>> ./build_initramfs.sh
EOF
}
function build_initramfs_print_command_line_option_description() {
@@ -116,7 +116,7 @@ function build_initramfs_print_help_message() {
build_initramfs_print_command_line_option_description "$@"
logging.plain
}
-function build_initramfs_command_line_interface() {
+function build_initramfs_parse_command_line() {
# Provides the command line interface and interactive questions.
while true; do
case "$1" in
@@ -127,6 +127,7 @@ function build_initramfs_command_line_interface() {
;;
-v|--verbose)
shift
+ build_initramfs_verbose='yes'
logging.set_commands_log_level debug
logging.set_log_level info
;;
@@ -143,13 +144,10 @@ function build_initramfs_command_line_interface() {
;;
'')
- shift
break
;;
*)
- logging.critical \
- "Given argument: \"$1\" is not available.\n"
- build_initramfs_print_help_message "$0"
+ logging.critical "Given argument: \"$1\" is not available."
return 1
esac
done
@@ -205,20 +203,20 @@ function build_initramfs_create_qcow2_system() {
# region controller
utils.dependency_check "${build_initramfs_dependencies[*]}"
-build_initramfs_command_line_interface "$@"
+build_initramfs_parse_command_line "$@" || \
+ build_initramfs_print_help_message "$0" && echo TEEEST
logging.info 'Checking dracut.'
if ! [[ -d ./dracut ]]; then
logging.info "Dracut isn't available yet loading it."
build_initramfs_initialize_dracut
fi
-logging.info 'Build initramfs.'
-logging.info 'Link dnbd3 plugin into dracut modules folder.'
build_initramfs__dracut_modules_source='../../dnbd3-rootfs'
build_initramfs__dracut_modules_target='dracut/modules.d/90dnbd3-rootfs'
if [[ ! -L "$build_initramfs__dracut_modules_target" || "$(readlink \
"$build_initramfs__dracut_modules_target")" != \
"$build_initramfs__dracut_modules_source" ]]
then
+ logging.info 'Link dnbd3 plugin into dracut modules folder.'
ln --symbolic "$build_initramfs__dracut_modules_source" \
"$build_initramfs__dracut_modules_target"
# NOTE: If you copy we would have to recompile each binaries every time:
@@ -235,6 +233,7 @@ if [ "$build_initramfs_debug" == 'yes' ]; then
build_initramfs__loglevel="$build_initramfs__loglevel --stdlog 4"
build_initramfs__modules="$build_initramfs__modules i18n"
fi
+logging.info 'Build initramfs.'
dracut/dracut.sh --local $build_initramfs__loglevel --force --modules \
"$build_initramfs__modules" --no-hostonly /boot/initramfs-test.img
logging.info 'All done!'