refactor(fs-lib.sh): udevadm info --query=property instead of --query=env

env is a long time deprecated alias to property, not listed in the man page for more than a decade.

Author: marcosfrm

modules.d/90btrfs/btrfs_device_ready.sh

@@ -6,7 +6,7 @@ btrfs_check_complete() {
     local _rootinfo _dev
     _dev="${1:-/dev/root}"
     [ -e "$_dev" ] || return 0
-    _rootinfo=$(udevadm info --query=env "--name=$_dev" 2> /dev/null)
+    _rootinfo=$(udevadm info --query=property "--name=$_dev" 2> /dev/null)
     if strstr "$_rootinfo" "ID_FS_TYPE=btrfs"; then
         info "Checking, if btrfs device complete"
         btrfs device ready "$_dev" > /dev/null 2>&1

modules.d/90btrfs/btrfs_finished.sh

@@ -6,7 +6,7 @@ btrfs_check_complete() {
     local _rootinfo _dev
     _dev="${1:-/dev/root}"
     [ -e "$_dev" ] || return 0
-    _rootinfo=$(udevadm info --query=env "--name=$_dev" 2> /dev/null)
+    _rootinfo=$(udevadm info --query=property "--name=$_dev" 2> /dev/null)
     if strstr "$_rootinfo" "ID_FS_TYPE=btrfs"; then
         info "Checking, if btrfs device complete"
         unset __btrfs_mount

modules.d/90mdraid/mdraid-cleanup.sh

@@ -5,7 +5,7 @@ type getarg > /dev/null 2>&1 || . /lib/dracut-lib.sh
 containers=""
 for md in /dev/md[0-9_]*; do
     [ -b "$md" ] || continue
-    udevinfo="$(udevadm info --query=env --name="$md")"
+    udevinfo="$(udevadm info --query=property --name="$md")"
     strstr "$udevinfo" "DEVTYPE=partition" && continue
     if strstr "$udevinfo" "MD_LEVEL=container"; then
         containers="$containers $md"

modules.d/90mdraid/mdraid-waitclean.sh

@@ -5,7 +5,7 @@ if getargbool 0 rd.md.waitclean; then
     containers=""
     for md in /dev/md[0-9_]*; do
         [ -b "$md" ] || continue
-        udevinfo="$(udevadm info --query=env --name="$md")"
+        udevinfo="$(udevadm info --query=property --name="$md")"
         strstr "$udevinfo" "DEVTYPE=partition" && continue
         if strstr "$udevinfo" "MD_LEVEL=container"; then
             containers="$containers $md"

modules.d/90mdraid/mdraid_start.sh

@@ -8,7 +8,7 @@ _md_start() {
     local _path_d
     local _md="$1"
 
-    _udevinfo="$(udevadm info --query=env --name="${_md}")"
+    _udevinfo="$(udevadm info --query=property --name="${_md}")"
     strstr "$_udevinfo" "MD_LEVEL=container" && return 0
     strstr "$_udevinfo" "DEVTYPE=partition" && return 0
 

modules.d/98pollcdrom/pollcdrom.sh

@@ -14,7 +14,7 @@ if [ ! -e /sys/module/block/parameters/events_dfl_poll_msecs ]; then
     for cdrom in /sys/block/sr*; do
         [ -e "$cdrom" ] || continue
         # skip, if cdrom medium was already found
-        strstr "$(udevadm info --query=env --path="${cdrom##/sys}")" \
+        strstr "$(udevadm info --query=property --path="${cdrom##/sys}")" \
             ID_CDROM_MEDIA && continue
         echo change > "$cdrom/uevent"
     done

modules.d/99fs-lib/fs-lib.sh

@@ -194,7 +194,7 @@ det_fs() {
     local _orig="${2:-auto}"
     local _fs
 
-    _fs=$(udevadm info --query=env --name="$_dev" \
+    _fs=$(udevadm info --query=property --name="$_dev" \
         | while read -r line || [ -n "$line" ]; do
             if str_starts "$line" "ID_FS_TYPE="; then
                 echo "${line#ID_FS_TYPE=}"

test/TEST-10-RAID/create-root.sh

@@ -37,7 +37,7 @@ udevadm settle
 mdadm --detail --export /dev/md0 | grep -F MD_UUID > /tmp/mduuid
 . /tmp/mduuid
 udevadm settle
-eval "$(udevadm info --query=env --name=/dev/md0 | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)"
+eval "$(udevadm info --query=property --name=/dev/md0 | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)"
 {
     echo "dracut-root-block-created"
     echo MD_UUID="$MD_UUID"

test/TEST-12-RAID-DEG/create-root.sh

@@ -37,7 +37,7 @@ udevadm settle
 mdadm --detail --export /dev/md0 | grep -F MD_UUID > /tmp/mduuid
 . /tmp/mduuid
 udevadm settle
-eval "$(udevadm info --query=env --name=/dev/md0 | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)"
+eval "$(udevadm info --query=property --name=/dev/md0 | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)"
 {
     echo "dracut-root-block-created"
     echo MD_UUID="$MD_UUID"

test/TEST-13-ENC-RAID-LVM/create-root.sh

@@ -43,7 +43,7 @@ cryptsetup luksClose /dev/mapper/dracut_disk3
 {
     echo "dracut-root-block-created"
     for i in /dev/disk/by-id/ata-disk_disk[123]; do
-        udevadm info --query=env --name="$i" | grep -F 'ID_FS_UUID='
+        udevadm info --query=property --name="$i" | grep -F 'ID_FS_UUID='
     done
 } | dd oflag=direct,dsync of=/dev/disk/by-id/ata-disk_marker
 sync