From 93d56a9c7b120b8d92ace566efdf3bd7cd076864 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Wed, 12 Nov 2008 10:17:45 +0000 Subject: handle swap creation without fs expand --- rescue/restore-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rescue/restore-image.sh b/rescue/restore-image.sh index 87b8070bf..c5fa5726e 100755 --- a/rescue/restore-image.sh +++ b/rescue/restore-image.sh @@ -165,14 +165,14 @@ function expand_fs() disk=/dev/$root main_part=/dev/${root}1 swap_part=/dev/${root}2 - #part_sectors=$(sfdisk -d $disk | perl -lne 'm|^'$main_part'\b.*,\s*size\s*=\s*(\d+)\b| and print($1), exit') - #part_blocks=$((part_sectors/2)) main_part_sectors= if [ -n "$SWAP_BLOCKS" ]; then if [ -n "$EXPAND_FS" ]; then total_blocks=$(sfdisk -s $disk) main_part_blocks=$((total_blocks-SWAP_BLOCKS)) main_part_sectors=$((main_part_blocks*2)) + else + main_part_sectors=$(sfdisk -d $disk | perl -lne 'm|^'$main_part'\b.*,\s*size\s*=\s*(\d+)\b| and print($1), exit') fi fi if [ -n "$EXPAND_FS" ]; then -- cgit v1.2.1