Changeset 1857 in MondoRescue for branches

Timestamp:

Jan 11, 2008, 3:28:40 PM (16 years ago)

Author:

Bruno Cornec

Message:

remove fdisk error messages on ia64 that end up on screen during restore - such as GPT not supported ...

Location:

branches/2.2.5/mindi

Files:

• aux-tools/sbin/calc-disk-size (modified) (1 diff)
• mindi (modified) (1 diff)
• parted2fdisk.pl (modified) (5 diffs)

branches/2.2.5/mindi/aux-tools/sbin/calc-disk-size

@@ -6 +6 @@
 CalcDiskSize() {
     local res cylinders sectorsize disksize i curr stub out
-    res=`parted2fdisk -l $1 2> /dev/null | grep -i "cylinders of"`
+    res=`parted2fdisk -l $1 2>/dev/null | grep -i "cylinders of"`
     cylinders=`echo "$res" | cut -d' ' -f5`
     sectorsize=`echo "$res" | cut -d' ' -f7`
-    cylindermod=`parted2fdisk -l $1 2> /dev/null | grep -i $1:`; # note colon at end to make sure it's not the /dev/sda# partition info
+    cylindermod=`parted2fdisk -l $1 2>/dev/null | grep -i $1:`; # note colon at end to make sure it's not the /dev/sda# partition info
     cylnum=`echo "$cylindermod" | cut -d' ' -f7`
     predisksize=$(($cylinders*$sectorsize/1024))

branches/2.2.5/mindi/mindi

@@ -1745 +1745 @@
     echo "Transforming $USBDEVICE in a Bootable device"  >> $LOGFILE
     echo "Checking $USBDEVICE" >> $LOGFILE
-    $FDISK -l $USBDEVICE 2>&1 >> $LOGFILE
+    $FDISK -l $USBDEVICE 2>> $LOGFILE 1>> $LOGFILE
     if [ $? -ne 0 ]; then
         echo "Unable to access $USBDEVICE" | tee -a $LOGFILE

branches/2.2.5/mindi/parted2fdisk.pl

@@ -277 +277 @@
 if ($args =~ /^-/) {
     # -l or -s
-    open (FDISK, "$fdisk $fargs |") || die "Unable to read from $fdisk";
+    open (FDISK, "$fdisk $fargs 2>/dev/null |") || die "Unable to read from $fdisk";
     while (<FDISK>) {
         print;
@@ -284 +284 @@
 } else {
     # Modification mode
-    open (FDISK, "| $fdisk $fargs") || die "Unable to modify through $fdisk";
+    open (FDISK, "| $fdisk $fargs 2>/dev/null") || die "Unable to modify through $fdisk";
     while (<STDIN>) {
         print FDISK;
@@ -444 +444 @@
 my $foo;
 
-open (FDISK, "$fdisk -l $device |") || die "Unable to read from $fdisk";
+open (FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
     if ($_ =~ /heads/) {
@@ -468 +468 @@
 my $foo;
 
-open (FDISK, "$fdisk -l $device |") || die "Unable to read from $fdisk";
+open (FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
     print if (($_ !~ /^\/dev\//) and (not (defined $wpart)) and ($verbose == 1));
@@ -606 +606 @@
 my $type = "";
 
-open (FDISK, "$fdisk -l $device |") || die "Unable to read from $fdisk";
+open (FDISK, "$fdisk -l $device 2>/dev/null |") || die "Unable to read from $fdisk";
 while (<FDISK>) {
     if ($_ =~ /EFI GPT/) {