projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7814d46
)
Changed partition check to use sfdisk as its more common
author
Micah Anderson
<micah@riseup.net>
Tue, 8 Aug 2006 21:40:08 +0000
(21:40 +0000)
committer
Micah Anderson
<micah@riseup.net>
Tue, 8 Aug 2006 21:40:08 +0000
(21:40 +0000)
ChangeLog
patch
|
blob
|
history
handlers/sys
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index b1b9b99f6e258c8f3e6ca5ab5d86295caa611b3c..6b5082bd389876724af12a03c57a271b1f4eda4a 100644
(file)
--- 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
. 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
ldap:
. Compress now happens in-line to save some disk space (Closes: #370778)
lib changes
diff --git
a/handlers/sys
b/handlers/sys
index d0e2057d50bc15fdb48368c718f2a67882fb6939..a8c8771ff59e536f4c8ce0fbfab8eccda870713c 100755
(executable)
--- 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
# 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
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}
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
done
fi