diff options
Diffstat (limited to 'modules.d/dnbd3-rootfs/module-setup.sh')
| -rwxr-xr-x | modules.d/dnbd3-rootfs/module-setup.sh | 40 |
1 files changed, 10 insertions, 30 deletions
diff --git a/modules.d/dnbd3-rootfs/module-setup.sh b/modules.d/dnbd3-rootfs/module-setup.sh index ce1b4b36..594e3380 100755 --- a/modules.d/dnbd3-rootfs/module-setup.sh +++ b/modules.d/dnbd3-rootfs/module-setup.sh @@ -149,45 +149,25 @@ install() { inst_hook cmdline 90 "$moddir/hooks/set-dracut-environment-variables.sh" # make the final blockdevice for the root system (dnbd3 -> xmount -> # device-mapper) - inst "$moddir/hooks/s3-dnbd3root.sh" \ - /usr/local/bin/s3-dnbd3root.sh - inst_simple "${moddir}/services/s3-dnbd3root.service" \ - "${systemdsystemunitdir}/s3-dnbd3root.service" - mkdir --parents \ - "${initdir}/${systemdsystemunitdir}/initrd-root-device.target.requires" - ln_r "${systemdsystemunitdir}/s3-dnbd3root.service" \ - "${systemdsystemunitdir}/initrd-root-device.target.requires/s3-dnbd3root.service" + slx_service "s3-dnbd3root" "Setup dnbd3-based block device of rootfs" \ + --after "s3-fetch-config.service" \ + --after "dracut-pre-mount.service" \ + --wbefore "dracut-mount.service" \ + --wbefore "initrd-root-device.target" # Mount the root file system - inst "$moddir/hooks/s3-mount-root.sh" \ - /usr/local/bin/s3-mount-root.sh - inst_simple "${moddir}/services/s3-mount-root.service" \ - "${systemdsystemunitdir}/s3-mount-root.service" - mkdir --parents \ - "${initdir}/${systemdsystemunitdir}/initrd-root-fs.target.requires" - ln_r "${systemdsystemunitdir}/s3-mount-root.service" \ - "${systemdsystemunitdir}/initrd-root-fs.target.requires/s3-mount-root.service" - # Copy /opt/openslx/config to newroot - inst "$moddir/hooks/s3-copy-openslx-config.sh" \ - /usr/local/bin/s3-copy-openslx-config.sh - inst_simple "${moddir}/services/s3-copy-openslx-config.service" \ - "${systemdsystemunitdir}/s3-copy-openslx-config.service" - mkdir --parents \ - "${initdir}/${systemdsystemunitdir}/initrd.target.requires" - ln_r "${systemdsystemunitdir}/s3-copy-openslx-config.service" \ - "${systemdsystemunitdir}/initrd.target.requires/s3-copy-openslx-config.service" + slx_service "s3-mount-root" "Mount /dev/mapper/root as /sysroot" \ + --after "initrd-root-device.target" \ + --requires "initrd-root-device.target" \ + --wbefore "initrd-root-fs.target" # Copy systemd services to new root (so they don't get killed after # switch_root) inst_hook pre-pivot 90 \ "$moddir/hooks/copy-dracut-systemd-files-into-newroot.sh" - #inst_hook pre-shutdown 00 "$moddir/hooks/shutdown-umount.sh" - #inst_hook pre-pivot 00 \ - # "$moddir/hooks/copy-openslx-configuration-into-newroot.sh" - # endregion - # region scripts # endregion # region configuration files mkdir --parents \ "${initdir}/etc/systemd/system.conf.d" + # Make sure all services know about NEWROOT=/sysroot inst "$moddir/configuration/systemd-newroot.conf" \ "/etc/systemd/system.conf.d/systemd-newroot.conf" # Use terminal readline settings from the template system. |