]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Fix a dependency loop
authorRichard Laager <rlaager@wiktel.com>
Sat, 30 May 2020 23:40:45 +0000 (18:40 -0500)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 Aug 2020 17:16:13 +0000 (10:16 -0700)
commitec41cafee1dac132775ca3eaa9aa7f56cf30b30f
tree57acbbf4794e9798dca73f39b2ab04cc03559777
parent7ddcfe7c00d1ca6269000dc48c6bb12100fc1737
Fix a dependency loop

When generating units with zfs-mount-generator, if the pool is already
imported, zfs-import.target is not needed.  This avoids a dependency
loop on root-on-ZFS systems:
  systemd-random-seed.service After (via RequiresMountsFor)
  var-lib.mount After
  zfs-import.target After
  zfs-import-{cache,scan}.service After
  cryptsetup.service After
  systemd-random-seed.service

Reviewed-by: Antonio Russo <antonio.e.russo@gmail.com>
Reviewed-by: InsanePrawn <insane.prawny@gmail.com>
Signed-off-by: Richard Laager <rlaager@wiktel.com>
Closes #10388
etc/systemd/system-generators/zfs-mount-generator.in
etc/systemd/system/zfs-mount.service.in