summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjandob2016-02-29 17:39:55 +0100
committerjandob2016-02-29 17:39:55 +0100
commitf934f5a706bdf5aac10c3b0e55bbc9262302a61c (patch)
tree351d7dfed272e617d2f98754e9cacf3dbb07812a
parentdo not start mount hooks if dnbd3 service fails (diff)
downloadsystemd-init-f934f5a706bdf5aac10c3b0e55bbc9262302a61c.tar.gz
systemd-init-f934f5a706bdf5aac10c3b0e55bbc9262302a61c.tar.xz
systemd-init-f934f5a706bdf5aac10c3b0e55bbc9262302a61c.zip
fix
-rw-r--r--builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh2
-rw-r--r--builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
index 51e0105c..592bc3b4 100644
--- a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
systemdsystemunitdir="$(
dirname "$(find / -name dracut-mount.service -type f -print -quit)")"
-newsystemdsystemunitdir="${NEWROOT}/lib/systemd"
+newsystemdsystemunitdir="${NEWROOT}/lib/systemd/system"
cp "${systemdsystemunitdir}/dnbd3root.service" \
"${newsystemdsystemunitdir}/dnbd3root.service"
diff --git a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
index 7093439e..075428ee 100644
--- a/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
+++ b/builder/dnbd3-rootfs/hooks/copy-dracut-systemd-files-into-newroot.sh
@@ -2,9 +2,9 @@
# Dracut may not be installed on the new root. Thus copy all services over.
systemdsystemunitdir="$(
dirname "$(find / -name dracut-mount.service -type f -print -quit)")"
-newsystemdsystemunitdir="${NEWROOT}/lib/systemd"
+newsystemdsystemunitdir="${NEWROOT}/lib/systemd/system"
-mkdir --parents "$newsystemdsystemunitdir"
+mkdir --parents "$newsystemdsystemunitdir/initrd.target.wants"
for file in \
dracut-cmdline.service \
dracut-initqueue.service \