chore: rdinitdebug, rdnetdebug, rdinfo, rd_retry and rdshell are deprecated

diff --git a/man/dracut.cmdline.7.asc b/man/dracut.cmdline.7.asc
index 046819d2211aab1953cbb911e8bb4a8f4dc07827..0f922b99bf8bf069814ee0758add5e841cb0a651 100644 (file)
--- a/man/dracut.cmdline.7.asc
+++ b/man/dracut.cmdline.7.asc
@@ -1393,8 +1393,6 @@ Here is a list of options and their new replacement.
 
 rd.ccw:: rd.znet
 
-rdinitdebug rdnetdebug:: rd.debug
-
 rd_NO_DM:: rd.dm=0
 
 rdblacklist:: rd.driver.blacklist
@@ -1403,8 +1401,6 @@ rdinsmodpost:: rd.driver.post
 
 rdloaddriver:: rd.driver.pre
 
-rdinfo:: rd.info
-
 check:: rd.live.check
 
 rdlivedebug:: rd.live.debug
@@ -1451,10 +1447,6 @@ iscsi_in_password:: rd.iscsi.in.password
 
 iscsi_firmware:: rd.iscsi.firmware=0
 
-rd_retry:: rd.retry
-
-rdshell:: rd.shell
-
 rdudevdebug:: rd.udev.udev_log=debug
 
 rdudevinfo:: rd.udev.udev_log=info

diff --git a/modules.d/35connman/cm-config.sh b/modules.d/35connman/cm-config.sh
index 6ae754a16def81e2edf820e74824b0c7f3d73576..67f6909d46815552f0efe80639cc78acdcf9db75 100755 (executable)
--- a/modules.d/35connman/cm-config.sh
+++ b/modules.d/35connman/cm-config.sh
@@ -6,7 +6,7 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
     echo rd.neednet >> /etc/cmdline.d/connman.conf
 fi
 
-if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
+if getargbool 0 rd.debug; then
     if [ -n "$DRACUT_SYSTEMD" ]; then
         # Enable tty output if a usable console is found
         # shellcheck disable=SC2217

diff --git a/modules.d/35network-manager/nm-config.sh b/modules.d/35network-manager/nm-config.sh
index 2b13d0a792448c5a2a212bb87d5136944155f4ed..394230fb13df3fd5136b1917f1b43d491174d559 100755 (executable)
--- a/modules.d/35network-manager/nm-config.sh
+++ b/modules.d/35network-manager/nm-config.sh
@@ -6,7 +6,7 @@ if [ -n "$netroot" ] || [ -e /tmp/net.ifaces ]; then
     echo rd.neednet >> /etc/cmdline.d/35-neednet.conf
 fi
 
-if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
+if getargbool 0 rd.debug; then
     # shellcheck disable=SC2174
     mkdir -m 0755 -p /run/NetworkManager/conf.d
     (

diff --git a/modules.d/98dracut-systemd/dracut-emergency.sh b/modules.d/98dracut-systemd/dracut-emergency.sh
index 6371a160aaa45fefcc8449e3456595fe5a399abe..415cec8c022fa65cfa95fb8d76aee1244053e24d 100755 (executable)
--- a/modules.d/98dracut-systemd/dracut-emergency.sh
+++ b/modules.d/98dracut-systemd/dracut-emergency.sh
@@ -13,7 +13,7 @@ type plymouth > /dev/null 2>&1 && plymouth quit
 export _rdshell_name="dracut" action="Boot" hook="emergency"
 _emergency_action=$(getarg rd.emergency)
 
-if getargbool 1 rd.shell -d -y rdshell || getarg rd.break; then
+if getargbool 1 rd.shell || getarg rd.break; then
     FSTXT="/run/dracut/fsck/fsck_help_$fstype.txt"
     RDSOSREPORT="$(rdsosreport)"
     source_hook "$hook"

diff --git a/modules.d/98dracut-systemd/dracut-initqueue.sh b/modules.d/98dracut-systemd/dracut-initqueue.sh
index da6dee3f81186894ae154d34f26ca70b45df2150..7e74576e857cebe974107acdf3ed3e3cc256f3a9 100755 (executable)
--- a/modules.d/98dracut-systemd/dracut-initqueue.sh
+++ b/modules.d/98dracut-systemd/dracut-initqueue.sh
@@ -11,7 +11,7 @@ source_conf /etc/conf.d
 make_trace_mem "hook initqueue" '1:shortmem' '2+:mem' '3+:slab'
 getargs 'rd.break=initqueue' && emergency_shell -n initqueue "Break before initqueue"
 
-RDRETRY=$(getarg rd.retry -d 'rd_retry=')
+RDRETRY=$(getarg rd.retry)
 RDRETRY=${RDRETRY:-180}
 RDRETRY=$((RDRETRY * 2))
 export RDRETRY

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 418b740f7b9a92da294b3758625ddcbe7e04bec1..10dd9be9261dab70c25c6f64076f51fbde256bac 100755 (executable)
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -371,7 +371,7 @@ setdebug() {
     if [ -z "$RD_DEBUG" ]; then
         if [ -e /proc/cmdline ]; then
             RD_DEBUG=no
-            if getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
+            if getargbool 0 rd.debug; then
                 RD_DEBUG=yes
                 [ -n "$BASH" ] \
                     && export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]-}): '
