diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-17 12:50:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:22 +0100 |
commit | b5c0b44a066077fccf4d6c2d811d55622376b546 (patch) | |
tree | 7f46332438e07acad227a7403b2880fdf1c7ecf9 | |
parent | 5553ef8096a2ba48272df58845a8f9e23f8f5297 (diff) | |
download | poky-b5c0b44a066077fccf4d6c2d811d55622376b546.tar.gz |
udev-extraconf/initrdscripts/parted: Rename mount.blacklist -> mount.ignorelist
(From OE-Core rev: 69e486ddb3059f80ba538e1f59c2ca8a8df0faf9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-testfs.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf/mount.ignorelist (renamed from meta/recipes-core/udev/udev-extraconf/mount.blacklist) | 0 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf/mount.sh | 4 | ||||
-rw-r--r-- | meta/recipes-core/udev/udev-extraconf_1.1.bb | 10 | ||||
-rw-r--r-- | meta/recipes-extended/parted/files/run-ptest | 6 |
8 files changed, 14 insertions, 14 deletions
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 1fcd29e54c..4bd6ace7b3 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/controllerimage | |||
138 | if [ -d /ssd/etc/ ] ; then | 138 | if [ -d /ssd/etc/ ] ; then |
139 | # We dont want udev to mount our root device while we're booting... | 139 | # We dont want udev to mount our root device while we're booting... |
140 | if [ -d /ssd/etc/udev/ ] ; then | 140 | if [ -d /ssd/etc/udev/ ] ; then |
141 | echo "/dev/${device}" >> /ssd/etc/udev/mount.blacklist | 141 | echo "/dev/${device}" >> /ssd/etc/udev/mount.ignorelist |
142 | fi | 142 | fi |
143 | fi | 143 | fi |
144 | 144 | ||
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index f667518b89..ffd3870199 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 | |||
229 | echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab | 229 | echo "UUID=$boot_uuid /boot vfat defaults 1 2" >> /tgt_root/etc/fstab |
230 | # We dont want udev to mount our root device while we're booting... | 230 | # We dont want udev to mount our root device while we're booting... |
231 | if [ -d /tgt_root/etc/udev/ ] ; then | 231 | if [ -d /tgt_root/etc/udev/ ] ; then |
232 | echo "${device}" >> /tgt_root/etc/udev/mount.blacklist | 232 | echo "${device}" >> /tgt_root/etc/udev/mount.ignorelist |
233 | fi | 233 | fi |
234 | fi | 234 | fi |
235 | 235 | ||
diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh index 7b49001659..8ab74ddc5d 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 | |||
164 | echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab | 164 | echo "$bootfs /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab |
165 | # We dont want udev to mount our root device while we're booting... | 165 | # We dont want udev to mount our root device while we're booting... |
166 | if [ -d /tgt_root/etc/udev/ ] ; then | 166 | if [ -d /tgt_root/etc/udev/ ] ; then |
167 | echo "/dev/${device}" >> /tgt_root/etc/udev/mount.blacklist | 167 | echo "/dev/${device}" >> /tgt_root/etc/udev/mount.ignorelist |
168 | fi | 168 | fi |
169 | fi | 169 | fi |
170 | umount /tgt_root | 170 | umount /tgt_root |
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index e71579631b..df33791ec7 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 | |||
261 | echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab | 261 | echo "$bootdev /boot ext3 defaults 1 2" >> /tgt_root/etc/fstab |
262 | # We dont want udev to mount our root device while we're booting... | 262 | # We dont want udev to mount our root device while we're booting... |
263 | if [ -d /tgt_root/etc/udev/ ] ; then | 263 | if [ -d /tgt_root/etc/udev/ ] ; then |
264 | echo "${device}" >> /tgt_root/etc/udev/mount.blacklist | 264 | echo "${device}" >> /tgt_root/etc/udev/mount.ignorelist |
265 | fi | 265 | fi |
266 | fi | 266 | fi |
267 | umount /tgt_root | 267 | umount /tgt_root |
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.blacklist b/meta/recipes-core/udev/udev-extraconf/mount.ignorelist index e49349428b..e49349428b 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.blacklist +++ b/meta/recipes-core/udev/udev-extraconf/mount.ignorelist | |||
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh index b23731870e..5ba66e98e2 100644 --- a/meta/recipes-core/udev/udev-extraconf/mount.sh +++ b/meta/recipes-core/udev/udev-extraconf/mount.sh | |||
@@ -26,11 +26,11 @@ fi | |||
26 | 26 | ||
27 | PMOUNT="/usr/bin/pmount" | 27 | PMOUNT="/usr/bin/pmount" |
28 | 28 | ||
29 | for line in `grep -h -v ^# /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/*` | 29 | for line in `grep -h -v ^# /etc/udev/mount.ignorelist /etc/udev/mount.ignorelist.d/*` |
30 | do | 30 | do |
31 | if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ]; | 31 | if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ]; |
32 | then | 32 | then |
33 | logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring" | 33 | logger "udev/mount.sh" "[$DEVNAME] is marked to ignore" |
34 | exit 0 | 34 | exit 0 |
35 | fi | 35 | fi |
36 | done | 36 | done |
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb index 2ba35b0df6..7da04379c0 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 @@ | |||
1 | SUMMARY = "Extra machine specific configuration files" | 1 | SUMMARY = "Extra machine specific configuration files" |
2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" | 2 | HOMEPAGE = "https://wiki.gentoo.org/wiki/Eudev" |
3 | DESCRIPTION = "Extra machine specific configuration files for udev, specifically blacklist information." | 3 | DESCRIPTION = "Extra machine specific configuration files for udev, specifically information on devices to ignore." |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | 6 | ||
7 | SRC_URI = " \ | 7 | SRC_URI = " \ |
8 | file://automount.rules \ | 8 | file://automount.rules \ |
9 | file://mount.sh \ | 9 | file://mount.sh \ |
10 | file://mount.blacklist \ | 10 | file://mount.ignorelist \ |
11 | file://autonet.rules \ | 11 | file://autonet.rules \ |
12 | file://network.sh \ | 12 | file://network.sh \ |
13 | file://localextra.rules \ | 13 | file://localextra.rules \ |
@@ -23,8 +23,8 @@ do_install() { | |||
23 | install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules | 23 | install -m 0644 ${WORKDIR}/autonet.rules ${D}${sysconfdir}/udev/rules.d/autonet.rules |
24 | install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules | 24 | install -m 0644 ${WORKDIR}/localextra.rules ${D}${sysconfdir}/udev/rules.d/localextra.rules |
25 | 25 | ||
26 | install -d ${D}${sysconfdir}/udev/mount.blacklist.d | 26 | install -d ${D}${sysconfdir}/udev/mount.ignorelist.d |
27 | install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ | 27 | install -m 0644 ${WORKDIR}/mount.ignorelist ${D}${sysconfdir}/udev/ |
28 | 28 | ||
29 | install -d ${D}${sysconfdir}/udev/scripts/ | 29 | install -d ${D}${sysconfdir}/udev/scripts/ |
30 | 30 | ||
@@ -37,7 +37,7 @@ do_install() { | |||
37 | 37 | ||
38 | FILES:${PN} = "${sysconfdir}/udev" | 38 | FILES:${PN} = "${sysconfdir}/udev" |
39 | RDEPENDS:${PN} = "udev" | 39 | RDEPENDS:${PN} = "udev" |
40 | CONFFILES:${PN} = "${sysconfdir}/udev/mount.blacklist" | 40 | CONFFILES:${PN} = "${sysconfdir}/udev/mount.ignorelist" |
41 | 41 | ||
42 | # to replace udev-extra-rules from meta-oe | 42 | # to replace udev-extra-rules from meta-oe |
43 | RPROVIDES:${PN} = "udev-extra-rules" | 43 | RPROVIDES:${PN} = "udev-extra-rules" |
diff --git a/meta/recipes-extended/parted/files/run-ptest b/meta/recipes-extended/parted/files/run-ptest index c3d6fca339..096078967f 100644 --- a/meta/recipes-extended/parted/files/run-ptest +++ b/meta/recipes-extended/parted/files/run-ptest | |||
@@ -1,7 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | mkdir -p /etc/udev/mount.blacklist.d | 3 | mkdir -p /etc/udev/mount.ignorelist.d |
4 | echo /dev/sda1 >> /etc/udev/mount.blacklist.d/parted-tmp | 4 | echo /dev/sda1 >> /etc/udev/mount.ignorelist.d/parted-tmp |
5 | rm -f tests/*.log | 5 | rm -f tests/*.log |
6 | make -C tests test-suite.log | 6 | make -C tests test-suite.log |
7 | rm /etc/udev/mount.blacklist.d/parted-tmp | 7 | rm /etc/udev/mount.ignorelist.d/parted-tmp |