prefixed more internal command line options with "rd"

break -> rdbreak
netdebug -> rdnetdebug

diff --git a/README b/README
index c8a648db03abb80f27b8ae833ca5bbecddb824b6..cd25d3b4cf9940b21a553ad7b1b0a641c8cc32f4 100644 (file)
--- a/README
+++ b/README
@@ -39,9 +39,9 @@ Some general rules for writing modules:
    relies on, so try not to break those hooks.
  * Hooks must have a .sh extension.
  * Generator modules are described in more detail in README.modules.
- * We have some breakpoints for debugging your hooks.  If you pass 'break'
+ * We have some breakpoints for debugging your hooks.  If you pass 'rdbreak'
    as a kernel parameter, the initramfs will drop to a shell just before
-   switching to a new root. You can pass 'break=hookpoint', and the initramfs
+   switching to a new root. You can pass 'rdbreak=hookpoint', and the initramfs
    will break just before hooks in that hookpoint run. 
 
 Also, there is an attempt to keep things as distribution-agnostic as

diff --git a/modules.d/40network/dhclient-script b/modules.d/40network/dhclient-script
index ca3a2fb36dbb65ff7e4e800ae155a6d7301f3a08..fab61a2a790117d19bb9a86c346f2d6f5f95494e 100755 (executable)
--- a/modules.d/40network/dhclient-script
+++ b/modules.d/40network/dhclient-script
@@ -8,7 +8,7 @@ PATH=$PATH:/sbin:/usr/sbin
 
 . /lib/dracut-lib
 
-getarg netdebug && {
+getarg rdnetdebug && {
     exec >/dhclient.$interface.$$.out
     exec 2>>/dhclient.$interface.$$.out
     set -x

diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index d60ff19789adfa9ff9933b68b1c0423d1fa70041..f56362039e05ca4a28ab198d2b6de133884cc70e 100755 (executable)
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -4,7 +4,7 @@ PATH=$PATH:/sbin:/usr/sbin
 
 . /lib/dracut-lib
 
-getarg netdebug && {
+getarg rdnetdebug && {
     exec >/ifup.$1.$$.out
     exec 2>>/ifup.$1.$$.out
     set -x

diff --git a/modules.d/40nfsroot/nfsroot b/modules.d/40nfsroot/nfsroot
index f5b6ec168e97493ca5061f2f99fd37a2d799faa1..516c8227abc0883bde7fc211d96c23db8b0728bc 100644 (file)
--- a/modules.d/40nfsroot/nfsroot
+++ b/modules.d/40nfsroot/nfsroot
@@ -8,7 +8,7 @@ PATH=$PATH:/sbin:/usr/sbin
 
 # XXX need to lock our attempts if we're doing the mount here
 
-getarg netdebug && {
+getarg rdnetdebug && {
     exec > /nfsroot.$1.$$.out
     exec 2>> /nfsroot.$1.$$.out
     set -x

diff --git a/modules.d/99base/init b/modules.d/99base/init
index 192e92ace985a3fba5445eef42649afb6d06b5f6..9a0181493ca1b39957bc26575a7a24221fdbabb1 100755 (executable)
--- a/modules.d/99base/init
+++ b/modules.d/99base/init
@@ -44,7 +44,7 @@ mkdir /dev/pts
 mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts >/dev/null 2>&1
 
 # pre-udev scripts run before udev starts, and are run only once.
-getarg 'break=pre-udev' && emergency_shell
+getarg 'rdbreak=pre-udev' && emergency_shell
 source_all pre-udev
 
 # start up udev and trigger cold plugs
@@ -56,9 +56,9 @@ udevadm settle --timeout=30 >/dev/null 2>&1
 
 # pre-mount happens before we try to mount the root filesystem,
 # and happens once.
-getarg 'break=pre-mount' && emergency_shell
+getarg 'rdbreak=pre-mount' && emergency_shell
 source_all pre-mount
-getarg 'break=mount' && emergency_shell
+getarg 'rdbreak=mount' && emergency_shell
 
 # mount scripts actually try to mount the root filesystem, and may
 # be sourced any number of times. As soon as one suceeds, no more are sourced.
@@ -77,7 +77,7 @@ while :; do
 done
 
 # pre pivot scripts are sourced just before we switch over to the new root.
-getarg 'break=pre-pivot' && emergency_shell
+getarg 'rdbreak=pre-pivot' && emergency_shell
 source_all pre-pivot
 
 # by the time we get here, the root filesystem should be mounted.
@@ -91,7 +91,7 @@ done
     emergency_shell
 }
 
-getarg break && emergency_shell
+getarg rdbreak && emergency_shell
 kill $(pidof udevd)
 
 # Clean up the environment
@@ -106,7 +106,7 @@ initargs=""
 for x in "$@"; do
     [ "${x%%=*}" = "console" ] && continue
     [ "${x%%=*}" = "BOOT_IMAGE" ] && continue
-    [ "${x%%=*}" = "break" ] && continue
+    [ "${x%%=*}" = "rdbreak" ] && continue
     [ "${x%%=*}" = "rdinitdebug" ] && continue
     [ "${x%%=*}" = "rdudevinfo" ] && continue
     [ "${x%%=*}" = "rdudevdebug" ] && continue