Merge pull request #24 from Yarboa/precommit-fix

shellcheck corrections
containers · Dec 7, 2023 · 67f2ca8 · 67f2ca8
2 parents 8c577cc + e2b7af6
commit 67f2ca8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/bin/initoverlayfs-install b/bin/initoverlayfs-install
@@ -149,6 +149,7 @@ if ! [ -e "$INITOVERLAYFS_CONF" ] || ! grep -q '[^[:space:]]' "$INITOVERLAYFS_CO
          "udev_trigger_generic udevadm trigger --type=devices --action=add" > $INITOVERLAYFS_CONF
 
   erofs_compression_supported="true"
+  # shellcheck disable=SC2034
   . /etc/os-release
   for i in $ID_LIKE; do
     if [ "$i" == "rhel" ]; then

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -28,7 +28,7 @@ fs="erofs"
 extract_initrd_into_initoverlayfs() {
   sudo mkdir -p "$DIR_TO_DUMP_INITRAMFS"
 
-  file_type=$(file /boot/initramfs-$release.img)
+  file_type=$(file /boot/initramfs-"$release".img)
   decompressor="lz4cat"
   decompressor_dracut="--lz4"
   if [[ "$file_type" == *"ASCII cpio archive (SVR4 with no CRC)"* ]]; then
@@ -41,23 +41,23 @@ extract_initrd_into_initoverlayfs() {
 
   if command -v mkfs.erofs; then
     cd /run/initoverlayfs/
-    sudo /usr/lib/dracut/skipcpio /boot/initramfs-$release.img | $decompressor | sudo cpio -ivd
+    sudo /usr/lib/dracut/skipcpio /boot/initramfs-"$release".img | "$decompressor" | sudo cpio -ivd
     cd -
   else
     fs="ext4"
-    dd if=/dev/zero of=/boot/initoverlayfs-$release.img bs=64M count=1
-    dev=$(sudo losetup -fP --show /boot/initoverlayfs-$release.img)
-    sudo mkfs.$fs $dev
-    sudo mount $dev "$DIR_TO_DUMP_INITRAMFS"
+    dd if=/dev/zero of=/boot/initoverlayfs-"$release".img bs=64M count=1
+    dev=$(sudo losetup -fP --show /boot/initoverlayfs-"$release".img)
+    sudo mkfs."$fs" "$dev"
+    sudo mount "$dev" "$DIR_TO_DUMP_INITRAMFS"
     cd "$DIR_TO_DUMP_INITRAMFS"
-    sudo /usr/lib/dracut/skipcpio /boot/initramfs-$release.img | zstd -d --stdout | sudo cpio -ivd
+    sudo /usr/lib/dracut/skipcpio /boot/initramfs-"$release".img | zstd -d --stdout | sudo cpio -ivd
     sudo sync
     cd -
     while ! sudo umount "$DIR_TO_DUMP_INITRAMFS"; do
       sleep 1
     done
 
-    sudo losetup -d $dev
+    sudo losetup -d "$dev"
   fi
 }
 
@@ -70,13 +70,16 @@ cd
 if false; then
 cp mount-sysroot.service /usr/lib/systemd/system/
 mkdir -p /usr/lib/dracut/modules.d/00early-boot-service
-echo '#!/usr/bin/bash
+cat << 'EOF' > /usr/lib/dracut/modules.d/00early-boot-service/module-setup.sh
+#!/usr/bin/bash
 
 install() {
     inst_multiple -o \
       "$systemdsystemunitdir"/mount-sysroot.service \
       "$systemdsystemunitdir"/sysinit.target.wants/mount-sysroot.service
-}' > /usr/lib/dracut/modules.d/00early-boot-service/module-setup.sh
+}
+EOF
+
 sed -i "s/initrd-udevadm-cleanup-db.service/initrd-udevadm-cleanup-db.service mount-sysroot.service/g" /usr/lib/systemd/system/initrd-switch-root.target
 chcon system_u:object_r:systemd_unit_file_t:s0 /usr/lib/systemd/system/mount-sysroot.service
 cd /usr/lib/systemd/system/sysinit.target.wants/
@@ -111,12 +114,12 @@ sudo mkdir -p "$UNLOCK_OVERLAYDIR/upper" "$UNLOCK_OVERLAYDIR/work"
 # sudo ln -sf storage-init $DIR_TO_DUMP_INITRAMFS/usr/sbin/init
 # sudo ln -sf usr/bin/storage-init $DIR_TO_DUMP_INITRAMFS/init
 if [ $fs == "erofs" ]; then
