diff options
| author |   Ben Kohler <bkohler@gentoo.org> | 2020-01-03 07:36:57 -0600 |
|---|---|---|
| committer | Ben Kohler <bkohler@gentoo.org> | 2020-01-03 07:37:18 -0600 |
| commit | 06f6a268ef0c62f4f0e8dc8b699643bc55b357d7 (patch) | |
| tree | 35536a33df4dc5851ba67f76e0d85b03bd899346 | |
| parent | gen_funcs.sh: gen_die(): Prevent recursion (diff) | |
| download | genkernel-06f6a268.tar.gz genkernel-06f6a268.tar.bz2 genkernel-06f6a268.zip | |
linuxrc, initrd.scripts: allow PARTLABEL for root & resume
Signed-off-by: Ben Kohler <bkohler@gentoo.org>
| -rw-r--r-- | defaults/initrd.scripts | 2 | ||||
| -rw-r--r-- | defaults/linuxrc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 6acbbf68..4b43d33c 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 5d79a7c1..50b99ded 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 |