@@ -460,8 +460,8 @@ die() {
 check_quiet() {
     if [ -z "$DRACUT_QUIET" ]; then
         DRACUT_QUIET="yes"
-        getargbool 0 rd.info -d -y rdinfo && DRACUT_QUIET="no"
-        getargbool 0 rd.debug -d -y rdinitdebug && DRACUT_QUIET="no"
+        getargbool 0 rd.info && DRACUT_QUIET="no"
+        getargbool 0 rd.debug && DRACUT_QUIET="no"
         getarg quiet || DRACUT_QUIET="yes"
         a=$(getarg loglevel=)
         [ -n "$a" ] && [ "$a" -ge 28 ] && DRACUT_QUIET="yes"
@@ -923,7 +923,7 @@ _emergency_shell() {
         /sbin/rdsosreport
         echo 'You might want to save "/run/initramfs/rdsosreport.txt" to a USB stick or /boot'
         echo 'after mounting them and attach it to a bug report.'
-        if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdinitdebug -d -y rdnetdebug; then
+        if ! RD_DEBUG='' getargbool 0 rd.debug -d -y rdnetdebug; then
             echo
             echo 'To get more debug information in the report,'
             echo 'reboot with "rd.debug" added to the kernel command line.'
@@ -975,7 +975,7 @@ emergency_shell() {
         && [ -e /run/initramfs/.die ] \
         && _emergency_action=poweroff
 
-    if getargbool 1 rd.shell -d -y rdshell || getarg rd.break; then
+    if getargbool 1 rd.shell || getarg rd.break; then
         _emergency_shell "$_rdshell_name"
     else
         source_hook "$hook"

diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
index 74d9b540035175f0adc33892862134fdbb043f57..43e2d5f3aa04fdf59cc574139452cc44613444e7 100755 (executable)
--- a/modules.d/99base/init.sh
+++ b/modules.d/99base/init.sh
@@ -163,7 +163,7 @@ udevadm trigger --type=devices --action=add > /dev/null 2>&1
 make_trace_mem "hook initqueue" '1:shortmem' '2+:mem' '3+:slab'
 getargs 'rd.break=initqueue' && emergency_shell -n initqueue "Break before initqueue"
 
-RDRETRY=$(getarg rd.retry -d 'rd_retry=')
+RDRETRY=$(getarg rd.retry)
 RDRETRY=${RDRETRY:-180}
 RDRETRY=$((RDRETRY * 2))
 export RDRETRY

diff --git a/test/TEST-98-GETARG/test.sh b/test/TEST-98-GETARG/test.sh
index 410e4606c2d6b1095f7dcd33a0e90ca68c76bc21..d82725b10919cd01ba1d8b703f4968372fcff25d 100755 (executable)
--- a/test/TEST-98-GETARG/test.sh
+++ b/test/TEST-98-GETARG/test.sh
@@ -105,7 +105,7 @@ test_run() {
         getcmdline() {
             echo "rd.break=cmdline rd.lvm rd.auto=0 rd.auto rd.retry=10"
         }
-        RDRETRY=$(getarg rd.retry -d 'rd_retry=')
+        RDRETRY=$(getarg rd.retry)
         [[ $RDRETRY == "10" ]] || ret=$((ret + 1))
         getarg rd.break=cmdline || ret=$((ret + 1))
         getargbool 1 rd.lvm || ret=$((ret + 1))