diff options
| author | jandob | 2016-01-07 15:20:35 +0100 |
|---|---|---|
| committer | jandob | 2016-01-07 15:20:35 +0100 |
| commit | 92f4c06dde6e997e547d315bdd1182e062fb27ab (patch) | |
| tree | 65c4d81251f2acac0157cf302a7ee884001cc30f /builder | |
| parent | change hooks variable scoping; introduce /etc/openslx config (diff) | |
| download | systemd-init-92f4c06dde6e997e547d315bdd1182e062fb27ab.tar.gz systemd-init-92f4c06dde6e997e547d315bdd1182e062fb27ab.tar.xz systemd-init-92f4c06dde6e997e547d315bdd1182e062fb27ab.zip | |
change hooks variable scoping; introduce /etc/openslx config
Diffstat (limited to 'builder')
3 files changed, 9 insertions, 11 deletions
diff --git a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh index da5237f0..a842d9e3 100755 --- a/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh +++ b/builder/dnbd3-rootfs/hooks/mount/mount-root-device.sh @@ -1,7 +1,5 @@ ( # subshell for variable scoping source "/etc/openslx" -mkdir --parents "$SLX_CONFIGURATION_LOCATION" -cp "/etc/openslx" "$SLX_CONFIGURATION_LOCATION" mount /dev/mapper/root "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS genfstab "$NEWROOT" > "$NEWROOT/etc/fstab" ) || exit $? diff --git a/builder/dnbd3-rootfs/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh b/builder/dnbd3-rootfs/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh index 662ebe07..118ef921 100755 --- a/builder/dnbd3-rootfs/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh +++ b/builder/dnbd3-rootfs/hooks/pre-pivot/copy-openslx-configuration-into-newroot.sh @@ -1,3 +1,3 @@ -mkdir --parents "${NEWROOT}${SLX_CONFIGURATION_LOCATION}" -cp "${SLX_CONFIGURATION_LOCATION}config" \ - "${NEWROOT}${SLX_CONFIGURATION_LOCATION}config" +source "/etc/openslx" +mkdir --parents "$SLX_CONFIGURATION_LOCATION" +cp "/etc/openslx" "${NEWROOT}${SLX_CONFIGURATION_LOCATION}" diff --git a/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh index 21cff17c..02d697d3 100755 --- a/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh +++ b/builder/dnbd3-rootfs/hooks/pre-udev/load-custom-kernel-modules.sh @@ -1,3 +1,4 @@ +( # subshell for variable scoping NBD_MOD_PATH="/usr/lib/modules/current/extra/nbd.ko" DNBD3_MOD_PATH="/usr/lib/modules/current/extra/dnbd3.ko" @@ -5,25 +6,24 @@ DNBD3_MOD_PATH="/usr/lib/modules/current/extra/dnbd3.ko" if [ ! -e "${NBD_MOD_PATH}" ]; then warn "No such file of directory: ${NBD_MOD_PATH}" emergency_shell -n "Error in $0" - return 1 + exit 1 fi if [ ! -e "${DNBD3_MOD_PATH}" ]; then warn "No such file of directory: ${DNBD3_MOD_PATH}" emergency_shell -n "Error in $0" - return 1 + exit 1 fi # load the kernel modules for dnbd3 and nbd if ! insmod "${DNBD3_MOD_PATH}"; then warn "Failed to load DNBD3 kernel module..." emergency_shell -n "Error in $0" - return 1 + exit 1 fi if ! modprobe nbd max_part=16; then warn "Failed to load NBD kernel module..." emergency_shell -n "Error in $0" - return 1 + exit 1 fi - -return 0 +) || exit $? |