summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2009-05-27 14:56:20 +0200
committerHarald Hoyer <harald@redhat.com>2009-05-27 14:56:20 +0200
commit412713048077e58720f01ad2e470defd70bcb208 (patch)
treebbde61fb7da96292c4d0273da6973e6fede9b55d
parentee0deb9918f7cce2553ccfd40b9fc51d8f5dfce8 (diff)
downloaddracut-412713048077e58720f01ad2e470defd70bcb208.tar.gz
dracut-412713048077e58720f01ad2e470defd70bcb208.tar.bz2
dracut-412713048077e58720f01ad2e470defd70bcb208.zip
prefixed more internal command line options with "rd"
break -> rdbreak netdebug -> rdnetdebug
-rw-r--r--README4
-rwxr-xr-xmodules.d/40network/dhclient-script2
-rwxr-xr-xmodules.d/40network/ifup2
-rw-r--r--modules.d/40nfsroot/nfsroot2
-rwxr-xr-xmodules.d/99base/init12
5 files changed, 11 insertions, 11 deletions
diff --git a/README b/README
index c8a648db..cd25d3b4 100644
--- 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 ca3a2fb3..fab61a2a 100755
--- 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 d60ff197..f5636203 100755
--- 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 f5b6ec16..516c8227 100644
--- 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 192e92ac..9a018149 100755
--- 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