diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh index 5f62a8cd..505cc4c6 100755 --- a/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh +++ b/builder/dnbd3-rootfs/hooks/cmdline/prepare-kernel-command-line-parameter.sh @@ -1,9 +1,9 @@ command -v warn &> /dev/null || . /lib/dracut-lib.sh -set -e +## TODO check set -e # This location will be used to have a writable kernel command line file # location. -local writeable_proc_cmdline_path='/writable_proc_cmdline/' +writeable_proc_cmdline_path='/writable_proc_cmdline/' mkdir --parents "$writeable_proc_cmdline_path" # NOTE: The fake writeable overlay have to be a temporary filesystem for the # hack to work. @@ -29,7 +29,7 @@ for parameter in $(getargs ip=); do /proc/cmdline > "${writeable_proc_cmdline_path}cmdline" done -mount --options bind /fake/cmdline /proc/cmdline +mount --options bind "${writeable_proc_cmdline_path}cmdline" /proc/cmdline for parameter in $(getargs slxsrv=); do slxsrv="$parameter" @@ -38,4 +38,4 @@ for parameter in $(getargs slxbase=); do slxbase="$parameter" done -set +e +##set +e diff --git a/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh index e0987711..310aba51 100755 --- a/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh +++ b/builder/dnbd3-rootfs/hooks/pre-mount/fetch-config.sh @@ -23,7 +23,7 @@ mkdir -p "${SLX_CONFIG_DIR}" && \ wget --timeout 5 --quiet "http://${SLX_SERVER}/${SLX_BASE}/config" \ --output-document "${SLX_CONFIG_FILE}" && \ return_code="$?" -if [ $result -ne 0 ]; then +if [[ $return_code != 0 ]]; then warn "Downloading OpenSLX configuration from ${SLX_SERVER}/${SLX_BASE} failed. Return code: $return_code" emergency_shell -n "$0" return 1 diff --git a/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default b/dev-tools/virtualBoxTFTPRoot/pxelinux.cfg/default index 9785b1a7..2dbe1e0a 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:132.230.4.6:10.0.2.2:255.255.255.0 vconsole.font=latarcyrheb-sun16 vconsole.keymap=de slxsrv=132.230.4.2 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=132.230.4.201 slxbase=/ vga=current LABEL BootNormal MENU LABEL ^Boot Normal (HDD) |