Skip to content
Snippets Groups Projects
Commit e6bf696c authored by micah's avatar micah :speech_balloon:
Browse files

Changed partition check to use sfdisk as its more common

parent 7814d463
No related branches found
No related tags found
No related merge requests found
...@@ -52,6 +52,7 @@ version 0.9.4 -- unreleased ...@@ -52,6 +52,7 @@ version 0.9.4 -- unreleased
. Now forbid to (try to) include /. . Now forbid to (try to) include /.
sys: sys:
. Many more system checks were added, thanks to Petr Klíma . 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: ldap:
. Compress now happens in-line to save some disk space (Closes: #370778) . Compress now happens in-line to save some disk space (Closes: #370778)
lib changes lib changes
......
...@@ -449,7 +449,7 @@ fi ...@@ -449,7 +449,7 @@ fi
# these files can be used to directly partition a disk of the same size. # these files can be used to directly partition a disk of the same size.
if [ "$partitions" == "yes" ]; then 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 if [ "$devices" == "" ]; then
warning "No harddisks found" warning "No harddisks found"
fi fi
...@@ -458,8 +458,8 @@ if [ "$partitions" == "yes" ]; then ...@@ -458,8 +458,8 @@ if [ "$partitions" == "yes" ]; then
label=${dev#/dev/} label=${dev#/dev/}
label=${label//\//-} label=${label//\//-}
outputfile=${partitionsfile//__star__/$label} outputfile=${partitionsfile//__star__/$label}
debug "$SFDISK $sfdisk_options -d $dev > $outputfile" debug "$SFDISK $sfdisk_options -d /$dev > $outputfile"
$SFDISK $sfdisk_options -d $dev > $outputfile $SFDISK $sfdisk_options -d /$dev > $outputfile
done done
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment