From 3422e3be2e0f42201e186da8a604f98a63418068 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 28 Mar 2024 17:20:21 -0600 Subject: [PATCH 1/2] server: fix bootstrap log --- subiquity/cmd/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subiquity/cmd/server.py b/subiquity/cmd/server.py index 8e4bd546..d3aaca66 100644 --- a/subiquity/cmd/server.py +++ b/subiquity/cmd/server.py @@ -212,8 +212,8 @@ def main(): server.note_file_for_apport("InstallerServerLog", logfiles["debug"]) server.note_file_for_apport("InstallerServerLogInfo", logfiles["info"]) server.note_file_for_apport( - "UdiLog", - os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log"), + "BootstrapLog", + os.path.realpath("/var/log/installer/ubuntu_bootstrap.log"), ) await server.run() From 12934d7b973e8e5f46ed36c78a2d65b81c68f8ea Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 28 Mar 2024 17:20:43 -0600 Subject: [PATCH 2/2] scripts: update for bootstrap --- scripts/bind-patch.sh | 3 +++ scripts/kvm-test.py | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/bind-patch.sh b/scripts/bind-patch.sh index c4d2312d..806ddcc1 100755 --- a/scripts/bind-patch.sh +++ b/scripts/bind-patch.sh @@ -15,6 +15,9 @@ if [ -d "/snap/subiquity" ] ; then elif [ -d "/snap/ubuntu-desktop-installer" ] ; then SNAPNAME=ubuntu-desktop-installer INTERMEDIATE=bin/subiquity +elif [ -d "/snap/ubuntu-desktop-bootstrap" ] ; then + SNAPNAME=ubuntu-desktop-bootstrap + INTERMEDIATE=bin/subiquity else echo "subiquity-like snap not found" exit 1 diff --git a/scripts/kvm-test.py b/scripts/kvm-test.py index 9814fe69..c059b937 100755 --- a/scripts/kvm-test.py +++ b/scripts/kvm-test.py @@ -351,8 +351,8 @@ def build(ctx): assert_exists(snap) livefs_edit(ctx, '--add-snap-from-store', 'core20', 'stable', '--inject-snap', snap) - elif project == 'ubuntu-desktop-installer': - with snap_manager('udi_test.snap') as snap: + elif project == 'ubuntu-desktop-bootstrap': + with snap_manager('udb_test.snap') as snap: run('snapcraft clean --use-lxd') run(f'snapcraft pack --use-lxd --output {snap} {snapargs}') assert_exists(snap)