From 0286078e63f2cfb2f717547c29e0104455270b21 Mon Sep 17 00:00:00 2001
From: jandob
Date: Mon, 29 Feb 2016 17:33:21 +0100
Subject: do not start mount hooks if dnbd3 service fails

---
 builder/dnbd3-rootfs/module-setup.sh            | 5 +++--
 builder/dnbd3-rootfs/services/dnbd3root.service | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'builder')

diff --git a/builder/dnbd3-rootfs/module-setup.sh b/builder/dnbd3-rootfs/module-setup.sh
index f6d7349b..9adeb3e5 100755
--- a/builder/dnbd3-rootfs/module-setup.sh
+++ b/builder/dnbd3-rootfs/module-setup.sh
@@ -155,9 +155,10 @@ install() {
             /usr/bin/dnbd3root
         inst_simple "${moddir}/services/dnbd3root.service" \
             "${systemdsystemunitdir}/dnbd3root.service"
-        mkdir -p "${initdir}/${systemdsystemunitdir}/initrd-root-fs.target.wants"
+        mkdir --parents \
+            "${initdir}/${systemdsystemunitdir}/dracut-mount.service.requires"
         ln_r "${systemdsystemunitdir}/dnbd3root.service" \
-            "${systemdsystemunitdir}/initrd-root-fs.target.wants/dnbd3root.service"
+            "${systemdsystemunitdir}/dracut-mount.service.requires/dnbd3root.service"
 
         # copy systemd services to new root (so they don't get killed after
         # switch_root)
diff --git a/builder/dnbd3-rootfs/services/dnbd3root.service b/builder/dnbd3-rootfs/services/dnbd3root.service
index 2da16d3b..592b049d 100644
--- a/builder/dnbd3-rootfs/services/dnbd3root.service
+++ b/builder/dnbd3-rootfs/services/dnbd3root.service
@@ -4,7 +4,7 @@ After=dracut-pre-mount.service network.target
 Before=dracut-mount.service
 DefaultDependencies=no
 IgnoreOnIsolate=true
-Restart=on-failure
+#OnFailure=emergency.target
 #Conflicts=shutdown.target
 #ConditionKernelCommandLine=!
 #ConditionPathExists=/etc/multipath.conf
-- 
cgit v1.2.3-55-g7522