diff options
| author | Lars Wirzenius <liw@liw.fi> | 2023-06-28 19:14:42 +0000 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2023-06-28 19:14:42 +0000 |
| commit | c920f6288d0247fea783aaac51e9693a9a83db25 (patch) | |
| tree | a418ad53a57ecf310e40b731d60d43b3c184716e | |
| parent | e3074148ad6b4320013ecb98f66d151c2781f17d (diff) | |
| parent | dda4e702df9d2393585fa7e719781fcad6a7acb2 (diff) | |
| download | ambient-ci-c920f6288d0247fea783aaac51e9693a9a83db25.tar.gz | |
Merge branch 'liw/run-script-rewrite' into 'main'
fix quietness
See merge request larswirzenius/ambient-ci!17
| -rw-r--r-- | ambient-build.service | 1 | ||||
| -rw-r--r-- | ambient-playbook-base.yml | 8 | ||||
| -rw-r--r-- | ambient-run-script | 3 | ||||
| -rw-r--r-- | ambient.vmdb | 2 | ||||
| -rwxr-xr-x | test-project/.ambient-script | 2 |
5 files changed, 5 insertions, 11 deletions
diff --git a/ambient-build.service b/ambient-build.service index f0d4654..b7d078e 100644 --- a/ambient-build.service +++ b/ambient-build.service @@ -7,3 +7,4 @@ WantedBy=multi-user.target [Service] Type=oneshot ExecStart=/bin/ambient-run-script /dev/ttyS0 /dev/vdb /dev/vdc +ExecStart=/sbin/poweroff diff --git a/ambient-playbook-base.yml b/ambient-playbook-base.yml index 2fa26b4..c9e9c25 100644 --- a/ambient-playbook-base.yml +++ b/ambient-playbook-base.yml @@ -31,14 +31,6 @@ virtio_pci dest: /etc/initramfs-tools/modules - - name: "configure boot to be quieter" - lineinfile: - path: /etc/default/grub - regexp: '^GRUB_CMDLINE_LINUX_DEFAULT=' - line: > - GRUB_CMDLINE_LINUX_DEFAULT="biosdevname=0 net.ifnames=0 - loglevel=3 rw quiet systemd.show_status=false rd.systemd.show_status=false" - - name: "update initramfs and grub" shell: | update-initramfs -u diff --git a/ambient-run-script b/ambient-run-script index 04f033a..fde2ddc 100644 --- a/ambient-run-script +++ b/ambient-run-script @@ -34,9 +34,6 @@ run() { else echo "build FAILED" fi - - echo "powering down" - poweroff } run "$@" </dev/null >"$1" diff --git a/ambient.vmdb b/ambient.vmdb index adc34bb..25e613a 100644 --- a/ambient.vmdb +++ b/ambient.vmdb @@ -59,6 +59,8 @@ steps: - grub: uefi tag: / efi: efi + console: serial + quiet: false - ansible: / playbook: ambient-playbook-base.yml diff --git a/test-project/.ambient-script b/test-project/.ambient-script index 2f37dcf..797ac74 100755 --- a/test-project/.ambient-script +++ b/test-project/.ambient-script @@ -4,6 +4,8 @@ set -euo pipefail echo "hello from test-project's ambient script: $*" +cat /proc/cmdline + output="$1" echo "produce output tar" |