summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Cady <d@cryptonomic.net>2020-10-30 11:26:31 -0400
committerAndrew Cady <d@cryptonomic.net>2020-10-30 12:10:14 -0400
commit7592edc5df9318d4f8a6621194a66e8d69dcdd2e (patch)
treefe596e74c9881539e3f47e4c9d4e1218f9baf858 /src
parent820405b9be25032e4b4f207f28c3826f73bbd865 (diff)
parted-usb: improved logging
Diffstat (limited to 'src')
-rwxr-xr-xsrc/parted-usb.sh29
1 files changed, 25 insertions, 4 deletions
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()
66 fi 66 fi
67} 67}
68 68
69sex()
70{
71 (
72 set -x
73 "$@"
74 )
75}
76
69make_target_bootable() 77make_target_bootable()
70{ 78{
71 mkfs.btrfs -f --mixed "$part"2 79 mkfs.btrfs -f --mixed "$part"2
@@ -73,9 +81,19 @@ make_target_bootable()
73 mount "$part"2 "$mnt" 81 mount "$part"2 "$mnt"
74 82
75 mkdir -p "$mnt"/boot/grub 83 mkdir -p "$mnt"/boot/grub
76 cp -aL "$GRUB_CONFIG" "$mnt"/boot/grub 84 cp -avL "$GRUB_CONFIG" "$mnt"/boot/grub
77 85
78 eatmydata -- grub-install -v --boot-directory "$mnt"/boot "$dev" 86 GRUB_LOGFILE=$(mktemp) || exit
87 set -- eatmydata -- grub-install -v --boot-directory "$mnt"/boot "$dev"
88 echo "running: $* >$GRUB_LOGFILE 2>&1" >&2
89 if "$@" >"$GRUB_LOGFILE" 2>&1
90 then
91 rm "$GRUB_LOGFILE"
92 else
93 set -x
94 tail -n5 "$GRUB_LOGFILE"
95 exit 1
96 fi
79 sync 97 sync
80} 98}
81 99
@@ -90,8 +108,11 @@ copy_rootfs()
90 part_size=$(blockdev --getsize64 "$part"3) 108 part_size=$(blockdev --getsize64 "$part"3)
91 [ "$rootfs_size" -le "$part_size" ] || die "rootfs_size=$rootfs_size > part_size=$part_size" 109 [ "$rootfs_size" -le "$part_size" ] || die "rootfs_size=$rootfs_size > part_size=$part_size"
92 110
93 dd if="$ROOTFS" of="$part"3 111 (
94 # dd if=rootfs/samizdat.patch.seed.btrfs of="$part"4 112 set -x
113 dd if="$ROOTFS" of="$part"3
114 # dd if=rootfs/samizdat.patch.seed.btrfs of="$part"4
115 )
95} 116}
96 117
97acquire_target_block_devices() 118acquire_target_block_devices()