X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=ybin%2Fyabootconfig;h=b65ae632d6083b6eafd93c82649fff6cf1dbc156;hp=0fc5c5e50fc0039257e763ea7c15606ae9bad17c;hb=c2555be2247b6e98ef2f5cbc6d314b0e97428bbb;hpb=678d83ff8608534ece0f1e912eddedef4f0bb67a;ds=sidebyside diff --git a/ybin/yabootconfig b/ybin/yabootconfig index 0fc5c5e..b65ae63 100755 --- a/ybin/yabootconfig +++ b/ybin/yabootconfig @@ -27,7 +27,7 @@ if [ -n "$PATH_PREFIX" ] ; then PATH="${PATH}:${PATH_PREFIX}/sbin:${PATH_PREFIX}/bin:${PATH_PREFIX}/usr/sbin:${PATH_PREFIX}/usr/bin:${PATH_PREFIX}/usr/local/sbin:${PATH_PREFIX}/usr/local/bin" fi PRG="${0##*/}" -VERSION=1.0.5 +VERSION=1.0.6 CHROOT=/ ## $CONFIG is relative to $CHROOT CONFIG=etc/yaboot.conf @@ -375,7 +375,7 @@ fi ## find / device if [ -z "$ROOT" ] ; then ## IMPORTANT! that last substitution is [] thats all ash will grok - ROOT="$(v=`grep '[[:blank:]]/[[:blank:]]' ${CHROOT}etc/fstab` ; echo ${v%%[ ]*})" + ROOT="$(v=`grep '^[^#].*[[:blank:]]/[[:blank:]]' ${CHROOT}etc/fstab` ; echo ${v%%[ ]*})" debug "ROOT=$ROOT\n" if [ -z "$ROOT" ] ; then echo 1>&2 "$PRG: Could not determine root partition, aborting..."