blocklist has a more obvious meaning than blacklist and is also not an
issue wrt inclusivity, so let's use that naming instead.

Signed-off-by: Quentin Schulz <foss+yocto@...>
---
.../initrdscripts/files/init-install-efi-testfs.sh | 2 +-
.../initrdscripts/files/init-install-efi.sh | 2 +-
.../initrdscripts/files/init-install-testfs.sh | 2 +-
meta/recipes-core/initrdscripts/files/init-install.sh | 2 +-
.../{mount.blacklist => mount.blocklist} | 0
meta/recipes-core/udev/udev-extraconf/mount.sh | 4 ++--
meta/recipes-core/udev/udev-extraconf_1.1.bb | 10 +++++-----
meta/recipes-extended/parted/files/run-ptest | 6 +++---
8 files changed, 14 insertions(+), 14 deletions(-)
rename meta/recipes-core/udev/udev-extraconf/{mount.blacklist => mount.blocklist} (100%)

diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
index 6f554f62967..9bf32e8cb4e 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
@@ -138,7 +138,7 @@ touch /ssd/etc/goldenimage
if [ -d /ssd/etc/ ] ; then
# We dont want udev to mount our root device while we're booting...
if [ -d /ssd/etc/udev/ ] ; then
- echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist
+ echo "/dev/${device}" >> /ssd/etc/udev/mount.blocklist
fi
fi

diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index f667518b895..97db4c753b9 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -229,7 +229,7 @@ if [ -d /tgt_root/etc/ ] ; then
echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
- echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
+ echo "${device}" >> /tgt_root/etc/udev/mount.blocklist
fi
fi

diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
index df3a7767319..ea74806a7b7 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
@@ -164,7 +164,7 @@ if [ -d /tgt_root/etc/ ] ; then
echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
- echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist
+ echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blocklist
fi
fi
umount /tgt_root
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index e71579631b5..1f7dab8a967 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -261,7 +261,7 @@ if [ -d /tgt_root/etc/ ] ; then
echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab
# We dont want udev to mount our root device while we're booting...
if [ -d /tgt_root/etc/udev/ ] ; then
- echo "${device}" >> /tgt_root/etc/udev/mount.blacklist
+ echo "${device}" >> /tgt_root/etc/udev/mount.blocklist
fi
fi
umount /tgt_root
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.blacklist b/meta/recipes-core/udev/udev-extraconf/mount.blocklist
similarity index 100%
rename from meta/recipes-core/udev/udev-extraconf/mount.blacklist
rename to meta/recipes-core/udev/udev-extraconf/mount.blocklist
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index b23731870ea..41b7c775c25 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -26,11 +26,11 @@ fi

PMOUNT="/usr/bin/pmount"

-for line in `grep -h -v ^# /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/*`
+for line in `grep -h -v ^# /etc/udev/mount.blocklist /etc/udev/mount.blocklist.d/*`
do
if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
then
- logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
+ logger "udev/mount.sh" "[$DEVNAME] mounting is blocked, ignoring"
exit 0
fi
done
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb
index 2ba35b0df69..42ba687ed8b 100644
--- a/meta/recipes-core/udev/udev-extraconf_1.1.bb
+++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb
@@ -1,13 +1,13 @@
SUMMARY = "Extra machine specific configuration files"
HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev"
-DESCRIPTION = "Extra machine specific configuration files for udev, specifically blacklist information."
+DESCRIPTION = "Extra machine specific configuration files for udev, specifically blocklist information."
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

SRC_URI = " \
file://automount.rules \
file://mount.sh \
- file://mount.blacklist \
+ file://mount.blocklist \
file://autonet.rules \
file://network.sh \
file://localextra.rules \
@@ -23,8 +23,8 @@ do_install() {
install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules
install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules

- install -d ${D}${sysconfdir}/udev/mount.blacklist.d
- install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
+ install -d ${D}${sysconfdir}/udev/mount.blocklist.d
+ install -m 0644 ${WORKDIR}/mount.blocklist ${D}${sysconfdir}/udev/

install -d ${D}${sysconfdir}/udev/scripts/

