From 7592edc5df9318d4f8a6621194a66e8d69dcdd2e Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@cryptonomic.net>
Date: Fri, 30 Oct 2020 11:26:31 -0400
Subject: parted-usb: improved logging

---
 src/parted-usb.sh | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/parted-usb.sh b/src/parted-usb.sh
index 6ff8c9f..fff003c 100755
--- a/src/parted-usb.sh
+++ b/src/parted-usb.sh
@@ -66,6 +66,14 @@ partition_target()
     fi
 }
 
+sex()
+{
+    (
+        set -x
+        "$@"
+    )
+}
+
 make_target_bootable()
 {
     mkfs.btrfs -f --mixed "$part"2
@@ -73,9 +81,19 @@ make_target_bootable()
     mount "$part"2 "$mnt"
 
     mkdir -p "$mnt"/boot/grub
-    cp -aL "$GRUB_CONFIG" "$mnt"/boot/grub
+    cp -avL "$GRUB_CONFIG" "$mnt"/boot/grub
 
-    eatmydata -- grub-install -v --boot-directory "$mnt"/boot "$dev"
+    GRUB_LOGFILE=$(mktemp) || exit
+    set -- eatmydata -- grub-install -v --boot-directory "$mnt"/boot "$dev"
+    echo "running: $* >$GRUB_LOGFILE 2>&1" >&2
+    if "$@" >"$GRUB_LOGFILE" 2>&1
+    then
+        rm "$GRUB_LOGFILE"
+    else
+        set -x
+        tail -n5 "$GRUB_LOGFILE"
+        exit 1
+    fi
     sync
 }
 
@@ -90,8 +108,11 @@ copy_rootfs()
     part_size=$(blockdev --getsize64 "$part"3)
     [ "$rootfs_size" -le "$part_size" ] || die "rootfs_size=$rootfs_size > part_size=$part_size"
 
-    dd if="$ROOTFS" of="$part"3
-    # dd if=rootfs/samizdat.patch.seed.btrfs of="$part"4
+    (
+        set -x
+        dd if="$ROOTFS" of="$part"3
+        # dd if=rootfs/samizdat.patch.seed.btrfs of="$part"4
+    )
 }
 
 acquire_target_block_devices()
-- 
cgit v1.2.3