From f3e356ca7d1bd566a24af7e4616f924daca25edb Mon Sep 17 00:00:00 2001
From: bnjf <bnjf@users.noreply.github.com>
Date: Wed, 27 Feb 2019 10:48:51 +1100
Subject: Update build-GCE-image (#46)
1. enable serial output for grub
2. sync isn't enough, tar was reliably throwing "changed as we read it" on my build box. umount instead to quiesce.
---
scripts/build-GCE-image | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/scripts/build-GCE-image b/scripts/build-GCE-image
index 7684bd43..9e2bcaf5 100755
--- a/scripts/build-GCE-image
+++ b/scripts/build-GCE-image
@@ -127,6 +127,10 @@ cat > ${MOUNT_DIR}/boot/grub/grub.cfg << EOF
set timeout=5
set default=0
+serial --speed=38400 --unit=0 --word=8 --parity=no --stop=1
+terminal_input serial
+terminal_output serial
+
menuentry "VyOS $version (Serial console)" {
linux /boot/"$version"/vmlinuz boot=live vyos-union=/boot/"$version" console=tty0 console=ttyS0,38400n8d earlyprintk=ttyS0,38400 consoleblank=0 systemd.show_status=true
initrd /boot/"$version"/initrd.img
@@ -147,7 +151,9 @@ grub-install --boot-directory ${MOUNT_DIR}/boot --force --no-floppy --skip-fs-p
###################
### HOOK SCRIPT ###
###################
-fstrim ${MOUNT_DIR}
-sync
-tar -Sczf ${OUTPUTGZ} ${OUTPUT}
+fstrim ${MOUNT_DIR}
+umount ${MOUNT_DIR} && {
+ tar -Sczf ${OUTPUTGZ} ${OUTPUT}
+ mount /dev/mapper/${LOOP_DEVICE} ${MOUNT_DIR}
+}
--
cgit v1.2.3