diff options
Diffstat (limited to 'units')
| -rwxr-xr-x | units/meson-add-wants.sh | 4 | ||||
| -rw-r--r-- | units/systemd-ask-password-console.path | 2 | ||||
| -rw-r--r-- | units/systemd-ask-password-console.service.in | 2 | ||||
| -rw-r--r-- | units/systemd-ask-password-wall.path | 2 | ||||
| -rw-r--r-- | units/systemd-tmpfiles-setup.service.in | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh index 70f7172ae9..e2b260398c 100755 --- a/units/meson-add-wants.sh +++ b/units/meson-add-wants.sh @@ -18,10 +18,10 @@ unitpath="${DESTDIR:-}${unitdir}/${unit}" case "$target" in */) - mkdir -p -m 0755 "$dir" + mkdir -vp -m 0755 "$dir" ;; *) - mkdir -p -m 0755 "$(basename "$dir")" + mkdir -vp -m 0755 "$(dirname "$dir")" ;; esac diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path index d686ca634c..248d597540 100644 --- a/units/systemd-ask-password-console.path +++ b/units/systemd-ask-password-console.path @@ -11,7 +11,7 @@ Description=Dispatch Password Requests to Console Directory Watch Documentation=man:systemd-ask-password-console.service(8) DefaultDependencies=no -Conflicts=shutdown.target +Conflicts=shutdown.target emergency.service After=plymouth-start.service Before=paths.target shutdown.target cryptsetup.target ConditionPathExists=!/run/plymouth/pid diff --git a/units/systemd-ask-password-console.service.in b/units/systemd-ask-password-console.service.in index 6923d68df0..60fa7c3200 100644 --- a/units/systemd-ask-password-console.service.in +++ b/units/systemd-ask-password-console.service.in @@ -11,7 +11,7 @@ Description=Dispatch Password Requests to Console Documentation=man:systemd-ask-password-console.service(8) DefaultDependencies=no -Conflicts=shutdown.target +Conflicts=shutdown.target emergency.service After=plymouth-start.service systemd-vconsole-setup.service Before=shutdown.target ConditionPathExists=!/run/plymouth/pid diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path index 5a356b97d0..193a9b311e 100644 --- a/units/systemd-ask-password-wall.path +++ b/units/systemd-ask-password-wall.path @@ -11,7 +11,7 @@ Description=Forward Password Requests to Wall Directory Watch Documentation=man:systemd-ask-password-console.service(8) DefaultDependencies=no -Conflicts=shutdown.target +Conflicts=shutdown.target emergency.service Before=paths.target shutdown.target cryptsetup.target [Path] diff --git a/units/systemd-tmpfiles-setup.service.in b/units/systemd-tmpfiles-setup.service.in index 384be59481..b02bbcd61b 100644 --- a/units/systemd-tmpfiles-setup.service.in +++ b/units/systemd-tmpfiles-setup.service.in @@ -12,7 +12,7 @@ Description=Create Volatile Files and Directories Documentation=man:tmpfiles.d(5) man:systemd-tmpfiles(8) DefaultDependencies=no Conflicts=shutdown.target -After=local-fs.target systemd-sysusers.service +After=local-fs.target systemd-sysusers.service systemd-journald.service Before=sysinit.target shutdown.target RefuseManualStop=yes |