Skip to content

Commit

Permalink
etc: mask zfs-load-key.service
Browse files Browse the repository at this point in the history
Otherwise, systemd-sysv-generator will generate a service equivalent
that breaks the boot: under systemd this is covered by
zfs-mount-generator

We already do this for zfs-import.service, and other init scripts are
suppressed automatically by the "actual" .service files

Fixes: commit f04b976 ("Add init script
 to load keys")
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes openzfs#14010
Closes openzfs#14019
  • Loading branch information
nabijaczleweli authored and andrewc12 committed Oct 13, 2022
1 parent 1ab24e7 commit 1b9b396
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions etc/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ INSTALL_DATA_HOOKS += systemd-install-data-hook
systemd-install-data-hook:
$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-load-key.service"


systemdgenerator_PROGRAMS = \
Expand Down

0 comments on commit 1b9b396

Please sign in to comment.