Commit Graph

4720 Commits

Author SHA1 Message Date
Olivier Gayot 2bf39f02ca Merge pull request #1217 from ogayot/ua-rebranding
Rename UbuntuAdvantage -> UbuntuPro
2022-03-17 09:20:43 +01:00
Michael Hudson-Doyle 4fdd4f9fec make test_v2_multi_disk_multi_boot api test more correct
This calls add_boot_partition on disks that are filled by pre-existing
partitions. That should not work, and does not in a branch I am working
on.
2022-03-17 13:35:01 +13:00
Michael Hudson-Doyle f62a4ca187 move partition size related stuff to its own module
This avoids a circular import in another branch I am working on.
2022-03-17 13:32:35 +13:00
Dan Bungert d7d1a70b59
Merge pull request #1229 from dbungert/api-test-flow
api test: fix flow test for v2 storage actions
2022-03-16 15:41:43 -06:00
Dan Bungert 6a378de508 api test: fix flow test for v2 storage actions 2022-03-16 15:21:39 -06:00
Michael Hudson-Doyle 0550626482
Merge pull request #1222 from mwhudson/optional-v2-storage
Optional v2 storage
2022-03-17 09:49:01 +13:00
Dan Bungert cad6cca8e1
Merge pull request #1226 from canonical/deeng-184-systemd-experimental
Systemd experimental support
2022-03-16 13:16:31 -06:00
Didier Roche 09c7210406 System-Setup: fix typos
Co-authored-by: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
2022-03-16 12:24:46 +01:00
Didier Roche 208d8778c9 System-Setup: Clean up load data API
We don’t need to pass an empty dict as parameter.

Co-authored-by: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
2022-03-16 12:24:46 +01:00
Didier Roche d17cd6fc38 System-Setup: Add systemd experimental support to WSL
Grow a new API for enabling/disabling systemd experimental support. We
do this by chaining a specific command= in the boot section.
We preserve the user customized command= content when systemd
experimental support is not enabled.

Co-authored-by: Jean-Baptiste Lallement <jean-baptiste@ubuntu.com>
2022-03-16 12:24:18 +01:00
Michael Hudson-Doyle 7e12213e8c use a smarter parts_and_gaps implemenation for v2 config 2022-03-16 22:00:17 +13:00
Michael Hudson-Doyle f5dad435ed send storage_version to client 2022-03-16 20:52:58 +13:00
Michael Hudson-Doyle 4c33463b9e add --storage-version command line flag
It is just copied into the output storage config so far
2022-03-16 20:52:55 +13:00
Michael Hudson-Doyle 303f78fb6d
Merge pull request #1224 from dbungert/probert-py310
probert: update for python 3.10 fix (lp-1964571)
2022-03-16 12:37:22 +13:00
Dan Bungert bed7cffe3c
Merge pull request #1164 from maces/patch-1
fixing swap path + support partition size units
2022-03-15 15:38:31 -06:00
Dan Bungert 4379f1b8d4 probert: update for python 3.10 fix (lp-1964571) 2022-03-15 15:15:53 -06:00
Dan Bungert 54d75feaa5
Merge pull request #1223 from canonical/deeng-188-remove-ubuntu-wsl-integration
system-setup: Remove ubuntu-wsl-integration from API and TUI.
2022-03-15 12:59:48 -06:00
Olivier Gayot e9b2e24b1a Rename UbuntuAdvantage -> UbuntuPro but keep autoinstall compat
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-15 11:50:57 +01:00
Olivier Gayot cf17de1687 Implement backward compatibility mechanism for autoinstall key
In addition to autoinstall_key, controllers can now define an
autoinstall_key_alias.

The purpose of this attribute is to provide a backward compatibility
mechanism when we need to change the name of an autoinstall_key for
whatever reason.

When loading autoinstall data, if we can't find data matching the
autoinstall_key, we will now also look for data matching the key alias.

In the JSON schema, the old name (i.e., autoinstall_key_alias) will be
marked deprecated and the description will have the name of the
replacement key (i.e., autoinstall_key).

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-15 11:44:21 +01:00
Heinrich Schuchardt 4d68159e69
Merge pull request #1221 from xypron/curtin
curtin: Add riscv64 to supported UEFI architectures
2022-03-15 09:35:59 +01:00
Heinrich Schuchardt f9ce537053 curtin: Add riscv64 to supported UEFI architectures
synchronize with https://git.launchpad.net/curtin

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-15 09:13:32 +01:00
Dan Bungert 7fc30e8823
Merge pull request #1218 from dbungert/console-conf-await-str
console-conf: fix crash on network info
2022-03-14 15:20:40 -06:00
Dan Bungert 4b1277ae2d console-conf: fix crash on network info
If you run dryrun for console-conf, go to the network page, go to an
interface, then info, a crash of the form
TypeError: object str can't be used in 'await' expression
can be seen. The signature for the core version of get_info_for_netdev
is not async, but a non-async method returning str.

So mark the core version of the function async.

