diff options
| author | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2019-03-31 17:41:19 +0200 |
| commit | 7e2a2e37e72e649b5eb42362e0469101c7ce19cc (patch) | |
| tree | 636944e4ba7bcb13bd18bc3f70391faab8c3ebcc /scripts/build-GCE-image | |
| parent | 819bb96bd26c1495d6fef2e6477bb96cf147ec22 (diff) | |
| parent | dda8ec6f3a46b2dfe9f627c620b7fb57c25d70dc (diff) | |
| download | vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.tar.gz vyos-build-7e2a2e37e72e649b5eb42362e0469101c7ce19cc.zip | |
Merge branch 'current' into crux
Conflicts:
data/kernel_version
scripts/build-config
scripts/defaults.py
scripts/live-build-config
Diffstat (limited to 'scripts/build-GCE-image')
| -rwxr-xr-x | scripts/build-GCE-image | 12 |
1 files 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} +} |