add PARTLABEL and PARTUUID

6 files changed, 28 insertions, 1 deletions

diff --git a/modules.d/01fips/fips.sh b/modules.d/01fips/fips.sh
index 2ec2152b..f3cab31c 100755
--- a/modules.d/01fips/fips.sh
+++ b/modules.d/01fips/fips.sh
@@ -15,6 +15,12 @@ mount_boot()
         UUID=*)
             boot="/dev/disk/by-uuid/${boot#UUID=}"
             ;;
+        PARTUUID=*)
+            boot="/dev/disk/by-partuuid/${boot#PARTUUID=}"
+            ;;
+        PARTLABEL=*)
+            boot="/dev/disk/by-partlabel/${boot#PARTLABEL=}"
+            ;;
         /dev/*)
             ;;
         *)
diff --git a/modules.d/90dmsquash-live/parse-dmsquash-live.sh b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
index 3e9a347b..a5564e20 100755
--- a/modules.d/90dmsquash-live/parse-dmsquash-live.sh
+++ b/modules.d/90dmsquash-live/parse-dmsquash-live.sh
@@ -34,6 +34,14 @@ case "$liveroot" in
         root="${root#live:}"
         root="live:/dev/disk/by-uuid/${root#UUID=}"
         rootok=1 ;;
+    live:PARTUUID=*|PARTUUID=*) \
+        root="${root#live:}"
+        root="live:/dev/disk/by-partuuid/${root#PARTUUID=}"
+        rootok=1 ;;
+    live:PARTLABEL=*|PARTLABEL=*) \
+        root="${root#live:}"
+        root="live:/dev/disk/by-partlabel/${root#PARTLABEL=}"
+        rootok=1 ;;
     live:/*.[Ii][Ss][Oo]|/*.[Ii][Ss][Oo])
         root="${root#live:}"
         root="liveiso:${root}"
diff --git a/modules.d/95resume/parse-resume.sh b/modules.d/95resume/parse-resume.sh
index 20ece99f..bd4bcd36 100755
--- a/modules.d/95resume/parse-resume.sh
+++ b/modules.d/95resume/parse-resume.sh
@@ -17,6 +17,8 @@ case "$resume" in
         resume="/dev/disk/by-uuid/${resume#UUID=}" ;;
     PARTUUID=*) \
         resume="/dev/disk/by-partuuid/${resume#PARTUUID=}" ;;
+    PARTLABEL=*) \
+        resume="/dev/disk/by-partlabel/${resume#PARTLABEL=}" ;;
 esac
 
 if splash=$(getarg splash=); then
diff --git a/modules.d/95rootfs-block/parse-block.sh b/modules.d/95rootfs-block/parse-block.sh
index 24fbccb0..0a23ac74 100755
--- a/modules.d/95rootfs-block/parse-block.sh
+++ b/modules.d/95rootfs-block/parse-block.sh
@@ -16,6 +16,10 @@ case "$root" in
         root="${root#block:}"
         root="block:/dev/disk/by-partuuid/${root#PARTUUID=}"
         rootok=1 ;;
+    block:PARTLABEL=*|PARTLABEL=*)
+        root="${root#block:}"
+        root="block:/dev/disk/by-partlabel/${root#PARTLABEL=}"
+        rootok=1 ;;
     /dev/*)
         root="block:${root}"
         rootok=1 ;;
diff --git a/modules.d/98systemd/dracut-cmdline.sh b/modules.d/98systemd/dracut-cmdline.sh
index a6738bdb..50b8d6c9 100755
--- a/modules.d/98systemd/dracut-cmdline.sh
+++ b/modules.d/98systemd/dracut-cmdline.sh
@@ -57,6 +57,10 @@ case "$root" in
         root="${root#block:}"
         root="block:/dev/disk/by-partuuid/${root#PARTUUID=}"
         rootok=1 ;;
+    block:PARTLABEL=*|PARTLABEL=*)
+        root="${root#block:}"
+        root="block:/dev/disk/by-partlabel/${root#PARTLABEL=}"
+        rootok=1 ;;
     /dev/*)
         root="block:${root}"
         rootok=1 ;;
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 1a2cc112..089d3364 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -572,12 +572,15 @@ nfsroot_to_var() {
 # TOOD: symlinks
 udevmatch() {
     case "$1" in
-    UUID=????????-????-????-????-????????????|LABEL=*)
+    UUID=????????-????-????-????-????????????|LABEL=*|PARTLABEL=*|PARTUUID=????????-????-????-????-????????????)
         printf 'ENV{ID_FS_%s}=="%s"' "${1%%=*}" "${1#*=}"
         ;;
     UUID=*)
         printf 'ENV{ID_FS_UUID}=="%s*"' "${1#*=}"
         ;;
+    PARTUUID=*)
+        printf 'ENV{ID_FS_PARTUUID}=="%s*"' "${1#*=}"
+        ;;
     /dev/?*) printf -- 'KERNEL=="%s"' "${1#/dev/}" ;;
     *) return 255 ;;
     esac