Browse Source

fix IFS restoring

master
Harald Hoyer 15 years ago
parent
commit
9232cab470
  1. 2
      modules.d/95iscsi/iscsiroot
  2. 4
      modules.d/95nfs/nfsroot
  3. 4
      modules.d/95rootfs-block/mount-root.sh
  4. 4
      modules.d/99base/dracut-lib.sh

2
modules.d/95iscsi/iscsiroot

@ -112,7 +112,7 @@ iscsi_target_port=$1; shift @@ -112,7 +112,7 @@ iscsi_target_port=$1; shift
iscsi_lun=$1; shift
IFS=:
iscsi_target_name=$*
IFS=$OLDIFS
IFS="$OLDIFS"
# XXX is this needed?
getarg ro && iscsirw=ro
getarg rw && iscsirw=rw

4
modules.d/95nfs/nfsroot

@ -63,14 +63,14 @@ if [ "${path#*%s}" != "$path" ]; then @@ -63,14 +63,14 @@ if [ "${path#*%s}" != "$path" ]; then
fi

# Look through the options and remove rw/locking options
OLDIFS=$IFS
OLDIFS="$IFS"
IFS=,
for f in $options ; do
[ "$f" = "ro" -o "$f" = "rw" ] && nfsrw=$f && continue
[ "$f" = "lock" -o "$f" = "nolock" ] && nfslock=$f && continue
flags=${flags:+$flags,}$f
done
IFS=$OLDIFS
IFS="$OLDIFS"
options=$flags

# Override rw/ro if set on cmdline

4
modules.d/95rootfs-block/mount-root.sh

@ -5,10 +5,10 @@ @@ -5,10 +5,10 @@
filter_rootopts() {
rootopts=$1
# strip ro and rw options
local OLDIFS=$IFS
local OLDIFS="$IFS"
IFS=,
set -- $rootopts
IFS=$OLDIFS
IFS="$OLDIFS"
local v
while [ $# -gt 0 ]; do
case $1 in

4
modules.d/99base/dracut-lib.sh

@ -48,7 +48,7 @@ setdebug() { @@ -48,7 +48,7 @@ setdebug() {
if [ -z "$RDDEBUG" ]; then
if [ -e /proc/cmdline ]; then
RDDEBUG=no
if getarg rdinitdebug; then
if getarg rdinitdebug; then
RDDEBUG=yes
fi
fi
@ -186,8 +186,6 @@ nfsroot_to_var() { @@ -186,8 +186,6 @@ nfsroot_to_var() {
local arg="$@:"
nfs="${arg%%:*}"
arg="${arg##$nfs:}"
# check for server
local OLDIFS="$IFS"

# check if we have a server
if strstr "$arg" ':/*' ; then

Loading…
Cancel
Save