@@ -37,7 +37,7 @@ do_install() {

FILES:${PN} = "${sysconfdir}/udev"
RDEPENDS:${PN} = "udev"
-CONFFILES:${PN} = "${sysconfdir}/udev/mount.blacklist"
+CONFFILES:${PN} = "${sysconfdir}/udev/mount.blocklist"

# to replace udev-extra-rules from meta-oe
RPROVIDES:${PN} = "udev-extra-rules"
diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest
index c3d6fca3391..1eee9f3b730 100644
--- a/meta/recipes-extended/parted/files/run-ptest
+++ b/meta/recipes-extended/parted/files/run-ptest
@@ -1,7 +1,7 @@
#!/bin/sh

-mkdir -p /etc/udev/mount.blacklist.d
-echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp
+mkdir -p /etc/udev/mount.blocklist.d
+echo /dev/sda1 >> /etc/udev/mount.blocklist.d/parted-tmp
rm -f tests/*.log
make -C tests test-suite.log
-rm /etc/udev/mount.blacklist.d/parted-tmp
+rm /etc/udev/mount.blocklist.d/parted-tmp
--
2.33.1

On Mon, 2021-12-06 at 16:35 +0100, Quentin Schulz wrote:

blocklist has a more obvious meaning than blacklist and is also not an
issue wrt inclusivity, so let's use that naming instead.

A "blocklist" with a filesystem is unfortunately confusing (a list of block
numbers on the filesystem?). "ignorelist" or even "ignore-devices" may be
better? (or skip)

Cheers,

Richard

On Mon, 2021-12-06 at 23:31 +0000, Richard Purdie via
lists.openembedded.org wrote:

On Mon, 2021-12-06 at 16:35 +0100, Quentin Schulz wrote:

blocklist has a more obvious meaning than blacklist and is also not
an
issue wrt inclusivity, so let's use that naming instead.

A "blocklist" with a filesystem is unfortunately confusing (a list of
block
numbers on the filesystem?). "ignorelist" or even "ignore-devices"
may be
better? (or skip)

I offer "denylist".

Cheers,
Eero

On 12/8/21 01:57, Eero Aaltonen wrote:

On Mon, 2021-12-06 at 23:31 +0000, Richard Purdie via
lists.openembedded.org wrote:

On Mon, 2021-12-06 at 16:35 +0100, Quentin Schulz wrote:

blocklist has a more obvious meaning than blacklist and is also not
an
issue wrt inclusivity, so let's use that naming instead.

A "blocklist" with a filesystem is unfortunately confusing (a list of
block
numbers on the filesystem?). "ignorelist" or even "ignore-devices"
may be
better? (or skip)

I offer "denylist".

I have recently added a list of patches and files that have problematic language to the Inclusive Language Wiki [0], this is one of them, I had proposed mount.disallow

So we can see that everyone has a different idea. Once we have an approved rename, we can revisit this patch.

Thanks

Sau!

[0] https://wiki.yoctoproject.org/wiki/Inclusive_language#Patch_Files

Cheers,
Eero

--
Sau!

Hi all,

On December 16, 2021 4:03:14 PM GMT+01:00, Saul Wold <Saul.Wold@...> wrote:

On 12/8/21 01:57, Eero Aaltonen wrote:

On Mon, 2021-12-06 at 23:31 +0000, Richard Purdie via
lists.openembedded.org wrote:

On Mon, 2021-12-06 at 16:35 +0100, Quentin Schulz wrote:

blocklist has a more obvious meaning than blacklist and is also not
an
issue wrt inclusivity, so let's use that naming instead.

A "blocklist" with a filesystem is unfortunately confusing (a list of
block
numbers on the filesystem?). "ignorelist" or even "ignore-devices"
may be
better? (or skip)

I offer "denylist".

I have recently added a list of patches and files that have problematic
language to the Inclusive Language Wiki [0], this is one of them, I had
proposed mount.disallow

So we can see that everyone has a different idea. Once we have an
approved rename, we can revisit this patch.

I'm lagging behind a bit sorry.

I'd suggest to rename mount.blacklist to automount.something. I find it more explicit that just mount with ignore, deny or disallow as "extension" as suggested before.

If I haven't sent a V2 by Saturday, feel free anyone to rework this patch if you want as I won't have much time before next year.

Cheers,
Quentin

Thanks

Sau!

[0] https://wiki.yoctoproject.org/wiki/Inclusive_language#Patch_Files

Cheers,
Eero