shellcheck
This commit is contained in:
Serge Schneider
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash -e
|
||||
|
||||
if [ ! -x ${ROOTFS_DIR}/usr/bin/qemu-arm-static ]; then
|
||||
cp /usr/bin/qemu-arm-static ${ROOTFS_DIR}/usr/bin/
|
||||
if [ ! -x "${ROOTFS_DIR}/usr/bin/qemu-arm-static" ]; then
|
||||
cp /usr/bin/qemu-arm-static "${ROOTFS_DIR}/usr/bin/"
|
||||
fi
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/bin/bash -e
|
||||
|
||||
install -m 644 files/resolv.conf ${ROOTFS_DIR}/etc/
|
||||
install -m 644 files/resolv.conf "${ROOTFS_DIR}/etc/"
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
|
||||
|
||||
IMGID="$(dd if=${IMG_FILE} skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
|
||||
IMGID="$(dd if="${IMG_FILE}" skip=440 bs=1 count=4 2>/dev/null | xxd -e | cut -f 2 -d' ')"
|
||||
|
||||
BOOT_PARTUUID="${IMGID}-01"
|
||||
ROOT_PARTUUID="${IMGID}-02"
|
||||
|
||||
sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" ${ROOTFS_DIR}/etc/fstab
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" ${ROOTFS_DIR}/etc/fstab
|
||||
sed -i "s/BOOTDEV/PARTUUID=${BOOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/etc/fstab"
|
||||
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" ${ROOTFS_DIR}/boot/cmdline.txt
|
||||
sed -i "s/ROOTDEV/PARTUUID=${ROOT_PARTUUID}/" "${ROOTFS_DIR}/boot/cmdline.txt"
|
||||
|
||||
@@ -8,74 +8,75 @@ on_chroot << EOF
|
||||
hardlink -t /usr/share/doc
|
||||
EOF
|
||||
|
||||
if [ -d ${ROOTFS_DIR}/home/pi/.config ]; then
|
||||
chmod 700 ${ROOTFS_DIR}/home/pi/.config
|
||||
if [ -d "${ROOTFS_DIR}/home/pi/.config" ]; then
|
||||
chmod 700 "${ROOTFS_DIR}/home/pi/.config"
|
||||
fi
|
||||
|
||||
rm -f ${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache
|
||||
rm -f ${ROOTFS_DIR}/usr/bin/qemu-arm-static
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/apt.conf.d/51cache"
|
||||
rm -f "${ROOTFS_DIR}/usr/bin/qemu-arm-static"
|
||||
|
||||
rm -f ${ROOTFS_DIR}/etc/apt/sources.list~
|
||||
rm -f ${ROOTFS_DIR}/etc/apt/trusted.gpg~
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/sources.list~"
|
||||
rm -f "${ROOTFS_DIR}/etc/apt/trusted.gpg~"
|
||||
|
||||
rm -f ${ROOTFS_DIR}/etc/passwd-
|
||||
rm -f ${ROOTFS_DIR}/etc/group-
|
||||
rm -f ${ROOTFS_DIR}/etc/shadow-
|
||||
rm -f ${ROOTFS_DIR}/etc/gshadow-
|
||||
rm -f "${ROOTFS_DIR}/etc/passwd-"
|
||||
rm -f "${ROOTFS_DIR}/etc/group-"
|
||||
rm -f "${ROOTFS_DIR}/etc/shadow-"
|
||||
rm -f "${ROOTFS_DIR}/etc/gshadow-"
|
||||
|
||||
rm -f ${ROOTFS_DIR}/var/cache/debconf/*-old
|
||||
rm -f ${ROOTFS_DIR}/var/lib/dpkg/*-old
|
||||
rm -f "${ROOTFS_DIR}/var/cache/debconf/*-old"
|
||||
rm -f "${ROOTFS_DIR}/var/lib/dpkg/*-old"
|
||||
|
||||
rm -f ${ROOTFS_DIR}/usr/share/icons/*/icon-theme.cache
|
||||
rm -f "${ROOTFS_DIR}/usr/share/icons/*/icon-theme.cache"
|
||||
|
||||
rm -f ${ROOTFS_DIR}/var/lib/dbus/machine-id
|
||||
rm -f "${ROOTFS_DIR}/var/lib/dbus/machine-id"
|
||||
|
||||
true > ${ROOTFS_DIR}/etc/machine-id
|
||||
true > "${ROOTFS_DIR}/etc/machine-id"
|
||||
|
||||
ln -nsf /proc/mounts ${ROOTFS_DIR}/etc/mtab
|
||||
ln -nsf /proc/mounts "${ROOTFS_DIR}/etc/mtab"
|
||||
|
||||
for _FILE in $(find ${ROOTFS_DIR}/var/log/ -type f); do
|
||||
true > ${_FILE}
|
||||
done
|
||||
find "${ROOTFS_DIR}/var/log/" -type f -exec cp /dev/null {} \;
|
||||
|
||||
rm -f "${ROOTFS_DIR}/root/.vnc/private.key"
|
||||
rm -f "${ROOTFS_DIR}/etc/vnc/updateid"
|
||||
|
||||
update_issue $(basename ${EXPORT_DIR})
|
||||
install -m 644 ${ROOTFS_DIR}/etc/rpi-issue ${ROOTFS_DIR}/boot/issue.txt
|
||||
install files/LICENSE.oracle ${ROOTFS_DIR}/boot/
|
||||
update_issue "$(basename "${EXPORT_DIR}")"
|
||||
install -m 644 "${ROOTFS_DIR}/etc/rpi-issue" "${ROOTFS_DIR}/boot/issue.txt"
|
||||
install files/LICENSE.oracle "${ROOTFS_DIR}/boot/"
|
||||
|
||||
|
||||
cp "$ROOTFS_DIR/etc/rpi-issue" "$INFO_FILE"
|
||||
|
||||
firmware=$(zgrep "firmware as of" "$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
|
||||
head -n1 | \
|
||||
sed -n 's|.* \([^ ]*\)$|\1|p')
|
||||
|
||||
printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware" >> "$INFO_FILE"
|
||||
{
|
||||
firmware=$(zgrep "firmware as of" \
|
||||
"$ROOTFS_DIR/usr/share/doc/raspberrypi-kernel/changelog.Debian.gz" | \
|
||||
head -n1 | sed -n 's|.* \([^ ]*\)$|\1|p')
|
||||
printf "\nFirmware: https://github.com/raspberrypi/firmware/tree/%s\n" "$firmware"
|
||||
|
||||
kernel=$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")
|
||||
printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel" >> "$INFO_FILE"
|
||||
kernel="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/git_hash")"
|
||||
printf "Kernel: https://github.com/raspberrypi/linux/tree/%s\n" "$kernel"
|
||||
|
||||
uname=$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")
|
||||
printf "Uname string: %s\n" "$uname" >> "$INFO_FILE"
|
||||
uname="$(curl -s -L "https://github.com/raspberrypi/firmware/raw/$firmware/extra/uname_string7")"
|
||||
|
||||
printf "\nPackages:\n">> "$INFO_FILE"
|
||||
dpkg -l --root "$ROOTFS_DIR" >> "$INFO_FILE"
|
||||
printf "Uname string: %s\n" "$uname"
|
||||
printf "\nPackages:\n"
|
||||
dpkg -l --root "$ROOTFS_DIR"
|
||||
} >> "$INFO_FILE"
|
||||
|
||||
ROOT_DEV=$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')
|
||||
ROOT_DEV="$(mount | grep "${ROOTFS_DIR} " | cut -f1 -d' ')"
|
||||
|
||||
unmount ${ROOTFS_DIR}
|
||||
zerofree -v ${ROOT_DEV}
|
||||
unmount "${ROOTFS_DIR}"
|
||||
zerofree -v "${ROOT_DEV}"
|
||||
|
||||
unmount_image ${IMG_FILE}
|
||||
unmount_image "${IMG_FILE}"
|
||||
|
||||
mkdir -p ${DEPLOY_DIR}
|
||||
mkdir -p "${DEPLOY_DIR}"
|
||||
|
||||
rm -f ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip
|
||||
rm -f "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip"
|
||||
|
||||
pushd ${STAGE_WORK_DIR} > /dev/null
|
||||
zip ${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip $(basename ${IMG_FILE})
|
||||
pushd "${STAGE_WORK_DIR}" > /dev/null
|
||||
zip "${DEPLOY_DIR}/image_${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.zip" \
|
||||
"$(basename "${IMG_FILE}")"
|
||||
popd > /dev/null
|
||||
|
||||
cp "$INFO_FILE" "$DEPLOY_DIR"
|
||||
|
||||
@@ -2,22 +2,22 @@
|
||||
|
||||
IMG_FILE="${STAGE_WORK_DIR}/${IMG_DATE}-${IMG_NAME}${IMG_SUFFIX}.img"
|
||||
|
||||
unmount_image ${IMG_FILE}
|
||||
unmount_image "${IMG_FILE}"
|
||||
|
||||
rm -f ${IMG_FILE}
|
||||
rm -f "${IMG_FILE}"
|
||||
|
||||
rm -rf ${ROOTFS_DIR}
|
||||
mkdir -p ${ROOTFS_DIR}
|
||||
rm -rf "${ROOTFS_DIR}"
|
||||
mkdir -p "${ROOTFS_DIR}"
|
||||
|
||||
BOOT_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR}/boot --block-size=1 | cut -f 1)
|
||||
TOTAL_SIZE=$(du --apparent-size -s ${EXPORT_ROOTFS_DIR} --exclude var/cache/apt/archives --block-size=1 | cut -f 1)
|
||||
BOOT_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}/boot" --block-size=1 | cut -f 1)
|
||||
TOTAL_SIZE=$(du --apparent-size -s "${EXPORT_ROOTFS_DIR}" --exclude var/cache/apt/archives --block-size=1 | cut -f 1)
|
||||
|
||||
ROUND_SIZE="$((4 * 1024 * 1024))"
|
||||
ROUNDED_ROOT_SECTOR=$(((2 * BOOT_SIZE + ROUND_SIZE) / ROUND_SIZE * ROUND_SIZE / 512 + 8192))
|
||||
IMG_SIZE=$(((BOOT_SIZE + TOTAL_SIZE + (800 * 1024 * 1024) + ROUND_SIZE - 1) / ROUND_SIZE * ROUND_SIZE))
|
||||
|
||||
truncate -s ${IMG_SIZE} ${IMG_FILE}
|
||||
fdisk -H 255 -S 63 ${IMG_FILE} <<EOF
|
||||
truncate -s "${IMG_SIZE}" "${IMG_FILE}"
|
||||
fdisk -H 255 -S 63 "${IMG_FILE}" <<EOF
|
||||
o
|
||||
n
|
||||
|
||||
@@ -37,7 +37,7 @@ p
|
||||
w
|
||||
EOF
|
||||
|
||||
PARTED_OUT=$(parted -s ${IMG_FILE} unit b print)
|
||||
PARTED_OUT=$(parted -s "${IMG_FILE}" unit b print)
|
||||
BOOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \
|
||||
| cut -d" " -f 2 | tr -d B)
|
||||
BOOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 1'| xargs echo -n \
|
||||
@@ -48,8 +48,8 @@ ROOT_OFFSET=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \
|
||||
ROOT_LENGTH=$(echo "$PARTED_OUT" | grep -e '^ 2'| xargs echo -n \
|
||||
| cut -d" " -f 4 | tr -d B)
|
||||
|
||||
BOOT_DEV=$(losetup --show -f -o ${BOOT_OFFSET} --sizelimit ${BOOT_LENGTH} ${IMG_FILE})
|
||||
ROOT_DEV=$(losetup --show -f -o ${ROOT_OFFSET} --sizelimit ${ROOT_LENGTH} ${IMG_FILE})
|
||||
BOOT_DEV=$(losetup --show -f -o "${BOOT_OFFSET}" --sizelimit "${BOOT_LENGTH}" "${IMG_FILE}")
|
||||
ROOT_DEV=$(losetup --show -f -o "${ROOT_OFFSET}" --sizelimit "${ROOT_LENGTH}" "${IMG_FILE}")
|
||||
echo "/boot: offset $BOOT_OFFSET, length $BOOT_LENGTH"
|
||||
echo "/: offset $ROOT_OFFSET, length $ROOT_LENGTH"
|
||||
|
||||
@@ -59,11 +59,11 @@ for FEATURE in metadata_csum 64bit; do
|
||||
ROOT_FEATURES="^$FEATURE,$ROOT_FEATURES"
|
||||
fi
|
||||
done
|
||||
mkdosfs -n boot -F 32 -v $BOOT_DEV > /dev/null
|
||||
mkfs.ext4 -L rootfs -O $ROOT_FEATURES $ROOT_DEV > /dev/null
|
||||
mkdosfs -n boot -F 32 -v "$BOOT_DEV" > /dev/null
|
||||
mkfs.ext4 -L rootfs -O "$ROOT_FEATURES" "$ROOT_DEV" > /dev/null
|
||||
|
||||
mount -v $ROOT_DEV ${ROOTFS_DIR} -t ext4
|
||||
mkdir -p ${ROOTFS_DIR}/boot
|
||||
mount -v $BOOT_DEV ${ROOTFS_DIR}/boot -t vfat
|
||||
mount -v "$ROOT_DEV" "${ROOTFS_DIR}" -t ext4
|
||||
mkdir -p "${ROOTFS_DIR}/boot"
|
||||
mount -v "$BOOT_DEV" "${ROOTFS_DIR}/boot" -t vfat
|
||||
|
||||
rsync -aHAXx --exclude var/cache/apt/archives ${EXPORT_ROOTFS_DIR}/ ${ROOTFS_DIR}/
|
||||
rsync -aHAXx --exclude var/cache/apt/archives "${EXPORT_ROOTFS_DIR}/" "${ROOTFS_DIR}/"
|
||||
|
||||
Reference in New Issue
Block a user