diff options
author | jandob | 2016-01-15 14:06:46 +0100 |
---|---|---|
committer | jandob | 2016-01-15 14:06:46 +0100 |
commit | ee08efe82a7d9a95bb24aef7aaf55e17fc946ee3 (patch) | |
tree | 937908e6e92758366fec92ef27acd94a79a56e41 /builder/dnbd3-rootfs/module-setup.sh | |
parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
download | systemd-init-ee08efe82a7d9a95bb24aef7aaf55e17fc946ee3.tar.gz systemd-init-ee08efe82a7d9a95bb24aef7aaf55e17fc946ee3.tar.xz systemd-init-ee08efe82a7d9a95bb24aef7aaf55e17fc946ee3.zip |
copy service files into new root
Diffstat (limited to 'builder/dnbd3-rootfs/module-setup.sh')
-rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index e65f0a62..7ef1a911 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -122,25 +122,28 @@ install() { inst_hook pre-udev 00 "$moddir/hooks/load-custom-kernel-modules.sh" if dracut_module_included "systemd-initrd"; then - # TODO analyze qemu-nbd pivot-root bug! - inst_script "$moddir/services/dnbd3-generator.sh" \ - $systemdutildir/system-generators/dnbd3-generator inst "$moddir/hooks/prepare-root-partition.sh" \ /sbin/dnbd3root inst "$moddir/hooks/fetch-config.sh" \ /sbin/fetch-config - #region old approach - #inst_simple "${moddir}/services/dnbd3root.service" \ - #"${systemdsystemunitdir}/dnbd3root.service" - #mkdir -p "${initdir}/${systemdsystemunitdir}/sysinit.target.wants" - #ln_r "${systemdsystemunitdir}/dnbd3root.service" \ - #"${systemdsystemunitdir}/sysinit.target.wants/dnbd3root.service" + + #region generator approach + ## TODO analyze qemu-nbd pivot-root bug! + #inst_script "$moddir/services/dnbd3-generator.sh" \ + #$systemdutildir/system-generators/dnbd3-generator + ## copy generator to new root to prevent stopping of the service after + ## switch_root + #inst_hook pre-pivot 95 "$moddir/hooks/copy-dnbd3-generator-into-newroot.sh" + #endregion + + #region service approach + inst_simple "${moddir}/services/dnbd3root.service" \ + "${systemdsystemunitdir}/dnbd3root.service" # don't kill at switch_root - #mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-root-fs.target.wants" - #ln_r "${systemdsystemunitdir}/dnbd3root.service" \ - #"${systemdsystemunitdir}/initrd-root-fs.target.wants/dnbd3root.service" - # todo don't kill after switch_root - #works if initrd-root-fs wants dnbd3.service (on /sysroot) + mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-root-fs.target.wants" + ln_r "${systemdsystemunitdir}/dnbd3root.service" \ + "${systemdsystemunitdir}/initrd-root-fs.target.wants/dnbd3root.service" + inst_hook pre-pivot 95 "$moddir/hooks/copy-dnbd3-generator-into-newroot.sh" #endregion else # get the openslx config from the servers configured in the kernel command |