diff options
| author | Matthew Ahrens <[email protected]> | 2020-06-10 17:07:59 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-10 17:07:59 -0700 |
| commit | f66434268cef381b2799c45c654162bfb8e128ce (patch) | |
| tree | ad43282f17f4f5314fad99f4da1bb2ead5211fe3 /cmd | |
| parent | feff3f69fc3de99f31af6955e2cb27eb8d0f436e (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 'cmd')
| -rw-r--r-- | cmd/zpool/Makefile.am | 4 | ||||
| -rwxr-xr-x | cmd/zpool/zpool.d/dm-deps (renamed from cmd/zpool/zpool.d/slaves) | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am index 157fed2e0..1dcb98520 100644 --- a/cmd/zpool/Makefile.am +++ b/cmd/zpool/Makefile.am @@ -36,6 +36,7 @@ zpoolexecdir = $(zfsexecdir)/zpool.d EXTRA_DIST = zpool.d/README dist_zpoolexec_SCRIPTS = \ + zpool.d/dm-deps \ zpool.d/enc \ zpool.d/encdev \ zpool.d/fault_led \ @@ -50,7 +51,6 @@ dist_zpoolexec_SCRIPTS = \ zpool.d/serial \ zpool.d/ses \ zpool.d/size \ - zpool.d/slaves \ zpool.d/slot \ zpool.d/smart \ zpool.d/smartx \ @@ -80,6 +80,7 @@ dist_zpoolexec_SCRIPTS = \ zpool.d/test_ended zpoolconfdefaults = \ + dm-deps \ enc \ encdev \ fault_led \ @@ -94,7 +95,6 @@ zpoolconfdefaults = \ serial \ ses \ size \ - slaves \ slot \ smart \ smartx \ diff --git a/cmd/zpool/zpool.d/slaves b/cmd/zpool/zpool.d/dm-deps index 9c16d6c4e..ee39514e4 100755 --- a/cmd/zpool/zpool.d/slaves +++ b/cmd/zpool/zpool.d/dm-deps @@ -1,14 +1,11 @@ #!/bin/sh # -# Show device mapper slave devices. This is useful for looking up the -# /dev/sd* devices associated with a dm or multipath device. For example: -# -# $ ls /sys/block/dm-113/slaves/ -# sddt sdjw +# Show device mapper dependent / underlying devices. This is useful for +# looking up the /dev/sd* devices associated with a dm or multipath device. # if [ "$1" = "-h" ] ; then - echo "Show device mapper slave devices." + echo "Show device mapper dependent (underlying) devices." exit fi @@ -29,4 +26,4 @@ if [ -d "/sys/class/block/$dev/slaves" ] ; then val=$(echo "$val" | sed -r 's/[[:blank:]]+/ /g') fi -echo "slaves=$val" +echo "dm-deps=$val" |