diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-05 10:15:13 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-05 12:06:30 +0200 |
| commit | 889128b8b27abb13e1691a72e4ce0562c564e257 (patch) | |
| tree | 5f488f3cb5f2a4965b4c348d88b4e8b499609265 /units | |
| parent | 0f00528db4e941503ec8cb5052367b17a8b566ba (diff) | |
| download | systemd-889128b8b27abb13e1691a72e4ce0562c564e257.tar.gz | |
units: add remote-cryptsetup.target and remote-cryptsetup-pre.target
The pair is similar to remote-fs.target and remote-fs-pre.target. Any
cryptsetup devices which require network shall be ordered after
remote-cryptsetup-pre.target and before remote-cryptsetup.target.
Diffstat (limited to 'units')
| -rw-r--r-- | units/cryptsetup-pre.target | 2 | ||||
| -rw-r--r-- | units/cryptsetup.target | 2 | ||||
| -rw-r--r-- | units/meson.build | 3 | ||||
| -rw-r--r-- | units/remote-cryptsetup-pre.target | 15 | ||||
| -rw-r--r-- | units/remote-cryptsetup.target | 10 |
5 files changed, 30 insertions, 2 deletions
diff --git a/units/cryptsetup-pre.target b/units/cryptsetup-pre.target index 42e35dd4e4..6cb28a61ae 100644 --- a/units/cryptsetup-pre.target +++ b/units/cryptsetup-pre.target @@ -6,7 +6,7 @@ # (at your option) any later version. [Unit] -Description=Encrypted Volumes (Pre) +Description=Local Encrypted Volumes (Pre) Documentation=man:systemd.special(7) RefuseManualStart=yes Before=cryptsetup.target diff --git a/units/cryptsetup.target b/units/cryptsetup.target index 25d3e33f6a..10b17fd387 100644 --- a/units/cryptsetup.target +++ b/units/cryptsetup.target @@ -6,5 +6,5 @@ # (at your option) any later version. [Unit] -Description=Encrypted Volumes +Description=Local Encrypted Volumes Documentation=man:systemd.special(7) diff --git a/units/meson.build b/units/meson.build index be32a39e5f..2024d0bfa1 100644 --- a/units/meson.build +++ b/units/meson.build @@ -48,6 +48,9 @@ units = [ ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], ['reboot.target', '', 'runlevel6.target ctrl-alt-del.target'], + ['remote-cryptsetup-pre.target', 'HAVE_LIBCRYPTSETUP'], + ['remote-cryptsetup.target', 'HAVE_LIBCRYPTSETUP', + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], ['remote-fs-pre.target', ''], ['remote-fs.target', '', join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], diff --git a/units/remote-cryptsetup-pre.target b/units/remote-cryptsetup-pre.target new file mode 100644 index 0000000000..a375e61889 --- /dev/null +++ b/units/remote-cryptsetup-pre.target @@ -0,0 +1,15 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Remote Encrypted Volumes (Pre) +Documentation=man:systemd.special(7) +RefuseManualStart=yes +Before=remote-cryptsetup.target + +After=network.target network-online.target +Wants=network-online.target diff --git a/units/remote-cryptsetup.target b/units/remote-cryptsetup.target new file mode 100644 index 0000000000..60943bd1cb --- /dev/null +++ b/units/remote-cryptsetup.target @@ -0,0 +1,10 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Remote Encrypted Volumes +Documentation=man:systemd.special(7) |