Remove vestigial settings related to initramfs
Remove ZFS_POOL_IMPORT, ZFS_INITRD_PRE_MOUNTROOT_SLEEP, ZFS_INITRD_POST_MODPROBE_SLEEP, and ZFS_INITRD_ADDITIONAL_DATASETS features from etc/defaults/zfs.in. These features no longer work. Reviewed-by: Richard Laager <rlaager@wiktel.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: George Melikov <mail@gmelikov.ru> Signed-off-by: Chris McDonough <chrism@plope.com> Closes #9126 Closes #10757
This commit is contained in:
parent
1ddd7cdb92
commit
a5b1b60e9b
@ -48,9 +48,7 @@ specified pool or all pools, as described above).
|
||||
Filesystems below the root filesystem will be automatically mounted with no
|
||||
additional configuration necessary. For example, if the root filesystem is
|
||||
`rpool/ROOT/rootfs`, `rpool/root/rootfs/var`, `rpool/root/rootfs/usr`, etc.
|
||||
will be mounted (if they exist). Additional filesystems (that are not located
|
||||
under the root filesystem) can be mounted by listing them in
|
||||
`ZFS_INITRD_ADDITIONAL_DATASETS` in `/etc/default/zfs`.
|
||||
will be mounted (if they exist).
|
||||
|
||||
### Snapshots
|
||||
|
||||
|
@ -52,13 +52,6 @@ ZPOOL_IMPORT_ALL_VISIBLE='no'
|
||||
# This is a space separated list.
|
||||
#ZFS_POOL_EXCEPTIONS="test2"
|
||||
|
||||
# List of pools that SHOULD be imported at boot by the initramfs
|
||||
# instead of trying to import all available pools. If this is set
|
||||
# then ZFS_POOL_EXCEPTIONS is ignored.
|
||||
# Only applicable for Debian GNU/Linux {dkms,initramfs}.
|
||||
# This is a semi-colon separated list.
|
||||
#ZFS_POOL_IMPORT="pool1;pool2"
|
||||
|
||||
# Should the datasets be mounted verbosely?
|
||||
# A mount counter will be used when mounting if set to 'yes'.
|
||||
VERBOSE_MOUNT='no'
|
||||
@ -105,34 +98,6 @@ ZFS_DKMS_ENABLE_DEBUGINFO='no'
|
||||
# Only applicable for Debian GNU/Linux {dkms,initramfs}.
|
||||
ZFS_DKMS_DISABLE_STRIP='no'
|
||||
|
||||
# Wait for this many seconds in the initrd pre_mountroot?
|
||||
# This delays startup and should be '0' on most systems.
|
||||
# Only applicable for Debian GNU/Linux {dkms,initramfs}.
|
||||
ZFS_INITRD_PRE_MOUNTROOT_SLEEP='0'
|
||||
|
||||
# Wait for this many seconds in the initrd mountroot?
|
||||
# This delays startup and should be '0' on most systems. This might help on
|
||||
# systems which have their ZFS root on a USB disk that takes just a little
|
||||
# longer to be available
|
||||
# Only applicable for Debian GNU/Linux {dkms,initramfs}.
|
||||
ZFS_INITRD_POST_MODPROBE_SLEEP='0'
|
||||
|
||||
# List of additional datasets to mount after the root dataset is mounted?
|
||||
#
|
||||
# The init script will use the mountpoint specified in the 'mountpoint'
|
||||
# property value in the dataset to determine where it should be mounted.
|
||||
#
|
||||
# This is a space separated list, and will be mounted in the order specified,
|
||||
# so if one filesystem depends on a previous mountpoint, make sure to put
|
||||
# them in the right order.
|
||||
#
|
||||
# It is not necessary to add filesystems below the root fs here. It is
|
||||
# taken care of by the initrd script automatically. These are only for
|
||||
# additional filesystems needed. Such as /opt, /usr/local which is not
|
||||
# located under the root fs.
|
||||
# Example: If root FS is 'rpool/ROOT/rootfs', this would make sense.
|
||||
#ZFS_INITRD_ADDITIONAL_DATASETS="rpool/ROOT/usr rpool/ROOT/var"
|
||||
|
||||
# Optional arguments for the ZFS Event Daemon (ZED).
|
||||
# See zed(8) for more information on available options.
|
||||
#ZED_ARGS="-M"
|
||||
|
Loading…
Reference in New Issue
Block a user