diff options
| author | Jonathan Bauer | 2019-09-17 18:31:21 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-09-17 18:31:21 +0200 |
| commit | 1f88b49018427cf37079e70dac3149f7a1dd94f4 (patch) | |
| tree | dc0a622cae3b7f372f532df234e5b052ab800834 /builder | |
| parent | more optimiziation (diff) | |
| download | systemd-init-1f88b49018427cf37079e70dac3149f7a1dd94f4.tar.gz systemd-init-1f88b49018427cf37079e70dac3149f7a1dd94f4.tar.xz systemd-init-1f88b49018427cf37079e70dac3149f7a1dd94f4.zip | |
more improvements
Diffstat (limited to 'builder')
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh | 5 | ||||
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh | 1 | ||||
| -rwxr-xr-x | builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh | 14 |
3 files changed, 7 insertions, 13 deletions
diff --git a/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh b/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh index f159e3ae..323ec45e 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/enable-sysrq.sh @@ -3,8 +3,3 @@ # Enables magic sysrq kernel supported key combinations. echo 1 > /proc/sys/kernel/sysrq - -# region vim modline -# vim: set tabstop=4 shiftwidth=4 expandtab: -# vim: foldmethod=marker foldmarker=region,endregion: -# endregion diff --git a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh index cbdaef38..a11332a7 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/fetch-config.sh @@ -47,3 +47,4 @@ cat "$config_path" >> /etc/openslx # slxsrv overrides SLX_DNBD3_SERVERS if prefixed with @ [ "${slx_server#@}" != "${slx_server}" ] && sed -i "s/^SLX_DNBD3_SERVERS=.*/SLX_DNBD3_SERVERS='${slx_server#@}'/" "/etc/openslx" +true diff --git a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh index 9d49069c..702b6331 100755 --- a/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh +++ b/builder/modules.d/dnbd3-rootfs/hooks/mount-root-device.sh @@ -2,12 +2,10 @@ # -*- coding: utf-8 -*- type emergency_shell >/dev/null 2>&1 || source /lib/dracut-lib.sh -if ! getarg root=; then - source "/etc/openslx" - mount "$SLX_DNBD3_DEVICE_COW" "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS - if [ -n "$SLX_GENERATE_FSTAB_SCRIPT" ]; then - eval "$SLX_GENERATE_FSTAB_SCRIPT" - else - echo "" > "$NEWROOT/etc/fstab" - fi +source "/etc/openslx" +mount "$SLX_DNBD3_DEVICE_COW" "$NEWROOT" $SLX_MOUNT_ROOT_OPTIONS +if [ -n "$SLX_GENERATE_FSTAB_SCRIPT" ]; then + eval "$SLX_GENERATE_FSTAB_SCRIPT" +else + echo "" > "$NEWROOT/etc/fstab" fi |