summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-05-04 17:24:31 -0700
committerStephen Hemminger <shemminger@vyatta.com>2011-05-04 17:24:31 -0700
commit85287b60ef922227e1a25eb04a3ed9bd16a1ece4 (patch)
tree5b589a80ffd0593a4a5ffbfff70169d584492505 /scripts
parentd3d9e006c7d9033a8e78f71bafc52b6963f2d3a9 (diff)
downloadvyatta-cfg-quagga-85287b60ef922227e1a25eb04a3ed9bd16a1ece4.tar.gz
vyatta-cfg-quagga-85287b60ef922227e1a25eb04a3ed9bd16a1ece4.zip
Align install-image partition correctly
Need to pass correct offset for start of root partition
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/install/install-get-partition12
1 files changed, 4 insertions, 8 deletions
diff --git a/scripts/install/install-get-partition b/scripts/install/install-get-partition
index b15092a6..1195da4d 100755
--- a/scripts/install/install-get-partition
+++ b/scripts/install/install-get-partition
@@ -33,9 +33,8 @@ ROOT_PARTITION_TYPE=''
PARTITION=''
# default file system type
ROOT_FSTYPE='ext3'
-
# default start of root partition
-ROOT_OFFSET="64S"
+ROOT_OFFSET="1024S" # 512K align for SSD etc
warn_of_dire_consequences () {
# Give the user a requisite warning that we are about to nuke their drive
@@ -713,17 +712,14 @@ create_partitions() {
fi
}
-# adjust root filesystem based on disk size
+# adjust root filesystem options
set_root_fstype () {
local drv=$1
local sz=$(get_drive_size "$drv")
# if disk is small, then don't waste space aligning
- # otherwise align on 512K boundary for SSD etc
if (( $sz < 10000 )); then
- ROOT_OFFSET="64S"
- else
- ROOT_OFFSET="1024S"
+ ROOT_OFFSET="64S" # 32K align
fi
}
@@ -849,7 +845,7 @@ setup_method_auto () {
echo
# now take the data and create the partitions
- create_partitions "$INSTALL_DRIVE" "$root_part_size" 0 "yes"
+ create_partitions "$INSTALL_DRIVE" "$root_part_size" $ROOT_OFFSET "yes"
# mark data partition as bootable
lecho "Marking /dev/$INSTALL_DRIVE partition 1 as bootable"
output=$(parted -s /dev/$INSTALL_DRIVE set 1 boot on 2>&1)