From 1c9ba85317f637fe913f2585680e128598d7fc9e Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Sun, 16 Aug 2020 21:56:39 -0400 Subject: initrd.sh: improved error handling --- src/initrd.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/initrd.sh b/src/initrd.sh index 3c692f8..5bf19cf 100755 --- a/src/initrd.sh +++ b/src/initrd.sh @@ -16,8 +16,14 @@ get_kernel_version() (read _ a; echo ${a#linux-image-}) } +pkgs_file=rootfs/_build/${rootfs:-samizdat}.pkgs.txt + +[ -f "$pkgs_file" ] || exit + kernel_version=$(get_kernel_version rootfs/_build/${rootfs:-samizdat}.pkgs.txt) +[ "$kernel_version" ] || exit + debian_initrd=/boot/initrd.img-${kernel_version} find_deps() { @@ -40,14 +46,12 @@ rebuild() /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${kernel_version}" || force_rebuild } -[ "$kernel_version" ] - if [ ! -e "$initrd" -o ! -e "$vmlinuz" ]; then rebuild else found=$(find_deps -newer "$initrd" -print -quit) if [ "$found" ]; then - echo "initrd.sh: rebuild forced: found modified source: $found" + echo "initrd.sh: rebuild forced: found modified source: $found" >&2 rebuild fi fi -- cgit v1.2.3