--- mkinitrd-2.8.7/mkinitrd~ 2003-03-24 19:07:31 +0300 +++ mkinitrd-2.8.7/mkinitrd 2003-07-29 17:48:12 +0400 @@ -83,7 +83,7 @@ pause= MODULES= -MODULES_CONF=/etc/modules.conf +MODULES_CONF='/etc/modules.conf '`egrep -e '^include[ ]+' /etc/modules.conf | sed -e 's/^include[ ]\+\(.\+\)/\1/' | tr '\\n' ' '` FSTAB_FILE=/etc/fstab MODULES_DIR= @@ -192,7 +192,7 @@ { [ -z "$noscsi" ] || return - local scsimodules=`/bin/egrep -s '(alias|probeall)[ ]+scsi_hostadapter' "$MODULES_CONF" | + local scsimodules=`/bin/egrep -s '(alias|probeall)[ ]+scsi_hostadapter' $MODULES_CONF | /bin/grep -v '^[ ]*#' |LC_COLLATE=C /bin/sort -u |/bin/awk '{$1=$2="";print}'` local n @@ -241,7 +241,7 @@ fi if /bin/grep -s '^/dev/ataraid' "$FSTAB_FILE" |/bin/fgrep -v noauto >/dev/null 2>&1; then - local ataraidmodules=`/bin/egrep -s '(alias|probeall)[ ]+ataraid_hostadapter' "$MODULES_CONF" | + local ataraidmodules=`/bin/egrep -s '(alias|probeall)[ ]+ataraid_hostadapter' $MODULES_CONF | /bin/grep -v '^[ ]*#' |LC_COLLATE=C /bin/sort -u |/bin/awk '{$1=$2="";print}'` local n for n in $ataraidmodules; do @@ -386,7 +386,7 @@ local n="${m##*/}" n="${n%.o}" - options=`/bin/sed -ne "s/^options[ ]\\+$n[ ]\\+//p" "$MODULES_CONF"` + options=`/bin/sed -ne "s/^options[ ]\\+$n[ ]\\+//p" $MODULES_CONF` Debug "Loading module $m with options '$options'" /bin/cat >>"$RCFILE" <