[gentoo-commits] proj/genkernel:master commit in: defaults/

[Thomas Deutschmann]

commit:     405dc98a73e99b867f16eaf30501e32dedb3f2ee
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 12:40:15 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 12:40:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=405dc98a

initramfs: Add PARTUUID= support for devices

Will require genkernel initramfs built with --disklabel parameter.

Closes: https://bugs.gentoo.org/551708
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 defaults/initrd.scripts | 4 ++--
 defaults/linuxrc        | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index 7bc5a53..ff832a4 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -767,7 +767,7 @@ findnfsmount() {
 find_real_device() {
        local DEVICE="${1}"
        case "${DEVICE}" in
-               UUID\=*|LABEL\=*)
+               UUID\=*|LABEL\=*|PARTUUID\=*)
                        local REAL_DEVICE=""
                        local retval=1
 
@@ -785,7 +785,7 @@ find_real_device() {
 
                        if [ ${retval} -ne 0 ]
                        then
-                               REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}")
+                               REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}" 
2>/dev/null)
                                retval=$?
                        fi
 

diff --git a/defaults/linuxrc b/defaults/linuxrc
index 7be673b..2d87c41 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -504,7 +504,7 @@ then
        if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ]
        then
                case "${REAL_RESUME}" in
-                       LABEL=*|UUID=*)
+                       LABEL=*|UUID=*|PARTUUID=*)
                                RESUME_DEV=""
                                retval=1
 
@@ -522,7 +522,7 @@ then
 
                                if [ ${retval} -ne 0 ]
                                then
-                                       RESUME_DEV=$(blkid -o device -l -t 
"${REAL_RESUME}")
+                                       RESUME_DEV=$(blkid -o device -l -t 
"${REAL_RESUME}" 2>/dev/null)
                                        retval=$?
                                fi
 
@@ -604,7 +604,7 @@ do
                while [ ${ROOTDELAY_100MSEC} -ge 0 -a "${got_good_root}" != '1' 
]
                do
                        case "${REAL_ROOT}" in
-                               LABEL=*|UUID=*)
+                               LABEL=*|UUID=*|PARTUUID=*)
                                        ROOT_DEV=""
                                        retval=1
 
@@ -622,7 +622,7 @@ do
 
                                        if [ ${retval} -ne 0 ]
                                        then
-                                               ROOT_DEV=$(blkid -o device -l 
-t "${REAL_ROOT}")
+                                               ROOT_DEV=$(blkid -o device -l 
-t "${REAL_ROOT}" 2>/dev/null)
                                                retval=$?
                                        fi