rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-08-06 10:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ignore checks and fix some

Browse Source 
Signed-off-by: Mauro Morales <mauro.morales@spectrocloud.com>
This commit is contained in:
Mauro Morales 2023-07-18 15:31:34 +02:00
parent 9f933175ef
commit 1b345623bc
No known key found for this signature in database
GPG Key ID: 0069994DD7392198
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.shellcheckrc
View File

@ -1 +1,3 @@
disable=SC2086 disable=SC2086
disable=SC2034
disable=SC2046

10
tools-image/build-arm-image.sh
View File

@ -131,7 +131,7 @@ get_url()
esac esac
} }
trap "cleanup" 1 2 3 6 9 14 15 EXIT trap "cleanup" 1 2 3 6 14 15 EXIT
load_vars load_vars
@ -223,6 +223,7 @@ else
fi fi
if [ -n "$cos_config" ] && [ -e "$cos_config" ]; then if [ -n "$cos_config" ] && [ -e "$cos_config" ]; then
# shellcheck source=/dev/null
source "$cos_config" source "$cos_config"
fi fi
@ -283,7 +284,7 @@ ensure_dir_structure $TARGET
# Download the container image # Download the container image
if [ -z "$directory" ]; then if [ -z "$directory" ]; then
echo ">>> Downloading container image" echo ">>> Downloading container image"
elemental pull-image $( (( $local_build == 'true')) && printf %s '--local' ) $container_image $TARGET elemental pull-image $( (( local_build == 'true')) && printf %s '--local' ) $container_image $TARGET
else else
echo ">>> Copying files from $directory" echo ">>> Copying files from $directory"
rsync -axq --exclude='host' --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' ${directory}/ $TARGET rsync -axq --exclude='host' --exclude='mnt' --exclude='proc' --exclude='sys' --exclude='dev' --exclude='tmp' ${directory}/ $TARGET
@ -354,7 +355,7 @@ sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image}
if [ "$disable_lvm" == 'true' ]; then if [ "$disable_lvm" == 'true' ]; then
sgdisk -n 3:0:+${recovery_size}M -c 3:recovery -t 3:8300 ${output_image} sgdisk -n 3:0:+${recovery_size}M -c 3:recovery -t 3:8300 ${output_image}
else else
sgdisk -n 3:0:+$(( ${recovery_size} + ${oem_size} ))M -c 3:lvm -t 3:8e00 ${output_image} sgdisk -n 3:0:+$(( recovery_size + oem_size ))M -c 3:lvm -t 3:8e00 ${output_image}
fi fi
sgdisk -n 4:0:+64M -c 4:persistent -t 4:8300 ${output_image} sgdisk -n 4:0:+64M -c 4:persistent -t 4:8300 ${output_image}
@ -366,7 +367,8 @@ fi
# Prepare the image and copy over the files # Prepare the image and copy over the files
export DRIVE=$(losetup -f "${output_image}" --show) export DRIVE
DRIVE=$(losetup -f "${output_image}" --show)
if [ -z "${DRIVE}" ]; then if [ -z "${DRIVE}" ]; then
echo "Cannot execute losetup for $output_image" echo "Cannot execute losetup for $output_image"
exit 1 exit 1