-  sudo mkfs.$fs /boot/initoverlayfs-$release.img /run/initoverlayfs/
+  sudo mkfs."$fs" /boot/initoverlayfs-"$release".img /run/initoverlayfs/
 fi
-#sudo losetup -fP /boot/initoverlayfs-$release.img
+#sudo losetup -fP /boot/initoverlayfs-"$release".img
 # ln -s init /usr/sbin/storage-init
 initramfs=$(sudo ls /boot/initramfs-* | grep -v rescue | tail -n1)
-sudo du -sh $initramfs
+sudo du -sh "$initramfs"
 #sudo dracut -v -f --strip $initramfs -M
 #sudo lsinitrd
 sudo du -sh /boot/initramfs*
@@ -134,7 +137,7 @@ sudo /bin/bash -c "echo -e \"bootfs $boot_partition\nbootfstype ext4\n\" > /etc/
 sudo dracut $decompressor_dracut -v -f --strip -M
 sudo du -sh /boot/initramfs*
 sudo lsinitrd | grep "storage-init"
-sudo du -sh $initramfs
+sudo du -sh "$initramfs"
 # sed -i '/^initrd /d' /boot/loader/entries/9c03d22e1ec14ddaac4f0dabb884e434-$release.conf
 
 bls_file=$(sudo ls /boot/loader/entries/ | grep -v rescue | tail -n1)

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -12,6 +12,6 @@ if command -v distrobox-enter; then
   distrobox-enter -r centos-stream9 -- /bin/bash -c "sudo dnf install -y epel-release && sudo dnf install -y valgrind clang gcc erofs-utils dracut rpm-build git && cd $PWD && scripts/build-bin-only.sh && mkdir -p /home/$USER/rpmbuild/SOURCES/ && git archive -o /home/$USER/rpmbuild/SOURCES/initoverlayfs-$REL.tar.gz --prefix initoverlayfs-$REL/ HEAD && rpmbuild -ba *.spec && sudo mkdir -p /boot /initrofs /overlay /overlay/upper /overlay/work /initoverlayfs && sudo rpm --force -U ~/rpmbuild/RPMS/$UNAME_M/initoverlayfs-$REL-1.el9.$UNAME_M.rpm && sudo dracut -f --no-kernel && sudo initoverlayfs-install && sudo valgrind ./a.out"
 else
   sudo podman build -t initoverlayfs .
-  sudo podman run --rm -it -v $PWD:$PWD initoverlayfs -- /bin/bash -c "sudo dnf install -y epel-release && sudo dnf install -y valgrind clang gcc erofs-utils dracut rpm-build git && cd $PWD && scripts/build-bin-only.sh && mkdir -p /home/$USER/rpmbuild/SOURCES/ && git archive -o /home/$USER/rpmbuild/SOURCES/initoverlayfs-$REL.tar.gz --prefix initoverlayfs-$REL/ HEAD && rpmbuild -ba *.spec && sudo mkdir -p /boot /initrofs /overlay /overlay/upper /overlay/work /initoverlayfs && sudo rpm --force -U ~/rpmbuild/RPMS/$UNAME_M/initoverlayfs-$REL-1.el9.$UNAME_M.rpm && sudo dracut -f --no-kernel && sudo initoverlayfs-install && sudo valgrind ./a.out"
+  sudo podman run --rm -it -v "$PWD:$PWD" initoverlayfs -- /bin/bash -c "sudo dnf install -y epel-release && sudo dnf install -y valgrind clang gcc erofs-utils dracut rpm-build git && cd $PWD && scripts/build-bin-only.sh && mkdir -p /home/$USER/rpmbuild/SOURCES/ && git archive -o /home/$USER/rpmbuild/SOURCES/initoverlayfs-$REL.tar.gz --prefix initoverlayfs-$REL/ HEAD && rpmbuild -ba *.spec && sudo mkdir -p /boot /initrofs /overlay /overlay/upper /overlay/work /initoverlayfs && sudo rpm --force -U ~/rpmbuild/RPMS/$UNAME_M/initoverlayfs-$REL-1.el9.$UNAME_M.rpm && sudo dracut -f --no-kernel && sudo initoverlayfs-install && sudo valgrind ./a.out"
 fi