From: intrigeri <intrigeri@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Wed, 1 Nov 2006 21:14:35 +0000 (+0000)
Subject: sys: start to fix silly output display and data loss
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=62cea42ef43dabe6a5ea4ab83ddb6e9d5116b64d;p=matthijs%2Fupstream%2Fbackupninja.git

sys: start to fix silly output display and data loss

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@454 758a04ac-41e6-0310-8a23-8373a73cc35d
---

diff --git a/ChangeLog b/ChangeLog
index 58414ba..bd7c1af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ version 0.9.5 -- unreleased
 	sys:
 	 . Fixed typo breaking things for VServers.
 	 . Fix bug when vrootdir is on its own partition (Closes: #395928)
+	 . Hide silly sfdisk error output.
 	pgsql:
 	 . Support configuring PGSQLUSER for real, and document it a bit
 	   (Closes: #396578)
diff --git a/handlers/sys b/handlers/sys
index 677d5ee..7c31780 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -443,17 +443,19 @@ fi
 # these files can be used to directly partition a disk of the same size.
 
 if [ "$partitions" == "yes" ]; then
-	devices=`$SFDISK -l | grep "^Disk /dev" | cut -d/  -f2,3 | cut -d: -f1`
+	devices=`$SFDISK -l 2>/dev/null | grep "^Disk /dev" | awk '{print $2}' | cut -d: -f1`
+        debug "$SFDISK will try to backup partition tables for devices $devices"
 	if [ "$devices" == "" ]; then 
 	   warning "No harddisks found" 
 	fi
 	for dev in $devices; do
+                debug "$SFDISK will try to backup partition tables for device $dev"
 		[ -b $dev ] || continue
 		label=${dev#/dev/}
 		label=${label//\//-}
 		outputfile=${partitionsfile//__star__/$label}
-		debug "$SFDISK $sfdisk_options -d /$dev > $outputfile"
-		$SFDISK $sfdisk_options -d /$dev > $outputfile
+		debug "$SFDISK $sfdisk_options -d $dev > $outputfile"
+		$SFDISK $sfdisk_options -d $dev > $outputfile
 	done
 fi