summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/files
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-17 14:56:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-25 15:11:46 +0100
commitf884ab8ffcb3b4ab7e19b6fa70f5838fa29bf591 (patch)
tree8df0494c06a7990c3338e81adfb383b0a0754ecd /meta/recipes-core/initrdscripts/files
parentc82f38999b51a60bd4998680481ae930f26afecd (diff)
downloadpoky-f884ab8ffcb3b4ab7e19b6fa70f5838fa29bf591.tar.gz
udev-extraconf/initrdscripts/parted: Rename mount.blacklist -> mount.ignorelist
(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>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh2
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh2
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-testfs.sh2
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh2
4 files changed, 4 insertions, 4 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
138if [ -d /ssd/etc/ ] ; then 138if [ -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
143fi 143fi
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
234fi 234fi
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
169fi 169fi
170umount /tgt_root 170umount /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
266fi 266fi
267umount /tgt_root 267umount /tgt_root