From e854d68b0a6083d229c0b6dda90551efd1b15002 Mon Sep 17 00:00:00 2001 From: fling Date: Thu, 14 Apr 2011 14:02:33 +0800 Subject: [PATCH 1/2] bug 886 use UUID of root --- operation/configure_bootloader_cnf.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/operation/configure_bootloader_cnf.sh b/operation/configure_bootloader_cnf.sh index 0bbe0ff..690c11f 100755 --- a/operation/configure_bootloader_cnf.sh +++ b/operation/configure_bootloader_cnf.sh @@ -63,10 +63,16 @@ options: configure_elilo_cnf() { - local root_dev - root_dev="/dev/$ROOT_PARTITION" - sed -i "s@root=@root=$root_dev@g" $ELILO_CNF - sed -i -e "/initrd=.*/i\ append=\"$KPARAMETER\"" $ELILO_CNF + local root_dev + 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 "/initrd=.*/i\ append=\"$KPARAMETER root=UUID=$by_uuid\"" $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 + fi } configure_grub_cnf () From fd335e82098a80174b7e564c1d6a9161b49d5c21 Mon Sep 17 00:00:00 2001 From: fling Date: Tue, 19 Apr 2011 19:51:51 +0800 Subject: [PATCH 2/2] bug 4.3/886 modified: configure_bootloader_cnf.sh add uuid --- operation/configure_bootloader_cnf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operation/configure_bootloader_cnf.sh b/operation/configure_bootloader_cnf.sh index 690c11f..034b82f 100755 --- a/operation/configure_bootloader_cnf.sh +++ b/operation/configure_bootloader_cnf.sh @@ -67,7 +67,7 @@ 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 "/initrd=.*/i\ append=\"$KPARAMETER root=UUID=$by_uuid\"" $ELILO_CNF + sed -i -e "s@^root=@append=\"$KPARAMETER root=UUID=$root_dev\"@" $ELILO_CNF else root_dev="/dev/$ROOT_PARTITION" sed -i "s@root=@root=$root_dev@g" $ELILO_CNF