linx/new_install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'remotes/origin/4.3/879'

Browse Source 
Conflicts:
	operation/configure_bootloader_cnf.sh

	modified:   operation/configure_bootloader_cnf.sh
This commit is contained in:
fling
2011-05-17 12:27:40 +08:00
parent f73629be74 82c0eb1b7c
commit ec9d81cf50
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
operation/configure_bootloader_cnf.sh
View File

@@ -67,11 +67,11 @@ configure_elilo_cnf()
by_uuid=$(get_disk_sym $ROOT_PARTITION "by-uuid")
if [ -n "$by_uuid" ];then
root_dev="UUID=$(echo $by_uuid|sed 's/.*\///')"
sed -i -e "s@^root=@append=\"$KPARAMETER root=UUID=$root_dev\"@" $ELILO_CNF
sed -i -e "s@^root=@append=\"$KPARAMETER root=UUID=$root_dev rootdelay=2500\"@" $ELILO_CNF
else
root_dev="/dev/$ROOT_PARTITION"
sed -i "s@root=@root=$root_dev@g" $ELILO_CNF
sed -i -e "/initrd=.*/i\ append=\"$KPARAMETER\"" $ELILO_CNF
sed -i -e "/initrd=.*/i\ append=\"$KPARAMETER rootdelay=2500\"" $ELILO_CNF
fi
}