commit: 06f6a268ef0c62f4f0e8dc8b699643bc55b357d7 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Fri Jan 3 13:36:57 2020 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Jan 3 13:37:18 2020 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=06f6a268
linuxrc, initrd.scripts: allow PARTLABEL for root & resume Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> defaults/initrd.scripts | 2 +- defaults/linuxrc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 6acbbf6..4b43d33 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -873,7 +873,7 @@ findnfsmount() { find_real_device() { local DEVICE="${1}" case "${DEVICE}" in - UUID\=*|LABEL\=*|PARTUUID\=*) + UUID\=*|LABEL\=*|PARTLABEL=*|PARTUUID\=*) local REAL_DEVICE="" local retval=1 diff --git a/defaults/linuxrc b/defaults/linuxrc index 5d79a7c..50b99de 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -609,7 +609,7 @@ then if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ] then case "${REAL_RESUME}" in - LABEL=*|UUID=*|PARTUUID=*) + LABEL=*|UUID=*|PARTLABEL=*|PARTUUID=*) RESUME_DEV="" retval=1 @@ -711,7 +711,7 @@ do while [ "${got_good_root}" != '1' -a $(date +%s) -le ${ROOTDELAY_TIMEOUT} ] do case "${REAL_ROOT}" in - LABEL=*|UUID=*|PARTUUID=*) + LABEL=*|UUID=*|PARTLABEL=*|PARTUUID=*) ROOT_DEV="" retval=1