summaryrefslogtreecommitdiffstats
path: root/contrib/dracut
diff options
context:
space:
mode:
authorMatthew Ahrens <[email protected]>2020-06-10 17:07:59 -0700
committerGitHub <[email protected]>2020-06-10 17:07:59 -0700
commitf66434268cef381b2799c45c654162bfb8e128ce (patch)
treead43282f17f4f5314fad99f4da1bb2ead5211fe3 /contrib/dracut
parentfeff3f69fc3de99f31af6955e2cb27eb8d0f436e (diff)
Remove unnecessary references to slavery
The horrible effects of human slavery continue to impact society. The casual use of the term "slave" in computer software is an unnecessary reference to a painful human experience. This commit removes all possible references to the term "slave". Implementation notes: The zpool.d/slaves script is renamed to dm-deps, which uses the same terminology as `dmsetup deps`. References to the `/sys/class/block/$dev/slaves` directory remain. This directory name is determined by the Linux kernel. Although `dmsetup deps` provides the same information, it unfortunately requires elevated privileges, whereas the `/sys/...` directory is world-readable. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Ryan Moeller <[email protected]> Signed-off-by: Matthew Ahrens <[email protected]> Closes #10435
Diffstat (limited to 'contrib/dracut')
-rwxr-xr-xcontrib/dracut/02zfsexpandknowledge/module-setup.sh.in26
1 files changed, 13 insertions, 13 deletions
diff --git a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
index a2a3ef037..8429bd109 100755
--- a/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
+++ b/contrib/dracut/02zfsexpandknowledge/module-setup.sh.in
@@ -74,10 +74,10 @@ check() {
local blockdevs
local fstype
local majmin
- local _slavedev
- local _slavedevname
- local _slavedevtype
- local _slavemajmin
+ local _depdev
+ local _depdevname
+ local _depdevtype
+ local _depmajmin
local _dev
if [[ $hostonly ]]; then
@@ -108,15 +108,15 @@ if [[ $hostonly ]]; then
host_fs_types["$dev"]="$fstype"
majmin=$(get_maj_min "$dev")
if [[ -d /sys/dev/block/$majmin/slaves ]] ; then
- for _slavedev in /sys/dev/block/$majmin/slaves/*; do
- [[ -f $_slavedev/dev ]] || continue
- _slavedev=/dev/$(basename "$_slavedev")
- _slavedevname=$(udevadm info --query=property --name="$_slavedev" | grep "^DEVNAME=" | sed 's|^DEVNAME=||')
- _slavedevtype=$(get_devtype "$_slavedevname")
- _slavemajmin=$(get_maj_min "$_slavedevname")
- dinfo "zfsexpandknowledge: slave block device backing ZFS dataset $mp: $_slavedevname"
- array_contains "$_slavedevname" "${host_devs[@]}" || host_devs+=("$_slavedevname")
- host_fs_types["$_slavedevname"]="$_slavedevtype"
+ for _depdev in /sys/dev/block/$majmin/slaves/*; do
+ [[ -f $_depdev/dev ]] || continue
+ _depdev=/dev/$(basename "$_depdev")
+ _depdevname=$(udevadm info --query=property --name="$_depdev" | grep "^DEVNAME=" | sed 's|^DEVNAME=||')
+ _depdevtype=$(get_devtype "$_depdevname")
+ _depmajmin=$(get_maj_min "$_depdevname")
+ dinfo "zfsexpandknowledge: underlying block device backing ZFS dataset $mp: $_depdevname"
+ array_contains "$_depdevname" "${host_devs[@]}" || host_devs+=("$_depdevname")
+ host_fs_types["$_depdevname"]="$_depdevtype"
done
fi
done