Co-authored-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
2022-03-14 15:09:23 -06:00
Dan Bungert 6f89bcb64c
Merge pull request #1213 from dbungert/offset-in-gap
filesystem: show offset in gap & partition
2022-03-14 14:57:01 -06:00
Dan Bungert 7638b4b45c apitest: document failing test
Allowing the boot partition to be implicitly created results in it being
physically second on disk.
2022-03-14 14:30:05 -06:00
Dan Bungert 732d47b9d7 gaps: use alignment data 2022-03-14 14:30:05 -06:00
Dan Bungert 92db5899f7 manipulator: add test for boot offset 2022-03-14 14:30:05 -06:00
Dan Bungert 2a84dc6980 filesystem: add offset 2022-03-14 14:30:05 -06:00
Dan Bungert 428dc9502f
Merge pull request #1211 from dbungert/log-dir-perms
logging: 0770 log dir in install env, 0750 later
2022-03-14 10:02:26 -06:00
Dan Bungert 4698dcd935 logging: raise warning when not adjusting perms 2022-03-14 09:48:19 -06:00
Didier Roche 5695da5699 system-setup: Remove ubuntu-wsl-integration from API and TUI.
This project is no longer supported under WSL. Remove integration in the TUI
and API for it. Adapted tests and schema.
2022-03-14 15:58:03 +01:00
Dan Bungert 6c5b038025
Merge pull request #1216 from xypron/os-prober
Installing os-probe requires fakeroot
2022-03-14 08:50:48 -06:00
Heinrich Schuchardt 1a5b96c5be Installing os-probe requires fakeroot
Building with --destructive-mode fails with error:

    dh install
       dh_testroot
    dh_testroot: error: You must run this as root (or use fakeroot).
    make: *** [debian/rules:6: install] Error 255

Use fakeroot for installation.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
2022-03-14 15:25:29 +01:00
Heinrich Schuchardt 6114620956
Merge pull request #1215 from xypron/os-prober
atp-deps.txt: add os-prober
2022-03-14 11:25:30 +01:00
Heinrich Schuchardt d823568197 atp-deps.txt: add os-prober
The build instruction contain a step

    PYTHONPATH=probert ./probert/bin/probert --all > mymachine.json

This requires package os-prober.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-03-14 10:27:05 +01:00
Olivier Gayot fb77e05956
Merge pull request #1214 from mwhudson/cloud-init-timeout
catch the correct exception when waiting for cloud-init
2022-03-14 09:43:33 +01:00
Michael Hudson-Doyle 05f3db94a7 catch the correct exception when waiting for cloud-init
Argh!
2022-03-14 12:40:57 +13:00
Dan Bungert 81f0bace6a
Merge pull request #1210 from ogayot/add-python3-systemd
Add python3-systemd as an explicit dependency
2022-03-11 13:10:33 -07:00
Dan Bungert 953998b23a logging: 0770 log dir in install env, 0750 later 2022-03-11 12:44:22 -07:00
Olivier Gayot 1fefa5615a Add python3-systemd as an explicit dependency
Running `make install_depends` does not (always) pull python3-systemd
which is a dependency of Subiquity.

In environments having Install-Recommends enabled, python3-systemd is
pulled by apport which is itself pulled by python3-apport.

Fixed by adding it to the list of dependencies in apt-deps.txt

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-11 17:18:48 +01:00
Michael Hudson-Doyle a4af88ccea
Merge pull request #1207 from dbungert/riscv-curtin
curtin: rev for risc-v apt fix
2022-03-11 13:42:34 +13:00
Dan Bungert 7c296e7084
Merge pull request #1209 from dbungert/probert-timeout
riscv: extend block probing timeout
2022-03-10 15:31:32 -07:00
Michael Hudson-Doyle 68dd1eb660
Merge pull request #1208 from mwhudson/alignment-data-ui
use alignment_data() in PartitionStretchy
2022-03-11 11:22:26 +13:00
Michael Hudson-Doyle 7b36b1907a use alignment_data() in PartitionStretchy
also add alignment_data() to Raid
2022-03-11 10:47:22 +13:00
Dan Bungert 119f17b362 riscv: extend block probing timeout 2022-03-10 14:47:13 -07:00
Dan Bungert 765c65b9bf curtin: rev for risc-v apt fix 2022-03-10 11:08:07 -07:00
Dan Bungert 510d63d93d
Merge pull request #1206 from dbungert/partition-alignment
filesystem: add partition alignment table
2022-03-10 08:47:30 -07:00
Olivier Gayot 0b7264b1f2 Remove hack to get drivers controller configured when drivers are found
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-10 12:33:45 +01:00
Olivier Gayot 392d1e6dc9 Make spelling of Drivers view consistent with other screens
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-10 12:33:45 +01:00
Olivier Gayot dd04b8d622 Show the list of drivers to install in the view
Instead of telling the user that drivers are available, we now actually show
the list that will be installed should the use decide to.

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-03-10 12:33:45 +01:00