rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-14 22:20:35 +00:00
Code Issues Releases Wiki Activity

Better to find the loop device when building the RPi image

Browse Source
This commit is contained in:
niusmallnan
2019-04-28 11:21:42 +08:00
parent 3f01e7104c
commit 19cf9b28bc
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/images/raspberry-pi-hypriot64/scripts/build.sh
View File

@@ -30,22 +30,25 @@ ls -al build/run.img
# partition #1 - Type= c W95 FAT32 (LBA) # partition #1 - Type= c W95 FAT32 (LBA)
losetup losetup
losetup -f PART1_DEVICE=$(losetup -f)
losetup -d /dev/loop0 || /bin/true losetup -d ${PART1_DEVICE} || /bin/true
losetup --offset $BOOT_PARTITION_OFFSET --sizelimit $BOOT_PARTITION_BYTES /dev/loop0 build/run.img losetup --offset $BOOT_PARTITION_OFFSET --sizelimit $BOOT_PARTITION_BYTES ${PART1_DEVICE} build/run.img
mkfs.vfat -n RancherOS /dev/loop0 mkfs.vfat -n RancherOS ${PART1_DEVICE}
losetup -d /dev/loop0 losetup -d ${PART1_DEVICE}
# partition #2 - Type=83 Linux # partition #2 - Type=83 Linux
losetup -d /dev/loop1 || /bin/true PART2_DEVICE=$(losetup -f)
losetup --offset $ROOT_PARTITION_OFFSET /dev/loop1 build/run.img losetup -d ${PART2_DEVICE} || /bin/true
mkfs.ext4 -O ^has_journal -b 4096 -L rootfs /dev/loop1 losetup --offset $ROOT_PARTITION_OFFSET ${PART2_DEVICE} build/run.img
losetup -d /dev/loop1 mkfs.ext4 -O ^has_journal -b 4096 -L rootfs ${PART2_DEVICE}
losetup -d ${PART2_DEVICE}
# mount partitions as loopback devices # mount partitions as loopback devices
mount -t ext4 -o loop=/dev/loop1,offset=$ROOT_PARTITION_OFFSET build/run.img build/root mount -t ext4 -o loop=${PART2_DEVICE},offset=$ROOT_PARTITION_OFFSET build/run.img build/root
rm -rf build/root/lost+found
mkdir -p build/root/boot mkdir -p build/root/boot
mount -t vfat -o loop=/dev/loop0,offset=$BOOT_PARTITION_OFFSET build/run.img build/root/boot mount -t vfat -o loop=${PART1_DEVICE},offset=$BOOT_PARTITION_OFFSET build/run.img build/root/boot
rm -rf build/root/boot/lost+found
echo "RancherOS: boot partition" > build/root/boot/boot.txt echo "RancherOS: boot partition" > build/root/boot/boot.txt
echo "RancherOS: root partition" > build/root/root.txt echo "RancherOS: root partition" > build/root/root.txt
@@ -65,11 +68,12 @@ echo "enable_uart=1" > build/root/boot/config.txt
## wireless support ## wireless support
mkdir -p build/root/lib/firmware/brcm mkdir -p build/root/lib/firmware/brcm
pushd build/root/lib/firmware/brcm pushd build/root/lib/firmware/brcm
curl -sL -o brcmfmac43430-sdio.txt https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm/brcmfmac43430-sdio.txt BRCM_URL_BASE=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm
curl -sL -o brcmfmac43430-sdio.bin https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm/brcmfmac43430-sdio.bin curl -sL -o brcmfmac43430-sdio.txt ${BRCM_URL_BASE}/brcmfmac43430-sdio.txt
curl -sL -o brcmfmac43455-sdio.bin https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm/brcmfmac43455-sdio.bin curl -sL -o brcmfmac43430-sdio.bin ${BRCM_URL_BASE}/brcmfmac43430-sdio.bin
curl -sL -o brcmfmac43455-sdio.clm_blob https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm/brcmfmac43455-sdio.clm_blob curl -sL -o brcmfmac43455-sdio.bin ${BRCM_URL_BASE}/brcmfmac43455-sdio.bin
curl -sL -o brcmfmac43455-sdio.txt https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm/brcmfmac43455-sdio.txt curl -sL -o brcmfmac43455-sdio.clm_blob ${BRCM_URL_BASE}/brcmfmac43455-sdio.clm_blob
curl -sL -o brcmfmac43455-sdio.txt ${BRCM_URL_BASE}/brcmfmac43455-sdio.txt
popd popd
# TODO: we need to remove these lines # TODO: we need to remove these lines
@@ -79,7 +83,7 @@ sed -i 's/io.docker.compose.rebuild: always/io.docker.compose.rebuild\: "false"/
popd popd
# show details # show details
tree -a -L 3 build/root tree -a -L 4 build/root
df -h df -h
# unmount partitions (loopback devices will be removed automatically) # unmount partitions (loopback devices will be removed automatically)