bootdisk/trunk/batch-installer/ui/ui-parted2

[hawk]

Author: hawk
Date: Sat Nov 26 20:44:39 2005
New Revision: 6573

Modified:
   bootdisk/trunk/batch-installer/ui/ui-parted2
Log:
- reverted last commit, parted >= 1.6.23 really sux, it ignores
  cylinder boundaries and is making mess with physical/logical
  disk geometries


Modified: bootdisk/trunk/batch-installer/ui/ui-parted2
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-parted2	(original)
+++ bootdisk/trunk/batch-installer/ui/ui-parted2	Sat Nov 26 20:44:39 2005
@@ -233,7 +233,7 @@
 
 disk_info () {
   for device in $dest_devices ; do
-    parted -s $device unit m print | grep '^Disk geometry' | \
+    parted -s $device print | grep '^Disk geometry' | \
     	sed "s|/dev/.*/disc|$device|; s/^/<br>/"
   done
 }
@@ -244,13 +244,12 @@
 
   new_part_info=/tmp/new_part_info.`basename $1`
   
-  echo 'primary 0 1' > $new_part_info
+  echo 'primary 0.000 1' > $new_part_info
   new_part_type=primary
-  parted -s $1 unit m print | grep '^[0-9]' \
-  | while read number start end size type fs flags; do
-    start=`echo $start | sed -e 's/MB$//'`
-    end=`echo $end | sed -e 's/MB$//'`
-    size=`echo $size | sed -e 's/MB$//'`
+  parted -s $1 print | grep '^[0-9]' \
+  | while read number start end type fs flags; do
+    start_i=`echo $start | sed -e 's/\..*//'`
+    end_i=`echo $end | sed -e 's/\..*//'`
     name=$(part $1 $number)
     next_part=$(($number+1))
     case " $fs $flags " in
@@ -288,11 +287,11 @@
       part_format=no
       part_touch=no
     fi
-    part_size=$size
+    part_size=$(($end_i-$start_i))
     part_start=$start
     save_part 
     echo -n "<item id='${1}@${number}'>"
-    printf "%-10s %10d %5dMB %-20s : %s" $name $start $size \
+    printf "%-10s %10.3f %5dMb %-20s : %s" $name $start $(($end_i-$start_i)) \
 	"$part_mnt_point ($part_filesystem)" "$flags"
   done
 
@@ -303,7 +302,7 @@
     if test -f $f ; then
       load_part $f
       echo -n "<item id='md@${part_minor}'>"
-      printf "%-10s %10s %5dMB %-20s : %s" "/dev/md${part_minor}" "" $part_size \
+      printf "%-10s %10s %5dMb %-20s : %s" "/dev/md${part_minor}" "" $part_size \
 			"$part_mnt_point ($part_filesystem)" ""
     fi
   done
@@ -361,7 +360,7 @@
 
   if [ "$res" = 1 -a $new_size -gt 2 ] ; then
     end=$((`echo $part_start | sed -e 's/\..*//'`+$new_size))
-    show_result parted -s $part_device unit m resize $part_minor $part_start $end
+    show_result parted -s $part_device resize $part_minor $part_start $end
   fi
 }
 
@@ -598,14 +597,14 @@
   disk_end=$(parted -s $device print | \
   	     grep 'Disk geometry' | \
 	     sed -e 's/.*-//' | \
-	     sed -e 's/MB$//')
+	     sed -e 's/\..*//')
   read JUNK new_part_start JUNK < /tmp/new_part_info.`basename $device`
   new_part_start=$(echo "$new_part_start" | sed -e 's/\..*//')
   remaining=$(($disk_end-$new_part_start-1))
   disk_end=$(($disk_end-1)).999
   get_input size $remaining "$(nls "Filesystem: %s" "$fs"
-  	)<br>$(nls "Enter size of partition to create (in MB):"
-	)<br>$(nls "Free space: %d MB" $remaining)"
+  	)<br>$(nls "Enter size of partition to create (in Mb):"
+	)<br>$(nls "Free space: %d Mb" $remaining)"
   if [ "$?" != 0 -o "$size" -lt 3 ] ; then
     return 0
   fi
@@ -680,7 +679,7 @@
 $(nls "Would you like to create it?")<br>
 <br>
 $(nls "If you choose \"No\" this program will terminate.")<br>" ; then
-        show_result parted -s $device unit m mkpart extended $new_part_start $disk_end
+        show_result parted -s $device mkpart extended $new_part_start $disk_end
       else
         exit 1
       fi
@@ -688,7 +687,7 @@
   fi
   
   end=$((`echo $new_part_start | sed -e 's/\..*//'`+$size-1)).999
-  show_result parted -s $device unit m mkpart $new_part_type $new_part_fs \
+  show_result parted -s $device mkpart $new_part_type $new_part_fs \
   	$new_part_start $end || return
   if [ "$fs" = md ] ; then
     show_result parted -s $device set $new_part_no raid on || return