summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortorben2015-11-20 14:15:02 +0100
committertorben2015-11-20 14:15:02 +0100
commit7f7fd1c9e8d4f87a1e83e9a15eb9cdf4fe298716 (patch)
tree43d7bdd8df04291348dd978b508506c1e53a9955
parentMerge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff)
downloadsystemd-init-7f7fd1c9e8d4f87a1e83e9a15eb9cdf4fe298716.tar.gz
systemd-init-7f7fd1c9e8d4f87a1e83e9a15eb9cdf4fe298716.tar.xz
systemd-init-7f7fd1c9e8d4f87a1e83e9a15eb9cdf4fe298716.zip
Fix log level in verbose mode.
-rwxr-xr-xbuilder/build-initramfs.sh17
-rw-r--r--dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default2
2 files changed, 9 insertions, 10 deletions
diff --git a/builder/build-initramfs.sh b/builder/build-initramfs.sh
index 4e973ee5..5e5195fe 100755
--- a/builder/build-initramfs.sh
+++ b/builder/build-initramfs.sh
@@ -93,7 +93,7 @@ function build-initramfs() {
function build_initramfs_print_usage_message() {
# Prints a description about how to use this program.
- cat << EOF
+ logging.cat << EOF
$__NAME__ provides a generic way to install systemd based remote linux
initramfs.
EOF
@@ -101,14 +101,14 @@ EOF
function build_initramfs_print_usage_examples() {
# Prints a description about how to use this program by providing
# examples.
- cat << EOF
+ logging.cat << EOF
# Start install progress:
# >>> ./build_initramfs.sh
EOF
}
function build_initramfs_print_command_line_option_description() {
# Prints descriptions about each available command line option.
- cat << EOF
+ logging.cat << EOF
-h --help Shows this help message.
-v --verbose Tells you what is going on (default: "$_VERBOSE").
@@ -125,13 +125,13 @@ EOF
}
function build_initramfs_print_help_message() {
# Provides a help message for this module.
- echo -e "\nUsage: $0 [options]\n"
+ logging.plain "\nUsage: $0 [options]\n"
build_initramfs_print_usage_message "$@"
- echo -e '\nExamples:\n'
+ logging.plain '\nExamples:\n'
build_initramfs_print_usage_examples "$@"
- echo -e '\nOption descriptions:\n'
+ logging.plain -e '\nOption descriptions:\n'
build_initramfs_print_command_line_option_description "$@"
- echo
+ logging.plain
}
function build_initramfs_command_line_interface() {
# Provides the command line interface and interactive questions.
@@ -144,7 +144,7 @@ EOF
;;
-v|--verbose)
shift
- logging.set_commands_log_level info
+ logging.set_commands_log_level debug
logging.set_log_level info
;;
-d|--debug)
@@ -258,7 +258,6 @@ EOF
loglevel="$loglevel --stdlog 4"
modules="$modules i18n"
fi
- echo "$logging.level"
dracut/dracut.sh --local $loglevel --force --modules "$modules" \
--no-hostonly /boot/initramfs-test.img
logging.info 'All done!'
diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default
index 2dbe1e0a..58e36451 100644
--- a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default
+++ b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default
@@ -8,7 +8,7 @@ MENU TITLE My PXE Boot Menu
LABEL arch
MENU LABEL ^arch network boot
KERNEL /vmlinuz-linux
-APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.201 slxbase=/ vga=current
+APPEND initrd=/initramfs-test.img root=PARTLABEL=system rw rootflags=subvol=root loglevel=2 acpi_osi="!Windows 2012" rd.info rd.break ip=10.0.2.15::10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=gateway slxbase=/ vga=current
LABEL BootNormal
MENU LABEL ^Boot Normal (HDD)