|
|
@ -13,8 +13,12 @@ declare -i -r heads=255 |
|
|
# Number of required sectors in a final image. |
|
|
# Number of required sectors in a final image. |
|
|
declare -i -r sectors=63 |
|
|
declare -i -r sectors=63 |
|
|
|
|
|
|
|
|
declare -a mender_disk_partitions=("boot" "primary" "secondary" "data") |
|
|
declare -a mender_partitions_regular=('boot' 'primary' 'secondary' 'data') |
|
|
declare -a raw_disk_partitions=("boot" "rootfs") |
|
|
declare -a mender_partitions_extended=('boot' 'primary' 'secondary' 'n/a' 'data' 'swap') |
|
|
|
|
|
declare -a raw_disk_partitions=('boot' 'rootfs') |
|
|
|
|
|
|
|
|
|
|
|
declare -A raw_disk_sizes |
|
|
|
|
|
declare -A mender_disk_sizes |
|
|
|
|
|
|
|
|
tool_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
|
|
tool_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
|
|
files_dir=${tool_dir}/files |
|
|
files_dir=${tool_dir}/files |
|
|
@ -126,62 +130,58 @@ EOF |
|
|
# Calculates following values: |
|
|
# Calculates following values: |
|
|
# |
|
|
# |
|
|
# $2 - number of partitions |
|
|
# $2 - number of partitions |
|
|
# $3 - size of the sector (in bytes) |
|
|
# $3 - sector size |
|
|
# $4 - boot partition start offset (in sectors) |
|
|
# $4 - array of partitions' sizes for raw disk |
|
|
# $5 - boot partition size (in sectors) |
|
|
# |
|
|
# $6 - root filesystem partition start offset (in sectors) |
|
|
get_raw_disk_sizes() { |
|
|
# $7 - root filesystem partition size (in sectors) |
|
|
|
|
|
# $8 - boot flag |
|
|
|
|
|
get_image_info() { |
|
|
|
|
|
local limage=$1 |
|
|
local limage=$1 |
|
|
local rvar_count=$2 |
|
|
local rvar_count=$2 |
|
|
local rvar_sectorsize=$3 |
|
|
local rvar_sectorsize=$3 |
|
|
local rvar_bootstart=$4 |
|
|
shift 3 |
|
|
local rvar_bootsize=$5 |
|
|
local rvar_array=($@) |
|
|
local rvar_rootfsstart=$6 |
|
|
|
|
|
local rvar_rootfssize=$7 |
|
|
|
|
|
local rvar_bootflag=$8 |
|
|
|
|
|
|
|
|
|
|
|
local lbootsize=0 |
|
|
|
|
|
local lsubname=${limage:0:8} |
|
|
|
|
|
local lfdisk="$(fdisk -u -l ${limage})" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
local lsubname=${limage:0:10} |
|
|
|
|
|
local lfdisk="$(fdisk -u -l ${limage})" |
|
|
local lparts=($(echo "${lfdisk}" | grep "^${lsubname}" | cut -d' ' -f1)) |
|
|
local lparts=($(echo "${lfdisk}" | grep "^${lsubname}" | cut -d' ' -f1)) |
|
|
local lcount=${#lparts[@]} |
|
|
local lcount=${#lparts[@]} |
|
|
|
|
|
|
|
|
|
|
|
if [[ $lcount -gt 3 ]]; then |
|
|
|
|
|
log "\tError: invalid/unsupported raw disk image. Aborting." |
|
|
|
|
|
return 1 |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
local lsectorsize=($(echo "${lfdisk}" | grep '^Sector' | cut -d' ' -f4)) |
|
|
local lsectorsize=($(echo "${lfdisk}" | grep '^Sector' | cut -d' ' -f4)) |
|
|
|
|
|
|
|
|
local lfirstpartinfo="$(echo "${lfdisk}" | grep "^${lparts[0]}")" |
|
|
local idx_start=2 |
|
|
|
|
|
local idx_size=4 |
|
|
|
|
|
|
|
|
idx_start=2 |
|
|
local lfirstpartinfo="$(echo "${lfdisk}" | grep "^${lparts[0]}")" |
|
|
idx_size=4 |
|
|
|
|
|
|
|
|
|
|
|
if [[ $lcount -gt 1 ]]; then |
|
|
if [[ $lcount -gt 1 ]]; then |
|
|
local lsecondpartinfo="$(echo "${lfdisk}" | grep "^${lparts[1]}")" |
|
|
local lsecondpartinfo="$(echo "${lfdisk}" | grep "^${lparts[1]}")" |
|
|
local lsecondpartstart=($(echo "${lsecondpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_start})) |
|
|
eval $rvar_array[prootfs_start]="'$(echo "${lsecondpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_start})'" |
|
|
local lsecondpartsize=($(echo "${lsecondpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_size})) |
|
|
eval $rvar_array[prootfs_size]="'$(echo "${lsecondpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_size})'" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
if [[ $lcount -gt 2 ]]; then |
|
|
|
|
|
local lthirdpartinfo="$(echo "${lfdisk}" | grep "^${lparts[2]}")" |
|
|
|
|
|
eval $rvar_array[pswap_start]="'$(echo "${lthirdpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_start})'" |
|
|
|
|
|
eval $rvar_array[pswap_size]="'$(echo "${lthirdpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_size})'" |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
eval $rvar_bootflag="0" |
|
|
# Check is first partition is marked as bootable. |
|
|
if [[ "$lfirstpartinfo" =~ .*\*.* ]]; then |
|
|
if [[ "$lfirstpartinfo" =~ .*\*.* ]]; then |
|
|
eval $rvar_bootflag="1" |
|
|
|
|
|
((idx_start+=1)) |
|
|
((idx_start+=1)) |
|
|
((idx_size+=1)) |
|
|
((idx_size+=1)) |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
lfirstpartsize=($(echo "${lfirstpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_size})) |
|
|
eval $rvar_array[pboot_start]="'$(echo "${lfirstpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_start})'" |
|
|
lfirstpartstart=($(echo "${lfirstpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_start})) |
|
|
eval $rvar_array[pboot_size]="'$(echo "${lfirstpartinfo}" | tr -s ' ' | cut -d' ' -f${idx_size})'" |
|
|
|
|
|
|
|
|
eval $rvar_count="'$lcount'" |
|
|
eval $rvar_count="'$lcount'" |
|
|
eval $rvar_sectorsize="'$lsectorsize'" |
|
|
eval $rvar_sectorsize="'$lsectorsize'" |
|
|
eval $rvar_bootstart="'$lfirstpartstart'" |
|
|
|
|
|
eval $rvar_bootsize="'$lfirstpartsize'" |
|
|
return 0 |
|
|
eval $rvar_rootfsstart="'$lsecondpartstart'" |
|
|
|
|
|
eval $rvar_rootfssize="'$lsecondpartsize'" |
|
|
|
|
|
|
|
|
|
|
|
[[ $lcount -gt 2 ]] && \ |
|
|
|
|
|
{ log "Unsupported type of source image. Aborting."; return 1; } || \ |
|
|
|
|
|
{ return 0; } |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
# Takes the following argument |
|
|
# Takes the following argument |
|
|
@ -191,12 +191,12 @@ get_image_info() { |
|
|
# $2 - partition alignment |
|
|
# $2 - partition alignment |
|
|
# $3 - vfat storage offset |
|
|
# $3 - vfat storage offset |
|
|
|
|
|
|
|
|
set_boot_part_alignment() { |
|
|
set_mender_disk_alignment() { |
|
|
local rvar_partition_alignment=$2 |
|
|
local rvar_partition_alignment=$2 |
|
|
local rvar_vfat_storage_offset=$3 |
|
|
local rvar_vfat_storage_offset=$3 |
|
|
|
|
|
|
|
|
case "$1" in |
|
|
case "$1" in |
|
|
"beaglebone") |
|
|
"beaglebone" | "qemux86_64") |
|
|
local lvar_partition_alignment=${PART_ALIGN_8MB} |
|
|
local lvar_partition_alignment=${PART_ALIGN_8MB} |
|
|
local lvar_vfat_storage_offset=$lvar_partition_alignment |
|
|
local lvar_vfat_storage_offset=$lvar_partition_alignment |
|
|
;; |
|
|
;; |
|
|
@ -213,7 +213,7 @@ set_boot_part_alignment() { |
|
|
|
|
|
|
|
|
# Takes following arguments: |
|
|
# Takes following arguments: |
|
|
# |
|
|
# |
|
|
# $1 - raw disk image path |
|
|
# $1 - Mender disk image path |
|
|
# |
|
|
# |
|
|
# Calculates following values: |
|
|
# Calculates following values: |
|
|
# |
|
|
# |
|
|
@ -223,7 +223,7 @@ set_boot_part_alignment() { |
|
|
# $5 - rootfs A partition size (in sectors) |
|
|
# $5 - rootfs A partition size (in sectors) |
|
|
# $6 - rootfs B partition start offset (in sectors) |
|
|
# $6 - rootfs B partition start offset (in sectors) |
|
|
# $7 - rootfs B partition size (in sectors) |
|
|
# $7 - rootfs B partition size (in sectors) |
|
|
get_mender_disk_info() { |
|
|
get_mender_disk_sizes() { |
|
|
local limage=$1 |
|
|
local limage=$1 |
|
|
local rvar_count=$2 |
|
|
local rvar_count=$2 |
|
|
local rvar_sectorsize=$3 |
|
|
local rvar_sectorsize=$3 |
|
|
@ -232,13 +232,13 @@ get_mender_disk_info() { |
|
|
local rvar_rootfs_b_start=$6 |
|
|
local rvar_rootfs_b_start=$6 |
|
|
local rvar_rootfs_b_size=$7 |
|
|
local rvar_rootfs_b_size=$7 |
|
|
|
|
|
|
|
|
local lsubname=${limage:0:8} |
|
|
local lsubname=${limage:0:10} |
|
|
local lfdisk="$(fdisk -u -l ${limage})" |
|
|
local lfdisk="$(fdisk -u -l ${limage})" |
|
|
|
|
|
|
|
|
local lparts=($(echo "${lfdisk}" | grep "^${lsubname}" | cut -d' ' -f1)) |
|
|
local lparts=($(echo "${lfdisk}" | grep "^${lsubname}" | cut -d' ' -f1)) |
|
|
local lcount=${#lparts[@]} |
|
|
local lcount=${#lparts[@]} |
|
|
|
|
|
|
|
|
if [[ $lcount -ne 4 ]]; then |
|
|
if [[ $lcount -ne 4 ]] && [[ $lcount -ne 6 ]]; then |
|
|
log "Error: invalid Mender disk image. Aborting." |
|
|
log "Error: invalid Mender disk image. Aborting." |
|
|
return 1 |
|
|
return 1 |
|
|
else |
|
|
else |
|
|
@ -290,83 +290,91 @@ align_partition_size() { |
|
|
|
|
|
|
|
|
# Takes following arguments: |
|
|
# Takes following arguments: |
|
|
# |
|
|
# |
|
|
# $1 - raw_disk image |
|
|
# $1 - number of partition of the raw disk image |
|
|
# $2 - partition alignment |
|
|
# $2 - sector size of the raw disk image |
|
|
# $3 - vfat storage offset |
|
|
# $3 - mender image partition alignment |
|
|
|
|
|
# $4 - mender image's boot partition offset |
|
|
|
|
|
# $5 - data partition size (in MB) |
|
|
|
|
|
# $6 - array of partitions' sizes for raw image |
|
|
# |
|
|
# |
|
|
# Returns: |
|
|
# Returns: |
|
|
# |
|
|
# |
|
|
# $4 - boot partition start offset (in sectors) |
|
|
# $7 - array of partitions' sizes for Mender image |
|
|
# $5 - boot partition size (in sectors) |
|
|
# |
|
|
# $6 - root filesystem partition size (in sectors) |
|
|
set_mender_disk_sizes() { |
|
|
# $7 - sector size (in bytes) |
|
|
local count=$1 |
|
|
# $8 - number of detected partitions |
|
|
local sectorsize=$2 |
|
|
analyse_raw_disk_image() { |
|
|
local alignment=$3 |
|
|
local image=$1 |
|
|
local offset=$4 |
|
|
local alignment=$2 |
|
|
local datasize=$(( ($5 * 1024 * 1024) / $2 )) |
|
|
local offset=$3 |
|
|
local _raw_sizes=$(declare -p $6) |
|
|
local count= |
|
|
eval "declare -A raw_sizes="${_raw_sizes#*=} |
|
|
local sectorsize= |
|
|
shift 6 |
|
|
|
|
|
local rvar_array=($@) |
|
|
|
|
|
|
|
|
local bootstart= |
|
|
local bootstart= |
|
|
local bootsize= |
|
|
local bootsize= |
|
|
local rootfsstart= |
|
|
local rootfsstart= |
|
|
local rootfssize= |
|
|
local rootfssize= |
|
|
local bootflag= |
|
|
local bootflag= |
|
|
|
|
|
|
|
|
local rvar_bootstart=$4 |
|
|
|
|
|
local rvar_bootsize=$5 |
|
|
|
|
|
local rvar_rootfssize=$6 |
|
|
|
|
|
local rvar_sectorsize=$7 |
|
|
|
|
|
local rvar_partitions=$8 |
|
|
|
|
|
|
|
|
|
|
|
get_image_info $image count sectorsize bootstart bootsize rootfsstart \ |
|
|
|
|
|
rootfssize bootflag |
|
|
|
|
|
|
|
|
|
|
|
[[ $? -ne 0 ]] && \ |
|
|
|
|
|
{ log "Error: invalid/unsupported raw disk image. Aborting."; exit 1; } |
|
|
|
|
|
|
|
|
|
|
|
if [[ $count -eq 1 ]]; then |
|
|
if [[ $count -eq 1 ]]; then |
|
|
rootfssize=$bootsize |
|
|
|
|
|
# Default size of the boot partition: 16MiB. |
|
|
# Default size of the boot partition: 16MiB. |
|
|
bootsize=$(( (${alignment} * 2) / ${sectorsize} )) |
|
|
bootsize=$(( (${alignment} * 2) / ${sectorsize} )) |
|
|
|
|
|
# Root filesystem size is determined by the size of the single partition. |
|
|
|
|
|
rootfssize=${raw_sizes[pboot_size]} |
|
|
|
|
|
else |
|
|
|
|
|
bootsize=${raw_sizes[pboot_size]} |
|
|
|
|
|
rootfssize=${raw_sizes[prootfs_size]} |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
# Boot partition storage offset is defined from the top down. |
|
|
# Boot partition storage offset is defined from the top down. |
|
|
bootstart=$(( ${offset} / ${sectorsize} )) |
|
|
bootstart=$(( ${offset} / ${sectorsize} )) |
|
|
|
|
|
|
|
|
align_partition_size bootsize $sectorsize |
|
|
align_partition_size bootsize $sectorsize |
|
|
align_partition_size rootfssize $sectorsize |
|
|
align_partition_size rootfssize $sectorsize |
|
|
|
|
|
align_partition_size datasize $sectorsize |
|
|
eval $rvar_bootstart="'$bootstart'" |
|
|
|
|
|
eval $rvar_bootsize="'$bootsize'" |
|
|
eval $rvar_array[pboot_start]="'$bootstart'" |
|
|
eval $rvar_rootfssize="'$rootfssize'" |
|
|
eval $rvar_array[pboot_size]="'$bootsize'" |
|
|
eval $rvar_sectorsize="'$sectorsize'" |
|
|
eval $rvar_array[prootfs_size]="'$rootfssize'" |
|
|
eval $rvar_partitions="'$count'" |
|
|
eval $rvar_array[pdata_size]="'$datasize'" |
|
|
|
|
|
|
|
|
|
|
|
if [[ $count -eq 3 ]]; then |
|
|
|
|
|
# Add space for Swap partition. |
|
|
|
|
|
local swapsize=${raw_sizes[pswap_size]} |
|
|
|
|
|
align_partition_size swapsize $sectorsize |
|
|
|
|
|
eval $rvar_array[pswap_size]="'$swapsize'" |
|
|
|
|
|
fi |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
# Takes following arguments: |
|
|
# Takes following arguments: |
|
|
# |
|
|
# |
|
|
# $1 - boot partition start offset (in sectors) |
|
|
# $1 - sector size (in bytes) |
|
|
# $2 - boot partition size (in sectors) |
|
|
# $2 - partition alignment |
|
|
# $3 - root filesystem partition size (in sectors) |
|
|
# $3 - array of partitions' sizes for Mender image |
|
|
# $4 - data partition size (in MB) |
|
|
|
|
|
# $5 - sector size (in bytes) |
|
|
|
|
|
# |
|
|
# |
|
|
# Returns: |
|
|
# Returns: |
|
|
# |
|
|
# |
|
|
# $6 - aligned data partition size (in sectors) |
|
|
# $4 - final Mender disk image size (in bytes) |
|
|
# $7 - final .sdimg file size (in bytes) |
|
|
# |
|
|
calculate_mender_disk_size() { |
|
|
calculate_mender_disk_size() { |
|
|
local rvar_datasize=$6 |
|
|
local _mender_sizes=$(declare -p $3) |
|
|
local rvar_sdimgsize=$7 |
|
|
eval "declare -A mender_sizes="${_mender_sizes#*=} |
|
|
|
|
|
local rvar_sdimgsize=$4 |
|
|
local datasize=$(( ($4 * 1024 * 1024) / $5 )) |
|
|
|
|
|
|
|
|
local sdimgsize=$(( (${mender_sizes[pboot_start]} + ${mender_sizes[pboot_size]} + \ |
|
|
align_partition_size datasize $5 |
|
|
2 * ${mender_sizes[prootfs_size]} + \ |
|
|
|
|
|
${mender_sizes[pdata_size]}) * $1 )) |
|
|
local sdimgsize=$(( ($1 + $2 + 2 * ${3} + $datasize) * $5 )) |
|
|
|
|
|
|
|
|
if [ -v mender_sizes[pswap_size] ]; then |
|
|
|
|
|
log "\tSwap partition found." |
|
|
|
|
|
# Add size of the swap partition to the total size. |
|
|
|
|
|
sdimgsize=$(( $sdimgsize + (${mender_sizes[pswap_size]} * $1) )) |
|
|
|
|
|
# Add alignment used as swap partition offset. |
|
|
|
|
|
sdimgsize=$(( $sdimgsize + 2 * ${2} )) |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
eval $rvar_datasize="'$datasize'" |
|
|
|
|
|
eval $rvar_sdimgsize="'$sdimgsize'" |
|
|
eval $rvar_sdimgsize="'$sdimgsize'" |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -396,35 +404,55 @@ create_mender_disk() { |
|
|
|
|
|
|
|
|
# Takes following arguments: |
|
|
# Takes following arguments: |
|
|
# |
|
|
# |
|
|
# $1 - raw disk image path |
|
|
# $1 - Mender disk image path |
|
|
# $2 - raw disk image size |
|
|
# $2 - Mender disk image size |
|
|
# $3 - boot partition start offset |
|
|
# $3 - sector size in bytes |
|
|
# $4 - boot partition size |
|
|
# $4 - partition alignment |
|
|
# $5 - root filesystem partiotion size |
|
|
# $5 - array of partitions' sizes for Mender image |
|
|
# $6 - data partition size |
|
|
# |
|
|
# $7 - sector size |
|
|
# Returns: |
|
|
|
|
|
# |
|
|
|
|
|
# $6 - number of partitions of the Mender disk image |
|
|
|
|
|
# |
|
|
format_mender_disk() { |
|
|
format_mender_disk() { |
|
|
local lfile=$1 |
|
|
local lfile=$1 |
|
|
local lsize=$2 |
|
|
local lsize=$2 |
|
|
|
|
|
local sectorsize=$3 |
|
|
|
|
|
local alignment=$(($4 / ${sectorsize})) |
|
|
|
|
|
local rc=0 |
|
|
|
|
|
|
|
|
|
|
|
local _mender_sizes=$(declare -p $5) |
|
|
|
|
|
eval "declare -A mender_sizes="${_mender_sizes#*=} |
|
|
|
|
|
local rvar_counts=$6 |
|
|
|
|
|
|
|
|
|
|
|
cylinders=$(( ${lsize} / ${heads} / ${sectors} / ${sectorsize} )) |
|
|
|
|
|
|
|
|
|
|
|
pboot_start=${mender_sizes[pboot_start]} |
|
|
|
|
|
pboot_size=${mender_sizes[pboot_size]} |
|
|
|
|
|
pboot_end=$((${pboot_start} + ${pboot_size} - 1)) |
|
|
|
|
|
|
|
|
|
|
|
prootfs_size=${mender_sizes[prootfs_size]} |
|
|
|
|
|
|
|
|
|
|
|
prootfsa_start=$((${pboot_end} + 1)) |
|
|
|
|
|
prootfsa_end=$((${prootfsa_start} + ${prootfs_size} - 1)) |
|
|
|
|
|
|
|
|
|
|
|
prootfsb_start=$((${prootfsa_end} + 1)) |
|
|
|
|
|
prootfsb_end=$((${prootfsb_start} + ${prootfs_size} - 1)) |
|
|
|
|
|
|
|
|
|
|
|
pdata_start=$((${prootfsb_end} + 1)) |
|
|
|
|
|
pdata_size=${mender_sizes[pdata_size]} |
|
|
|
|
|
pdata_end=$((${pdata_start} + ${pdata_size} - 1)) |
|
|
|
|
|
|
|
|
|
|
|
if [ -v mender_sizes[pswap_size] ]; then |
|
|
|
|
|
local pextended_start=$((${prootfsb_end} + 1)) |
|
|
|
|
|
|
|
|
# if [ -z "$3" ]; then |
|
|
pdata_start=$(($pextended_start + ${alignment})) |
|
|
# echo "Error: no root filesystem size provided" |
|
|
pdata_end=$((${pdata_start} + ${pdata_size} - 1)) |
|
|
# exit 1 |
|
|
|
|
|
# fi |
|
|
local pswap_start=$((${pdata_end} + ${alignment} + 1)) |
|
|
|
|
|
local pswap_size=${mender_sizes[pswap_size]} |
|
|
# if [ -z "$2" ]; then |
|
|
local pswap_end=$((${pswap_start} + ${pswap_size} - 1)) |
|
|
# size=$(sudo blockdev --getsize64 ${sdimg_file}) |
|
|
fi |
|
|
# else |
|
|
|
|
|
# size=$2 |
|
|
|
|
|
# fi |
|
|
|
|
|
|
|
|
|
|
|
cylinders=$(( ${lsize} / ${heads} / ${sectors} / ${7} )) |
|
|
|
|
|
rootfs_size=$(( $5 - 1 )) |
|
|
|
|
|
pboot_offset=$(( ${4} - 1 )) |
|
|
|
|
|
primary_start=$(( ${3} + ${pboot_offset} + 1 )) |
|
|
|
|
|
secondary_start=$(( ${primary_start} + ${rootfs_size} + 1 )) |
|
|
|
|
|
data_start=$(( ${secondary_start} + ${rootfs_size} + 1 )) |
|
|
|
|
|
data_offset=$(( ${6} - 1 )) |
|
|
|
|
|
|
|
|
|
|
|
sed -e 's/\s*\([\+0-9a-zA-Z]*\).*/\1/' << EOF | sudo fdisk ${lfile} &> /dev/null |
|
|
sed -e 's/\s*\([\+0-9a-zA-Z]*\).*/\1/' << EOF | sudo fdisk ${lfile} &> /dev/null |
|
|
o # clear the in memory partition table |
|
|
o # clear the in memory partition table |
|
|
@ -436,56 +464,49 @@ format_mender_disk() { |
|
|
c |
|
|
c |
|
|
${cylinders} |
|
|
${cylinders} |
|
|
r |
|
|
r |
|
|
n # new partition |
|
|
|
|
|
p # primary partition |
|
|
|
|
|
1 # partition number 1 |
|
|
|
|
|
${3} # default - start at beginning of disk |
|
|
|
|
|
+${pboot_offset} # 16 MB boot parttion |
|
|
|
|
|
t |
|
|
|
|
|
c |
|
|
|
|
|
a |
|
|
|
|
|
n # new partition |
|
|
|
|
|
p # primary partition |
|
|
|
|
|
2 # partion number 2 |
|
|
|
|
|
${primary_start} # start immediately after preceding partition |
|
|
|
|
|
+${rootfs_size} |
|
|
|
|
|
n # new partition |
|
|
|
|
|
p # primary partition |
|
|
|
|
|
3 # partion number 3 |
|
|
|
|
|
${secondary_start} # start immediately after preceding partition |
|
|
|
|
|
+${rootfs_size} |
|
|
|
|
|
n # new partition |
|
|
|
|
|
p # primary partition |
|
|
|
|
|
${data_start} # start immediately after preceding partition |
|
|
|
|
|
+${data_offset} |
|
|
|
|
|
p # print the in-memory partition table |
|
|
|
|
|
w # write the partition table |
|
|
w # write the partition table |
|
|
q # and we're done |
|
|
q # and we're done |
|
|
EOF |
|
|
EOF |
|
|
log "\tChanges in partition table applied." |
|
|
|
|
|
|
|
|
# Create partition table |
|
|
|
|
|
sudo parted -s ${lfile} mklabel msdos || rc=$? |
|
|
|
|
|
sudo parted -s ${lfile} unit s mkpart primary fat32 ${pboot_start} ${pboot_end} || rc=$? |
|
|
|
|
|
sudo parted -s ${lfile} set 1 boot on || rc=$? |
|
|
|
|
|
sudo parted -s ${lfile} -- unit s mkpart primary ext4 ${prootfsa_start} ${prootfsa_end} || rc=$? |
|
|
|
|
|
sudo parted -s ${lfile} -- unit s mkpart primary ext4 ${prootfsb_start} ${prootfsb_end} || rc=$? |
|
|
|
|
|
|
|
|
|
|
|
if [ -v mender_sizes[pswap_size] ]; then |
|
|
|
|
|
log "\tAdding swap partition." |
|
|
|
|
|
sudo parted -s ${lfile} -- unit s mkpart extended ${pextended_start} 100% || rc=$? |
|
|
|
|
|
sudo parted -s ${lfile} -- unit s mkpart logical ext4 ${pdata_start} ${pdata_end} || rc=$? |
|
|
|
|
|
sudo parted -s ${lfile} -- unit s mkpart logical linux-swap ${pswap_start} ${pswap_end} || rc=$? |
|
|
|
|
|
eval $rvar_counts="'6'" |
|
|
|
|
|
else |
|
|
|
|
|
sudo parted -s ${lfile} -- unit s mkpart primary ext4 ${pdata_start} ${pdata_end} || rc=$? |
|
|
|
|
|
eval $rvar_counts="'4'" |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
[[ $rc -eq 0 ]] && { log "\tChanges in partition table applied."; } |
|
|
|
|
|
|
|
|
|
|
|
return $rc |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
# Takes following arguments: |
|
|
# Takes following arguments: |
|
|
# |
|
|
# |
|
|
# $1 - raw disk file |
|
|
# $1 - raw disk file |
|
|
# |
|
|
# |
|
|
# Returns: |
|
|
|
|
|
# |
|
|
|
|
|
# $2 - number of detected partitions |
|
|
|
|
|
verify_mender_disk() { |
|
|
verify_mender_disk() { |
|
|
local lfile=$1 |
|
|
local lfile=$1 |
|
|
local rvar_no_of_parts=$2 |
|
|
local lcounts=$2 |
|
|
|
|
|
|
|
|
local limage=$(basename $lfile) |
|
|
local limage=$(basename $lfile) |
|
|
local partitions=($(fdisk -l -u ${limage} | cut -d' ' -f1 | grep 'sdimg[1-9]\{1\}$')) |
|
|
local partitions=($(fdisk -l -u ${limage} | cut -d' ' -f1 | grep 'sdimg[1-9]\{1\}$')) |
|
|
|
|
|
|
|
|
local no_of_parts=${#partitions[@]} |
|
|
local no_of_parts=${#partitions[@]} |
|
|
|
|
|
|
|
|
[[ $no_of_parts -eq 4 ]] || \ |
|
|
[[ $no_of_parts -eq $lcounts ]] || \ |
|
|
{ log "Error: incorrect number of partitions: $no_of_parts. Aborting."; return 1; } |
|
|
{ log "Error: incorrect number of partitions: $no_of_parts. Aborting."; return 1; } |
|
|
|
|
|
|
|
|
eval $rvar_no_of_parts=="'$no_of_parts='" |
|
|
|
|
|
|
|
|
|
|
|
return 0 |
|
|
return 0 |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -535,23 +556,52 @@ detach_device_maps() { |
|
|
# Takes following arguments: |
|
|
# Takes following arguments: |
|
|
# |
|
|
# |
|
|
# $1 - partition mappings holder |
|
|
# $1 - partition mappings holder |
|
|
|
|
|
# |
|
|
make_mender_disk_filesystem() { |
|
|
make_mender_disk_filesystem() { |
|
|
local mappings=($@) |
|
|
local mappings=($@) |
|
|
|
|
|
local counts=${#mappings[@]} |
|
|
|
|
|
|
|
|
|
|
|
if [ $counts -eq 4 ]; then |
|
|
|
|
|
local labels=(${mender_partitions_regular[@]}) |
|
|
|
|
|
elif [ $counts -eq 6 ]; then |
|
|
|
|
|
local labels=(${mender_partitions_extended[@]}) |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
for mapping in ${mappings[@]} |
|
|
for mapping in ${mappings[@]} |
|
|
do |
|
|
do |
|
|
map_dev=/dev/mapper/"$mapping" |
|
|
map_dev=/dev/mapper/"$mapping" |
|
|
part_no=$(get_part_number_from_device $map_dev) |
|
|
part_no=$(get_part_number_from_device $map_dev) |
|
|
|
|
|
label=${labels[${part_no} - 1]} |
|
|
|
|
|
|
|
|
label=${mender_disk_partitions[${part_no} - 1]} |
|
|
case ${part_no} in |
|
|
|
|
|
1) |
|
|
if [[ part_no -eq 1 ]]; then |
|
|
log "\tCreating MS-DOS filesystem for '$label' partition." |
|
|
log "\tCreating MS-DOS filesystem for '$label' partition." |
|
|
sudo mkfs.vfat -n ${label} $map_dev >> "$build_log" 2>&1 |
|
|
sudo mkfs.vfat -n ${label} $map_dev >> "$build_log" 2>&1 |
|
|
;; |
|
|
else |
|
|
2|3) |
|
|
log "\tCreating ext4 filesystem for '$label' partition." |
|
|
log "\tCreating ext4 filesystem for '$label' partition." |
|
|
sudo mkfs.ext4 -L ${label} $map_dev >> "$build_log" 2>&1 |
|
|
sudo mkfs.ext4 -L ${label} $map_dev >> "$build_log" 2>&1 |
|
|
fi |
|
|
;; |
|
|
|
|
|
4) |
|
|
|
|
|
if [ $counts -eq 4 ]; then |
|
|
|
|
|
log "\tCreating ext4 filesystem for '$label' partition." |
|
|
|
|
|
sudo mkfs.ext4 -L ${label} $map_dev >> "$build_log" 2>&1 |
|
|
|
|
|
else |
|
|
|
|
|
continue |
|
|
|
|
|
fi |
|
|
|
|
|
;; |
|
|
|
|
|
5) |
|
|
|
|
|
log "\tCreating ext4 filesystem for '$label' partition." |
|
|
|
|
|
sudo mkfs.ext4 -L ${label} $map_dev >> "$build_log" 2>&1 |
|
|
|
|
|
;; |
|
|
|
|
|
6) |
|
|
|
|
|
log "\tCreating swap area for '$label' partition." |
|
|
|
|
|
sudo mkswap -L ${label} $map_dev >> "$build_log" 2>&1 |
|
|
|
|
|
;; |
|
|
|
|
|
*) |
|
|
|
|
|
break |
|
|
|
|
|
;; |
|
|
|
|
|
esac |
|
|
done |
|
|
done |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -582,13 +632,44 @@ mount_raw_disk() { |
|
|
# $1 - partition mappings holder |
|
|
# $1 - partition mappings holder |
|
|
mount_mender_disk() { |
|
|
mount_mender_disk() { |
|
|
local mappings=($@) |
|
|
local mappings=($@) |
|
|
|
|
|
local counts=${#mappings[@]} |
|
|
|
|
|
|
|
|
|
|
|
if [ $counts -eq 4 ]; then |
|
|
|
|
|
local labels=(${mender_partitions_regular[@]}) |
|
|
|
|
|
elif [ $counts -eq 6 ]; then |
|
|
|
|
|
local labels=(${mender_partitions_extended[@]}) |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
for mapping in ${mappings[@]} |
|
|
for mapping in ${mappings[@]} |
|
|
do |
|
|
do |
|
|
local part_no=${mapping#*p*p} |
|
|
local part_no=${mapping#*p*p} |
|
|
local path=$sdimg_base_dir/${mender_disk_partitions[${part_no} - 1]} |
|
|
local path=$sdimg_base_dir/${labels[${part_no} - 1]} |
|
|
mkdir -p $path |
|
|
mkdir -p $path |
|
|
sudo mount /dev/mapper/"${mapping}" $path 2>&1 >/dev/null |
|
|
|
|
|
|
|
|
case ${part_no} in |
|
|
|
|
|
1|2|3) |
|
|
|
|
|
sudo mount /dev/mapper/"${mapping}" $path 2>&1 >/dev/null |
|
|
|
|
|
;; |
|
|
|
|
|
4) |
|
|
|
|
|
if [ $counts -eq 4 ]; then |
|
|
|
|
|
sudo mount /dev/mapper/"${mapping}" $path 2>&1 >/dev/null |
|
|
|
|
|
else |
|
|
|
|
|
# Skip extended partition. |
|
|
|
|
|
continue |
|
|
|
|
|
fi |
|
|
|
|
|
;; |
|
|
|
|
|
5) |
|
|
|
|
|
sudo mount /dev/mapper/"${mapping}" $path 2>&1 >/dev/null |
|
|
|
|
|
;; |
|
|
|
|
|
6) |
|
|
|
|
|
# Skip swap partition. |
|
|
|
|
|
continue |
|
|
|
|
|
;; |
|
|
|
|
|
*) |
|
|
|
|
|
break |
|
|
|
|
|
;; |
|
|
|
|
|
esac |
|
|
|
|
|
|
|
|
done |
|
|
done |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -597,6 +678,8 @@ mount_mender_disk() { |
|
|
# $1 - device type |
|
|
# $1 - device type |
|
|
set_fstab() { |
|
|
set_fstab() { |
|
|
local mountpoint= |
|
|
local mountpoint= |
|
|
|
|
|
local blk_device= |
|
|
|
|
|
local data_id=4 |
|
|
local device_type=$1 |
|
|
local device_type=$1 |
|
|
local sysconfdir="$sdimg_primary_dir/etc" |
|
|
local sysconfdir="$sdimg_primary_dir/etc" |
|
|
|
|
|
|
|
|
@ -608,9 +691,16 @@ set_fstab() { |
|
|
case "$device_type" in |
|
|
case "$device_type" in |
|
|
"beaglebone") |
|
|
"beaglebone") |
|
|
mountpoint="/boot/efi" |
|
|
mountpoint="/boot/efi" |
|
|
|
|
|
blk_device=mmcblk0p |
|
|
;; |
|
|
;; |
|
|
"raspberrypi3") |
|
|
"raspberrypi3") |
|
|
mountpoint="/uboot" |
|
|
mountpoint="/uboot" |
|
|
|
|
|
blk_device=mmcblk0p |
|
|
|
|
|
;; |
|
|
|
|
|
"qemux86_64") |
|
|
|
|
|
mountpoint="/boot/efi" |
|
|
|
|
|
blk_device=hda |
|
|
|
|
|
data_id=5 |
|
|
;; |
|
|
;; |
|
|
esac |
|
|
esac |
|
|
|
|
|
|
|
|
@ -628,10 +718,15 @@ set_fstab() { |
|
|
#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 |
|
|
#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 |
|
|
|
|
|
|
|
|
# Where the U-Boot environment resides; for devices with SD card support ONLY! |
|
|
# Where the U-Boot environment resides; for devices with SD card support ONLY! |
|
|
/dev/mmcblk0p1 $mountpoint auto defaults,sync 0 0 |
|
|
/dev/${blk_device}1 $mountpoint auto defaults,sync 0 0 |
|
|
/dev/mmcblk0p4 /data auto defaults 0 0 |
|
|
/dev/${blk_device}${data_id} /data auto defaults 0 0 |
|
|
EOF" |
|
|
EOF" |
|
|
|
|
|
|
|
|
|
|
|
if [ "$device_type" == "qemux86_64" ]; then |
|
|
|
|
|
# Add entry referring to swap partition. |
|
|
|
|
|
sudo tee -a ${sysconfdir}/fstab <<< "/dev/hda6 swap swap defaults 0 0" 2>&1 >/dev/null |
|
|
|
|
|
fi |
|
|
|
|
|
|
|
|
log "\tDone." |
|
|
log "\tDone." |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -653,21 +748,20 @@ extract_file_from_image() { |
|
|
# |
|
|
# |
|
|
# $1 - device type |
|
|
# $1 - device type |
|
|
# $2 - partition alignment in bytes |
|
|
# $2 - partition alignment in bytes |
|
|
# $3 - boot partition storage offset in bytes |
|
|
# $3 - total size in bytes |
|
|
# $4 - boot partition size in sectors |
|
|
# $4 - sector size in bytes |
|
|
# $5 - rootfs partition size in sectors |
|
|
# $5 - array of partitions' sizes for Mender image |
|
|
# $6 - data partition size in sectors |
|
|
# |
|
|
# $7 - complete image size in bytes |
|
|
|
|
|
# $8 - sector size in bytes |
|
|
|
|
|
|
|
|
|
|
|
create_test_config_file() { |
|
|
create_test_config_file() { |
|
|
local device_type=$1 |
|
|
local device_type=$1 |
|
|
local alignment=$2 |
|
|
local alignment=$2 |
|
|
local boot_offset=$3 |
|
|
local mender_image_size_mb=$(( (($3 / 1024) / 1024) )) |
|
|
local boot_size_mb=$(( ((($4 * $8) / 1024) / 1024) )) |
|
|
local _mender_sizes=$(declare -p $5) |
|
|
local rootfs_size_mb=$(( ((($5 * $8) / 1024) / 1024) )) |
|
|
eval "declare -A mender_sizes="${_mender_sizes#*=} |
|
|
local data_size_mb=$(( ((($6 * $8) / 1024) / 1024) )) |
|
|
local boot_offset=$(( (${mender_sizes[pboot_start]} * $4) )) |
|
|
local mender_image_size_mb=$(( (($7 / 1024) / 1024) )) |
|
|
local boot_size_mb=$(( (((${mender_sizes[pboot_size]} * $4) / 1024) / 1024) )) |
|
|
|
|
|
local rootfs_size_mb=$(( (((${mender_sizes[prootfs_size]} * $4) / 1024) / 1024) )) |
|
|
|
|
|
local data_size_mb=$(( (((${mender_sizes[pdata_size]} * $4) / 1024) / 1024) )) |
|
|
|
|
|
|
|
|
cp ${files_dir}/variables.template ${output_dir}/${device_type}_variables.cfg |
|
|
cp ${files_dir}/variables.template ${output_dir}/${device_type}_variables.cfg |
|
|
|
|
|
|
|
|
|
Adam Podogrocki
6 years ago
GitHub