CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

udev-extraconf/initrdscripts/parted: Rename mount.blacklist -> mount.ignorelist

Browse Source 
(From OE-Core rev: 99d9dc7c6b5149f19a315bce78784aa1753ea7be)

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>
(cherry picked from commit 69e486ddb3059f80ba538e1f59c2ca8a8df0faf9)
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2022-07-17 14:56:40 +02:00
parent c82f38999b
commit f884ab8ffc
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
View File

@ -138,7 +138,7 @@ touch /ssd/etc/controllerimage
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.ignorelist
fi
fi

2
meta/recipes-core/initrdscripts/files/init-install-efi.sh
View File

@ -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.ignorelist
fi
fi

2
meta/recipes-core/initrdscripts/files/init-install-testfs.sh
View File

@ -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.ignorelist
fi
fi
umount /tgt_root

2
meta/recipes-core/initrdscripts/files/init-install.sh
View File

@ -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.ignorelist
fi
fi
umount /tgt_root

0
meta/recipes-core/udev/udev-extraconf/mount.blacklist → meta/recipes-core/udev/udev-extraconf/mount.ignorelist
View File

4
meta/recipes-core/udev/udev-extraconf/mount.sh
View File

@ -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.ignorelist /etc/udev/mount.ignorelist.d/*`
do
if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
then
logger "udev/mount.sh" "[$DEVNAME] is blacklisted, ignoring"
logger "udev/mount.sh" "[$DEVNAME] is marked to ignore"
exit 0
fi
done

10
meta/recipes-core/udev/udev-extraconf_1.1.bb
View File

@ -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 information on devices to ignore."
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.ignorelist \
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.ignorelist.d
install -m 0644 ${WORKDIR}/mount.ignorelist ${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.ignorelist"
# to replace udev-extra-rules from meta-oe
RPROVIDES:${PN} = "udev-extra-rules"

6
meta/recipes-extended/parted/files/run-ptest
View File

@ -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.ignorelist.d
echo /dev/sda1 >> /etc/udev/mount.ignorelist.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.ignorelist.d/parted-tmp