make build system more robust - in failing :) (#3)

omniosorg · Jun 17, 2020 · 587fbfb · 587fbfb
1 parent afc35de
commit 587fbfb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -44,6 +44,7 @@ jobs:
             - name: Build Image
               id: build_image
               run: |
+                  set -xe
                   cd ubuntu
                   tar=lx-ubuntu-${{ matrix.RELEASE }}.tar
                   tag=release:$$

diff --git a/ubuntu/helpers/build.sh b/ubuntu/helpers/build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
-set -e
-set -x
+set -ex
 echo Installing Ubuntu $UBUNTU_RELEASE
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
@@ -53,7 +52,6 @@ cp locale /etc/default/locale
 # make sure we get fresh ssh keys on first boot
 /bin/rm -f -v /etc/ssh/ssh_host_*_key*
 cp regenerate_ssh_host_keys.service /etc/systemd/system
-systemctl daemon-reload
 systemctl enable regenerate_ssh_host_keys
 # Remove the divert that disables services
 rm -f /sbin/initctl

diff --git a/ubuntu/helpers/regenerate_ssh_host_keys.service b/ubuntu/helpers/regenerate_ssh_host_keys.service
@@ -8,4 +8,5 @@ ExecStart=/usr/bin/ssh-keygen -A -v
 ExecStartPost=/bin/systemctl disable regenerate_ssh_host_keys
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
+# last line