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.

diff --git a/modules.d/90btrfs/btrfs_device_ready.sh b/modules.d/90btrfs/btrfs_device_ready.sh
index 6d14406a691eb6d95466bd5ae64144de643bf218..93d07587b2bc0000c8e0f40b8b29b8d430d5e049 100755 (executable)
--- a/modules.d/90btrfs/btrfs_device_ready.sh
+++ b/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

diff --git a/modules.d/90btrfs/btrfs_finished.sh b/modules.d/90btrfs/btrfs_finished.sh
index d0895bd09a4cbdab2109486202e7fe7245b8bfb6..4606f8ae551f39d19fcfb338afbc7d2d347d0ea4 100755 (executable)
--- a/modules.d/90btrfs/btrfs_finished.sh
+++ b/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

diff --git a/modules.d/90mdraid/mdraid-cleanup.sh b/modules.d/90mdraid/mdraid-cleanup.sh
index 7cf17dd946b33221d8b04d26a7bc64f31f3c3972..ce507335335fcd0e723d2616f060a89d673ce182 100755 (executable)
--- a/modules.d/90mdraid/mdraid-cleanup.sh
+++ b/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"

diff --git a/modules.d/90mdraid/mdraid-waitclean.sh b/modules.d/90mdraid/mdraid-waitclean.sh
index 557a62332add7a441d37e44c66a9013dbc3dfe4c..9317962565d982fa4bf0916ac803299540fa18e7 100755 (executable)
--- a/modules.d/90mdraid/mdraid-waitclean.sh
+++ b/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"

diff --git a/modules.d/90mdraid/mdraid_start.sh b/modules.d/90mdraid/mdraid_start.sh
index 7b3d0de7e3e5a29bb9b0303bc7a2011ceacecdb3..d8c5de2536f91bb70b80673ba42feddf61325a1a 100755 (executable)
--- a/modules.d/90mdraid/mdraid_start.sh
+++ b/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
 

diff --git a/modules.d/98pollcdrom/pollcdrom.sh b/modules.d/98pollcdrom/pollcdrom.sh
index 90e647cfb49970a6ecb2526447bacce718cf0b86..85305a72987a879c3ce08f863e800cc407193f30 100755 (executable)
--- a/modules.d/98pollcdrom/pollcdrom.sh
+++ b/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

diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh
index 36cd731a1aef46e75e5610865e3e4981b35a1dcb..e05fa0c5068c5d81ba5c8a433306c4287bdce434 100755 (executable)
--- a/modules.d/99fs-lib/fs-lib.sh
+++ b/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=}"

diff --git a/test/TEST-10-RAID/create-root.sh b/test/TEST-10-RAID/create-root.sh
index 2012b729ff667656b9fc4efa521d74efe5b411f0..9fd3857169414a0e683230a7ebab46a4ede4a006 100755 (executable)
--- a/test/TEST-10-RAID/create-root.sh
+++ b/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"

diff --git a/test/TEST-12-RAID-DEG/create-root.sh b/test/TEST-12-RAID-DEG/create-root.sh
index 2012b729ff667656b9fc4efa521d74efe5b411f0..9fd3857169414a0e683230a7ebab46a4ede4a006 100755 (executable)
--- a/test/TEST-12-RAID-DEG/create-root.sh
+++ b/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"

diff --git a/test/TEST-13-ENC-RAID-LVM/create-root.sh b/test/TEST-13-ENC-RAID-LVM/create-root.sh
index 4c1abf89ed589d5c964ff5bc72a78cbecfea6020..ded927460bc2f3d09de0fa3b1bf07ce4c1415272 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/create-root.sh
+++ b/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

diff --git a/test/TEST-40-NBD/create-encrypted-root.sh b/test/TEST-40-NBD/create-encrypted-root.sh
index f56ec47984705afd4c6dbb7d770c5975e2a4be9c..28f41ad745164b800073c263a3a5d5eb2084662c 100755 (executable)
--- a/test/TEST-40-NBD/create-encrypted-root.sh
+++ b/test/TEST-40-NBD/create-encrypted-root.sh
@@ -32,7 +32,7 @@ udevadm settle
 cryptsetup luksClose /dev/mapper/dracut_crypt_test
 udevadm settle
 sleep 1
-eval "$(udevadm info --query=env --name=/dev/disk/by-id/ata-disk_root | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)"
+eval "$(udevadm info --query=property --name=/dev/disk/by-id/ata-disk_root | while read -r line || [ -n "$line" ]; do [ "$line" != "${line#*ID_FS_UUID*}" ] && echo "$line"; done)"
 {
     echo "dracut-root-block-created"
     echo "ID_FS_UUID=$ID_FS_UUID"