From: micah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Tue, 8 Aug 2006 21:40:08 +0000 (+0000)
Subject: Changed partition check to use sfdisk as its more common
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=4af69c37034f27f0a0aaeb7a3c5bb5376b5a2580;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

Changed partition check to use sfdisk as its more common


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

diff --git a/ChangeLog b/ChangeLog
index b1b9b99..6b5082b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,7 @@ version 0.9.4 -- unreleased
 	 . Now forbid to (try to) include /.
 	sys:
 	 . Many more system checks were added, thanks to Petr Klíma
+	 . Changed partition check to use sfdisk as its more common, thanks Rainer Zocholl
 	ldap:
 	 . Compress now happens in-line to save some disk space (Closes: #370778)
     lib changes
diff --git a/handlers/sys b/handlers/sys
index d0e2057..a8c8771 100755
--- a/handlers/sys
+++ b/handlers/sys
@@ -449,7 +449,7 @@ fi
 # these files can be used to directly partition a disk of the same size.
 
 if [ "$partitions" == "yes" ]; then
-	devices=`$HWINFO --disk | grep "Device File" | cut -d\  -f5`
+	devices=`$SFDISK -l | grep "^Disk /dev" | cut -d/  -f2,3 | cut -d: -f1`
 	if [ "$devices" == "" ]; then 
 	   warning "No harddisks found" 
 	fi
@@ -458,8 +458,8 @@ if [ "$partitions" == "yes" ]; then
 		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