diff options
| author | Manuel Conzelmann | 2019-05-19 20:02:20 +0200 |
|---|---|---|
| committer | Manuel Conzelmann | 2019-05-19 20:02:20 +0200 |
| commit | 7325a06738598eaefb05dff54d5ff384c5e3c454 (patch) | |
| tree | 9bb4148cc357a58ea7316efb985462b47b8de6f5 | |
| parent | 75e2a255f351803c60f7810c68bc3226a2179b50 (diff) | |
| download | aur-7325a06738598eaefb05dff54d5ff384c5e3c454.tar.gz | |
small changes to work more reliable: mounting of dongle is in user space not 'blocked' (automatic unmount)
| -rw-r--r-- | manolo.luksopenwithkey.service | 3 | ||||
| -rw-r--r-- | manolo.luksopenwithoutkey.service | 1 | ||||
| -rw-r--r-- | mnt-daten.mount | 4 | ||||
| -rw-r--r-- | mnt-dongle.mount | 8 |
4 files changed, 4 insertions, 12 deletions
diff --git a/manolo.luksopenwithkey.service b/manolo.luksopenwithkey.service index 3467ba98a8fc..70a58fe856a0 100644 --- a/manolo.luksopenwithkey.service +++ b/manolo.luksopenwithkey.service @@ -7,6 +7,7 @@ DefaultDependencies=no BindsTo=dev-mapper-%i.device After=dev-md1.device mnt-dongle.mount Requires=dev-md1.device +Wants=mnt-dongle.mount Before=mnt-daten.mount ConditionPathExists=/mnt/dongle/.Thumb0.db @@ -14,7 +15,7 @@ ConditionPathExists=/mnt/dongle/.Thumb0.db Type=oneshot RemainAfterExit=no ExecStart=/usr/lib/systemd/systemd-cryptsetup attach 'storage' '/dev/md1' '/mnt/dongle/.Thumb0.db' 'luks'; -#ExecStop=/usr/bin/systemctl stop --no-block mnt-dongle.mount +ExecStartPost=systemctl stop mnt-dongle.mount [Install] WantedBy=basic.target diff --git a/manolo.luksopenwithoutkey.service b/manolo.luksopenwithoutkey.service index 69791634c2e3..bef6886a5f9b 100644 --- a/manolo.luksopenwithoutkey.service +++ b/manolo.luksopenwithoutkey.service @@ -14,7 +14,6 @@ ConditionPathExists=!/dev/disk/by-uuid/BA19-64EE Type=oneshot RemainAfterExit=no ExecStart=/usr/lib/systemd/systemd-cryptsetup attach 'storage' '/dev/md1' 'none' 'luks'; -#ExecStop=/usr/bin/systemctl stop --no-block mnt-dongle.mount [Install] WantedBy=basic.target diff --git a/mnt-daten.mount b/mnt-daten.mount index 8f16cb1ac188..ae1edd4503ae 100644 --- a/mnt-daten.mount +++ b/mnt-daten.mount @@ -9,7 +9,3 @@ Where=/mnt/daten What=/dev/disk/by-label/daten Type=ext4 Options=defaults,usrjquota=aquota.user,jqfmt=vfsv1 - -#[Install] -#WantedBy=basic.target - diff --git a/mnt-dongle.mount b/mnt-dongle.mount index 3abef85212e1..322e5b77bfe5 100644 --- a/mnt-dongle.mount +++ b/mnt-dongle.mount @@ -3,15 +3,11 @@ [Unit] After=dev-md1.device ConditionPathExists=/dev/disk/by-uuid/BA19-64EE -BindsTo=manolo.luksopenwithkey.service -#Before=systemd-cryptsetup@md1.service +Before=manolo.luksopenwithkey.service +#BindsTo=manolo.luksopenwithkey.service [Mount] Where=/mnt/dongle What=/dev/disk/by-label/DONGLE04 Type=vfat Options=defaults - -#[Install] -#WantedBy=manolo.luksopenwithkey.service manolo.luksopenwithoutkey.service -#WantedBy=basic.target |