StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1958 from dbungert/ubuntu-desktop-bootstrap 

fix a few bootstrap renames
This commit is contained in:
Dan Bungert 2024-03-28 18:34:25 -06:00 committed by GitHub
parent eca86c58da 12934d7b97
commit 72bac06005
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bind-patch.sh
View File

@ -15,6 +15,9 @@ if [ -d "/snap/subiquity" ] ; then
elif [ -d "/snap/ubuntu-desktop-installer" ] ; then elif [ -d "/snap/ubuntu-desktop-installer" ] ; then
SNAPNAME=ubuntu-desktop-installer SNAPNAME=ubuntu-desktop-installer
INTERMEDIATE=bin/subiquity INTERMEDIATE=bin/subiquity
elif [ -d "/snap/ubuntu-desktop-bootstrap" ] ; then
SNAPNAME=ubuntu-desktop-bootstrap
INTERMEDIATE=bin/subiquity
else else
echo "subiquity-like snap not found" echo "subiquity-like snap not found"
exit 1 exit 1

4
scripts/kvm-test.py
View File

@ -351,8 +351,8 @@ def build(ctx):
assert_exists(snap) assert_exists(snap)
livefs_edit(ctx, '--add-snap-from-store', 'core20', 'stable', livefs_edit(ctx, '--add-snap-from-store', 'core20', 'stable',
'--inject-snap', snap) '--inject-snap', snap)
elif project == 'ubuntu-desktop-installer': elif project == 'ubuntu-desktop-bootstrap':
with snap_manager('udi_test.snap') as snap: with snap_manager('udb_test.snap') as snap:
run('snapcraft clean --use-lxd') run('snapcraft clean --use-lxd')
run(f'snapcraft pack --use-lxd --output {snap} {snapargs}') run(f'snapcraft pack --use-lxd --output {snap} {snapargs}')
assert_exists(snap) assert_exists(snap)

4
subiquity/cmd/server.py
View File

@ -212,8 +212,8 @@ def main():
server.note_file_for_apport("InstallerServerLog", logfiles["debug"]) server.note_file_for_apport("InstallerServerLog", logfiles["debug"])
server.note_file_for_apport("InstallerServerLogInfo", logfiles["info"]) server.note_file_for_apport("InstallerServerLogInfo", logfiles["info"])
server.note_file_for_apport( server.note_file_for_apport(
"UdiLog", "BootstrapLog",
os.path.realpath("/var/log/installer/ubuntu_desktop_installer.log"), os.path.realpath("/var/log/installer/ubuntu_bootstrap.log"),
) )
await server.run() await server.run()