summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorJens Rehsack <rehsack@gmail.com>2016-01-05 17:11:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-06 15:27:34 +0000
commitdb4376ed64f5d8f828862085a272b3e451a191cb (patch)
treecd1dce1ada2682e6521bcfbef225c20093bcc3a4 /meta/recipes-core
parenta8fb4290323a60bbd92707943c7839b973da2baf (diff)
downloadpoky-db4376ed64f5d8f828862085a272b3e451a191cb.tar.gz
udev-extraconf: introduce multiple blacklist files for more complex setups
In cases where a target image wants prevent the recovery partition is mounted automatically, but the recovery partition identifier moves with the device (internal flash, sd card, usb stick, ...), device/machine dependend extra blacklists might be desired. The grep utility prints the file name for each match when there is more than one file to search. Add -h to suppress the prefixing of file names on output. (From OE-Core rev: 95fced137a46dc98863fe5af7be5cbce708602f2) Signed-off-by: Jens Rehsack <sno@netbsd.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/udev/udev-extraconf/mount.sh2
-rw-r--r--meta/recipes-core/udev/udev-extraconf_1.1.bb1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/udev/udev-extraconf/mount.sh b/meta/recipes-core/udev/udev-extraconf/mount.sh
index 3eea910854..d760328a09 100644
--- a/meta/recipes-core/udev/udev-extraconf/mount.sh
+++ b/meta/recipes-core/udev/udev-extraconf/mount.sh
@@ -8,7 +8,7 @@
8MOUNT="/bin/mount" 8MOUNT="/bin/mount"
9PMOUNT="/usr/bin/pmount" 9PMOUNT="/usr/bin/pmount"
10UMOUNT="/bin/umount" 10UMOUNT="/bin/umount"
11for line in `grep -v ^# /etc/udev/mount.blacklist` 11for line in `grep -h -v ^# /etc/udev/mount.blacklist /etc/udev/mount.blacklist.d/*`
12do 12do
13 if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ]; 13 if [ ` expr match "$DEVNAME" "$line" ` -gt 0 ];
14 then 14 then
diff --git a/meta/recipes-core/udev/udev-extraconf_1.1.bb b/meta/recipes-core/udev/udev-extraconf_1.1.bb
index 6fbd92548a..ecd4a8aab5 100644
--- a/meta/recipes-core/udev/udev-extraconf_1.1.bb
+++ b/meta/recipes-core/udev/udev-extraconf_1.1.bb
@@ -23,6 +23,7 @@ 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 -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ 27 install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
27 28
28 install -d ${D}${sysconfdir}/udev/scripts/ 29 install -d ${D}${sysconfdir}/udev/scripts/