diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-02-11 14:42:05 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-02-11 14:42:05 +0000 |
| commit | bf65cc609a86a2d2c6228f3b72a0b134ea9e615d (patch) | |
| tree | d2e91d1d68c8bdc71161eb7d5d1abf009b955606 | |
| parent | 4415c09943419c20215cb5c8c3c5de4859532f5a (diff) | |
| download | drakx-bf65cc609a86a2d2c6228f3b72a0b134ea9e615d.tar drakx-bf65cc609a86a2d2c6228f3b72a0b134ea9e615d.tar.gz drakx-bf65cc609a86a2d2c6228f3b72a0b134ea9e615d.tar.bz2 drakx-bf65cc609a86a2d2c6228f3b72a0b134ea9e615d.tar.xz drakx-bf65cc609a86a2d2c6228f3b72a0b134ea9e615d.zip | |
use win32_part_dev variable instead of testing file existence
| -rwxr-xr-x | rescue/restore-image.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh index 5d8c4c1b9..0aece56b1 100755 --- a/rescue/restore-image.sh +++ b/rescue/restore-image.sh @@ -302,7 +302,7 @@ EOF function expand_fs() { - if [ ! -s /tmp/fdisk.log ]; then + if [ -z "$win32_part_dev" ]; then root=${root%[0-9]}1 fi filesystem_type=$(dumpe2fs -h /dev/${root} 2>/dev/null| grep "Filesystem OS type" | awk '{ print $4 }') @@ -340,7 +340,7 @@ function expand_fs() grub_dir="$mnt_dir/boot/grub" if [ -d "$grub_dir" ]; then echo "(hd0) $disk" > "$grub_dir/device.map" - if [ -s /tmp/fdisk.log ]; then + if [ -n "$win32_part_dev" ]; then grub_setup ${root} ${grub_dir} fi fi |