]> git.proxmox.com Git - mirror_zfs.git/commit
Systemd configuration fixes
authorBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 25 May 2016 17:48:12 +0000 (10:48 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 27 May 2016 18:54:29 +0000 (11:54 -0700)
commit92547bc45ca9a2114662d9343ae53e5098acb627
treea1923d3129f467241c8af61c0791f50e056c317d
parent26ef0cc7db03be6f7a5c2d06c7ecdb2449bfa9e1
Systemd configuration fixes

* Disable zfs-import-scan.service by default.  This ensures that
pools will not be automatically imported unless they appear in
the cache file.  When this service is explicitly enabled pools
will be imported with the "cachefile=none" property set.  This
prevents the creation of, or update to, an existing cache file.

    $ systemctl list-unit-files | grep zfs
    zfs-import-cache.service                  enabled
    zfs-import-scan.service                   disabled
    zfs-mount.service                         enabled
    zfs-share.service                         enabled
    zfs-zed.service                           enabled
    zfs.target                                enabled

* Change services to dynamic from static by adding an [Install]
section and adding 'WantedBy' tags in favor of 'Requires' tags.
This allows for easier customization of the boot behavior.

* Start the zfs-import-cache.service after the root pivot so
the cache file is available in the standard location.

* Start the zfs-mount.service after the systemd-remount-fs.service
to ensure the root fs is writeable and the ZFS filesystems can
create their mount points.

* Change the default behavior to only load the ZFS kernel modules
in zfs-import-*.service or when blkid(8) detects a pool.  Users
who wish to unconditionally load the kernel modules must uncomment
the list of modules in /lib/modules-load.d/zfs.conf.

Reviewed-by: Richard Laager <rlaager@wiktel.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4325
Closes #4496
Closes #4658
Closes #4699
etc/modules-load.d/zfs.conf.in
etc/systemd/system/50-zfs.preset.in
etc/systemd/system/zfs-import-cache.service.in
etc/systemd/system/zfs-import-scan.service.in
etc/systemd/system/zfs-mount.service.in
etc/systemd/system/zfs-share.service.in
etc/systemd/system/zfs-zed.service.in
etc/systemd/system/zfs.target.in