codedude/RockyRpi
1
0
Fork 0
forked from sig_altarch/RockyRpi
Code Pull Requests Activity

Merge branch 'shellcheck' into 'main'

Browse Source 
Ran through ShellCheck.

See merge request skip/RockyRpi!2
This commit is contained in:
Skip Grube 2021-07-08 20:17:34 +00:00
commit eb0c36e9e8
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Rocky8_Rpi4_mkimage.sh
View File

@ -18,12 +18,12 @@ if [[ -z "$OUTDIR" ]]; then
exit 1 exit 1
fi fi
mkdir -p ${OUTDIR} mkdir -p "${OUTDIR}"
# Actually create the image. Our kickstart data should be in the same git repo as this script: # Actually create the image. Our kickstart data should be in the same git repo as this script:
# (This takes a while, especially building on an rpi. Patience!) # (This takes a while, especially building on an rpi. Patience!)
appliance-creator -v -c ./Rocky8_Rpi4.ks -n RockyRpi --version=20210626 --release=1 --vmem=2048 --vcpu=2 --no-compress -o ${OUTDIR} appliance-creator -v -c ./Rocky8_Rpi4.ks -n RockyRpi --version=20210626 --release=1 --vmem=2048 --vcpu=2 --no-compress -o "${OUTDIR}"
@ -33,17 +33,18 @@ appliance-creator -v -c ./Rocky8_Rpi4.ks -n RockyRpi --version=20210626 --relea
mkdir -p /mnt/tmp mkdir -p /mnt/tmp
# find the image we just made, and make it available on /dev/maper/loop* devices: # find the image we just made, and make it available on /dev/maper/loop* devices:
image=`find ${OUTDIR} -iname *.raw | head -1` image=$(find "${OUTDIR}" -iname '*.raw' | head -1)
echo "Getting UUID and inserting to boot from ${image} ...." echo "Getting UUID and inserting to boot from ${image} ...."
kpartx -av ${image} kpartx -av "${image}"
# Get the UUID of our root partition (the ext4 one) (UUID=e3984938429 , strip out quotes(")) # Get the loop partition; it might be loop0p3, loop1p3, ...
partuuid=`blkid | grep "mapper/loop0p3" | head -1 | awk '{print $NF}' | tr -d '"' | tr '[:lower:]' '[:upper:]'` looppart=$(kpartx -l "${image}" | awk '/p3/{print $1}')
# Get the UUID of our root partition (the ext4 one) (UUID=e3984938429 , strip out quotes("), and force upper case)
partuuid=$(blkid | grep "mapper/${looppart}" | head -1 | awk '{gsub(/\"/,"", $NF); print toupper($0)}')
# Mount the /boot partition: # Mount the /boot partition (swap the 3rd partition for the first):
mkdir -p /mnt/tmp
umount /mnt/tmp umount /mnt/tmp
mount /dev/mapper/loop0p1 /mnt/tmp mount /dev/mapper/${looppart/3/1} /mnt/tmp
# Swap out the "root=" part of cmdline.txt for our "root=UUID=blah" # Swap out the "root=" part of cmdline.txt for our "root=UUID=blah"
sed -i "s/root= /root=${partuuid} /" /mnt/tmp/cmdline.txt sed -i "s/root= /root=${partuuid} /" /mnt/tmp/cmdline.txt
@ -54,5 +55,4 @@ cat /mnt/tmp/cmdline.txt
# Finished, unmount and clean loopbacks: # Finished, unmount and clean loopbacks:
umount /mnt/tmp umount /mnt/tmp
kpartx -d ${image} kpartx -d "${image}"