| 1 |
commit: 06f6a268ef0c62f4f0e8dc8b699643bc55b357d7 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 3 13:36:57 2020 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 3 13:37:18 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=06f6a268 |
| 7 |
|
| 8 |
linuxrc, initrd.scripts: allow PARTLABEL for root & resume |
| 9 |
|
| 10 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 11 |
|
| 12 |
defaults/initrd.scripts | 2 +- |
| 13 |
defaults/linuxrc | 4 ++-- |
| 14 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 17 |
index 6acbbf6..4b43d33 100644 |
| 18 |
--- a/defaults/initrd.scripts |
| 19 |
+++ b/defaults/initrd.scripts |
| 20 |
@@ -873,7 +873,7 @@ findnfsmount() { |
| 21 |
find_real_device() { |
| 22 |
local DEVICE="${1}" |
| 23 |
case "${DEVICE}" in |
| 24 |
- UUID\=*|LABEL\=*|PARTUUID\=*) |
| 25 |
+ UUID\=*|LABEL\=*|PARTLABEL=*|PARTUUID\=*) |
| 26 |
local REAL_DEVICE="" |
| 27 |
local retval=1 |
| 28 |
|
| 29 |
|
| 30 |
diff --git a/defaults/linuxrc b/defaults/linuxrc |
| 31 |
index 5d79a7c..50b99de 100644 |
| 32 |
--- a/defaults/linuxrc |
| 33 |
+++ b/defaults/linuxrc |
| 34 |
@@ -609,7 +609,7 @@ then |
| 35 |
if [ "${NORESUME}" != '1' ] && [ -n "${REAL_RESUME}" ] |
| 36 |
then |
| 37 |
case "${REAL_RESUME}" in |
| 38 |
- LABEL=*|UUID=*|PARTUUID=*) |
| 39 |
+ LABEL=*|UUID=*|PARTLABEL=*|PARTUUID=*) |
| 40 |
RESUME_DEV="" |
| 41 |
retval=1 |
| 42 |
|
| 43 |
@@ -711,7 +711,7 @@ do |
| 44 |
while [ "${got_good_root}" != '1' -a $(date +%s) -le ${ROOTDELAY_TIMEOUT} ] |
| 45 |
do |
| 46 |
case "${REAL_ROOT}" in |
| 47 |
- LABEL=*|UUID=*|PARTUUID=*) |
| 48 |
+ LABEL=*|UUID=*|PARTLABEL=*|PARTUUID=*) |
| 49 |
ROOT_DEV="" |
| 50 |
retval=1 |
Archives