diff options
| author | jandob | 2016-02-29 17:33:21 +0100 |
|---|---|---|
| committer | jandob | 2016-02-29 17:33:21 +0100 |
| commit | 0286078e63f2cfb2f717547c29e0104455270b21 (patch) | |
| tree | 491834ef4321af11f84abbe73986f54c12b9b7ff | |
| parent | fix systemd paths in new root (diff) | |
| download | systemd-init-0286078e63f2cfb2f717547c29e0104455270b21.tar.gz systemd-init-0286078e63f2cfb2f717547c29e0104455270b21.tar.xz systemd-init-0286078e63f2cfb2f717547c29e0104455270b21.zip | |
do not start mount hooks if dnbd3 service fails
| -rwxr-xr-x | builder/dnbd3-rootfs/module-setup.sh | 5 | ||||
| -rw-r--r-- | builder/dnbd3-rootfs/services/dnbd3root.service | 2 |
2 files changed, 4 insertions, 3 deletions
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 |