debug-only

systemd · Mar 28, 2024 · b4c6180 · b4c6180
1 parent 478d78c
commit b4c6180
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/agent-control.py b/agent-control.py
@@ -535,6 +535,8 @@ def main():
                 # we can do if the machine is FUBAR
                 pass
 
+        ac.execute_remote_command("journalctl --no-pager -o short-monotonic -b")
+
         if isinstance(e, AlarmException):
             logging.error("Execution failed: timeout reached")
             rc = 124

diff --git a/vagrant/boxes/archlinux_systemd.sh b/vagrant/boxes/archlinux_systemd.sh
@@ -118,14 +118,14 @@ rm -fr radvd
 (radvd --version || :) |& grep "^Version"
 
 # Compile & install dfuzzer
-pacman --needed --noconfirm -S docbook-xsl gcc glib2 libxslt meson pkg-config
-git clone --depth=1 https://github.com/dbus-fuzzer/dfuzzer
-pushd dfuzzer
-meson build
-ninja -C build install
-popd
-rm -fr dfuzzer
-dfuzzer --version
+#pacman --needed --noconfirm -S docbook-xsl gcc glib2 libxslt meson pkg-config
+#git clone --depth=1 https://github.com/dbus-fuzzer/dfuzzer
+#pushd dfuzzer
+#meson build
+#ninja -C build install
+#popd
+#rm -fr dfuzzer
+#dfuzzer --version
 
 # Remove the makepkg user
 rm /etc/sudoers.d/builder
@@ -160,7 +160,9 @@ MACHINE_ID="$(</etc/machine-id)"
 # image in the respective kernel package. The additional sed shenanigans just ensure
 # we return non-zero if we, for whatever reason, fail to parse the version, just to make
 # debugging easier.
-KERNEL_VER="$(pacman -Ql linux | grep vmlinuz | sed -nr 's/^.+\/([^/]+)\/vmlinuz$/\1/p;tx;q1;:x')"
+pacman --noconfirm -S linux-lts
+pacman --noconfirm -R linux
+KERNEL_VER="$(pacman -Ql linux-lts | grep vmlinuz | sed -nr 's/^.+\/([^/]+)\/vmlinuz$/\1/p;tx;q1;:x')"
 
 bootctl install
 cat >/efi/loader/entries/arch.conf <<EOF
@@ -171,8 +173,8 @@ options root=UUID=$(findmnt -n -o UUID /) rw console=ttyS0 net.ifnames=0
 EOF
 # Follow the recommended layout from the Boot Loader Specification
 mkdir -p "/efi/$MACHINE_ID/$KERNEL_VER"
-mv -v /boot/vmlinuz-linux "/efi/$MACHINE_ID/$KERNEL_VER/linux"
-mv -v /boot/initramfs-linux.img "/efi/$MACHINE_ID/$KERNEL_VER/initrd"
+mv -v /boot/vmlinuz-linux-lts "/efi/$MACHINE_ID/$KERNEL_VER/linux"
+mv -v /boot/initramfs-linux-lts.img "/efi/$MACHINE_ID/$KERNEL_VER/initrd"
 bootctl status
 pacman -Rcnsu --noconfirm grub
 # shellcheck disable=SC2114