diff options
author | jandob | 2016-02-29 16:43:10 +0100 |
---|---|---|
committer | jandob | 2016-02-29 16:43:10 +0100 |
commit | 66fab8aabd9dd5769e24c1fbcacd1ef54f9a770f (patch) | |
tree | 43738d23033036cbbe4a4d8704c1b26cbfa3a606 /builder/dnbd3-rootfs | |
parent | Merge branch 'master' of git.openslx.org:openslx-ng/systemd-init (diff) | |
download | systemd-init-66fab8aabd9dd5769e24c1fbcacd1ef54f9a770f.tar.gz systemd-init-66fab8aabd9dd5769e24c1fbcacd1ef54f9a770f.tar.xz systemd-init-66fab8aabd9dd5769e24c1fbcacd1ef54f9a770f.zip |
fix
Diffstat (limited to 'builder/dnbd3-rootfs')
-rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh index 14d949fe..f6d7349b 100755 --- a/builder/dnbd3-rootfs/module-setup.sh +++ b/builder/dnbd3-rootfs/module-setup.sh @@ -127,9 +127,9 @@ install() { /usr/bin/container-unpack-xmount # xmount local xmount_installation="$moddir/binaries/xmount/trunk/build/release_build" - inst "${xmount_installation}/bin/xmount" /usr/bin/xmount + inst "${xmount_installation}/usr/bin/xmount" /usr/bin/xmount for file in ${xmount_installation}/usr/lib/xmount/*; do - inst "$file" /usr/lib/xmount/$(basename "$file") + inst "$file" /usr/lib/xmount/"$(basename "$file")" done inst "$moddir/binaries/qemu-xmount/libxmount_input_qemu.so" \ /usr/lib/xmount/libxmount_input_qemu.so @@ -155,12 +155,12 @@ install() { /usr/bin/dnbd3root inst_simple "${moddir}/services/dnbd3root.service" \ "${systemdsystemunitdir}/dnbd3root.service" - - # copy systemd services to new root (so they don't get killed after - # switch_root) mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-root-fs.target.wants" ln_r "${systemdsystemunitdir}/dnbd3root.service" \ "${systemdsystemunitdir}/initrd-root-fs.target.wants/dnbd3root.service" + + # copy systemd services to new root (so they don't get killed after + # switch_root) inst_hook pre-pivot 00 "$moddir/hooks/copy-dnbd3-service-into-newroot.sh" inst_hook pre-pivot 00 "$moddir/hooks/copy-dracut-systemd-files-into-newroot.sh" else |