Merge pull request #347 from thias/master

Fix install on blank 3TB drives
This commit is contained in:
Stephan Raue 2012-03-21 09:39:43 -07:00
commit d61061312f

View File

@ -69,7 +69,7 @@ get_device_unmount() {
# provides: DEVICES # provides: DEVICES
DEVICES="" DEVICES=""
DEVICES=$(parted -m -l | grep ^/dev/sd | cut -f1 -d ":") DEVICES=$(parted -s -m -l | grep ^/dev/sd | cut -f1 -d ":")
for i in $(cat /proc/mounts | grep ^/dev/sd | cut -f1 -d " " | sed "s/[0-9]//"); do for i in $(cat /proc/mounts | grep ^/dev/sd | cut -f1 -d " " | sed "s/[0-9]//"); do
DEVICES=$(echo $DEVICES |sed -e "s|$i||") DEVICES=$(echo $DEVICES |sed -e "s|$i||")
@ -82,7 +82,7 @@ get_partition() {
# uses: - # uses: -
# provides: PARTITIONS # provides: PARTITIONS
PARTITIONS=$(parted -m $1 print |grep -v ^/dev |grep -v BYT | cut -f1 -d ":") PARTITIONS=$(parted -s -m $1 print |grep -v ^/dev |grep -v BYT | cut -f1 -d ":")
} }
create_device_list() { create_device_list() {
@ -104,8 +104,8 @@ create_device_list() {
fi fi
for i in $DEVICES; do for i in $DEVICES; do
DEVICE_MODEL=$(parted $i -m print | grep ^$i | cut -f7 -d ":" | sed "s/;//") DEVICE_MODEL=$(parted -s $i -m print | grep ^$i | cut -f7 -d ":" | sed "s/;//")
DEVICE_SIZE=$(parted $i -m print | grep ^$i | cut -f2 -d ":") DEVICE_SIZE=$(parted -s $i -m print | grep ^$i | cut -f2 -d ":")
DEVICE_NAME=$(echo $DEVICE_MODEL ${DEVICE_SIZE} | sed 's/ /_/g') DEVICE_NAME=$(echo $DEVICE_MODEL ${DEVICE_SIZE} | sed 's/ /_/g')
DEVICE_LIST="$DEVICE_LIST $i $DEVICE_NAME" DEVICE_LIST="$DEVICE_LIST $i $DEVICE_NAME"
done done
@ -126,9 +126,9 @@ create_partition_list() {
get_partition $1 get_partition $1
for partition in $PARTITIONS; do for partition in $PARTITIONS; do
PARTITION_NUMBER=$(parted -m $1 print |grep -v ^/dev |grep -v BYT | cut -f1 -d ":") PARTITION_NUMBER=$(parted -s -m $1 print |grep -v ^/dev |grep -v BYT | cut -f1 -d ":")
PARTITION_SIZE=$(parted -m $1 print |grep -v ^/dev |grep -v BYT | cut -f4 -d ":") PARTITION_SIZE=$(parted -s -m $1 print |grep -v ^/dev |grep -v BYT | cut -f4 -d ":")
PARTITION_FORMAT=$(parted -m $1 print |grep -v ^/dev |grep -v BYT | cut -f5 -d ":") PARTITION_FORMAT=$(parted -s -m $1 print |grep -v ^/dev |grep -v BYT | cut -f5 -d ":")
PARTITION_LIST=" $PARTITION_LIST \n Partition $1$PARTITION_NUMBER Size: $PARTITION_SIZE Format: $PARTITION_FORMAT" PARTITION_LIST=" $PARTITION_LIST \n Partition $1$PARTITION_NUMBER Size: $PARTITION_SIZE Format: $PARTITION_FORMAT"
done done
} }