From f39f298db2ceeddc35c4d71e06d1a39c2fc899a4 Mon Sep 17 00:00:00 2001
From: jandob
Date: Mon, 29 Feb 2016 16:02:49 +0100
Subject: rename dnbdr copy hook

---
 builder/dnbd3-rootfs/hooks/copy-dnbd3-generator-into-newroot.sh | 9 ---------
 builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh   | 9 +++++++++
 builder/dnbd3-rootfs/module-setup.sh                            | 2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 builder/dnbd3-rootfs/hooks/copy-dnbd3-generator-into-newroot.sh
 create mode 100644 builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh

(limited to 'builder/dnbd3-rootfs')

diff --git a/builder/dnbd3-rootfs/hooks/copy-dnbd3-generator-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dnbd3-generator-into-newroot.sh
deleted file mode 100644
index 6fa6510d..00000000
--- a/builder/dnbd3-rootfs/hooks/copy-dnbd3-generator-into-newroot.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#mkdir --parents "${NEWROOT}/run/systemd/system-generators/"
-#cp "/usr/lib/systemd/system-generators/dnbd3-generator" "${NEWROOT}/run/systemd/system-generators/"
-systemddir="/lib/systemd"
-newsystemddir="${NEWROOT}/lib/systemd"
-mkdir -p ${newsystemddir}/system/sysinit.target.wants
-cp ${systemddir}/system/dnbd3root.service \
-    ${newsystemddir}/system/dnbd3root.service
-ln -s ../dnbd3root.service \
-    ${newsystemddir}/system/sysinit.target.wants/dnbd3root.service
diff --git a/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
new file mode 100644
index 00000000..6fa6510d
--- /dev/null
+++ b/builder/dnbd3-rootfs/hooks/copy-dnbd3-service-into-newroot.sh
@@ -0,0 +1,9 @@
+#mkdir --parents "${NEWROOT}/run/systemd/system-generators/"
+#cp "/usr/lib/systemd/system-generators/dnbd3-generator" "${NEWROOT}/run/systemd/system-generators/"
+systemddir="/lib/systemd"
+newsystemddir="${NEWROOT}/lib/systemd"
+mkdir -p ${newsystemddir}/system/sysinit.target.wants
+cp ${systemddir}/system/dnbd3root.service \
+    ${newsystemddir}/system/dnbd3root.service
+ln -s ../dnbd3root.service \
+    ${newsystemddir}/system/sysinit.target.wants/dnbd3root.service
diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index bbb5bce2..14d949fe 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -161,7 +161,7 @@ install() {
         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 00 "$moddir/hooks/copy-dnbd3-generator-into-newroot.sh"
+        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
         inst_hook pre-mount 10 "$moddir/hooks/prepare-root-partition.sh"
-- 
cgit v1.2.3-55-g7522