Commit Graph

159 Commits

Author SHA1 Message Date
Dan Bungert 9829c14e6e probert: update for 'os' probe_type 2022-03-29 15:09:21 -06:00
Dan Bungert 4379f1b8d4 probert: update for python 3.10 fix (lp-1964571) 2022-03-15 15:15:53 -06: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
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
Dan Bungert 765c65b9bf curtin: rev for risc-v apt fix 2022-03-10 11:08:07 -07:00
Dan Bungert 5124762de4 probert: rev for os-prober, mdadm 2022-02-28 15:56:04 -07:00
Dan Bungert 9179777aa2 os-prober: use snapified source
Use my branch of os-prober which adds env variables for finding the lib
& share directories.  And set those env variables.
2022-02-28 15:56:04 -07:00
Dan Bungert 3b6f6024ae os-prober: build from a git
Build os-prober from a git repo instead of staging the focal version.
Point to my mirror of os-prober as salsa is currently down.
2022-02-28 15:00:25 -07:00
Michael Hudson-Doyle de4c2af81e snapcraft.yaml: remove bson from python-packages 2022-02-23 10:12:21 +13:00
Dan Bungert 4f012918f8 Revert probert again to remove os-prober usage
os-prober is leaving around invalid devices and we don't know what to do
about it yet, but we do know that we don't require os-prober for
20.04.4.  Back this out.  LP: #1961640 LP: #1961628
2022-02-22 13:31:14 -07:00
Dan Bungert 4927affbe8 snapcraft: better file selection for os-prober sed 2022-01-24 13:18:49 -07:00
Dan Bungert 54ca91038e snapcraft: show os-prober as available app 2022-01-24 12:37:48 -07:00
Dan Bungert 8318fc4617 Revert "os-prober: patch instead of sed"
This reverts commit 7bdeb6707c.
2022-01-24 12:18:41 -07:00
Olivier Gayot 1fce021585 Bump curtin version to fix APT preferences being discarded
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-01-21 10:07:16 +01:00
Dan Bungert f0907971ed
Merge pull request #1145 from dbungert/os-prober-snap
snapcraft: add os-prober
2022-01-20 12:34:09 -07:00
Dan Bungert 4a672e071e
Merge pull request #1158 from ogayot/bind-uac-into-subiquity-snap
Embed ubuntu-advantage-tools into Subiquity snap and use it
2022-01-13 13:01:03 -07:00
Olivier Gayot 6e0c9821fe snapcraft: pickup curtin's support for apt_preferences
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-01-13 09:32:42 +01:00
Dan Bungert 7bdeb6707c os-prober: patch instead of sed 2022-01-12 13:33:07 -07:00
Dan Bungert 6bf9b8f734 snapcraft: rev probert for os-prober 2022-01-11 14:34:08 -07:00
Dan Bungert 05c8c70483 snapcraft: +os-prober 2022-01-11 14:34:08 -07:00
Olivier Gayot 1995dd002a Add ubuntu-advantage-tools as stage-package
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
2022-01-11 11:12:10 +01:00
Dan Bungert 90d764af36 probert: rollback to pre os-prober
Rollback the Probert version until os-prober is correctly present in the
Subiquity snap.
2021-12-08 16:18:36 -07:00
Dan Bungert 49c20f7894 probert: rev for os-prober 2021-12-07 11:46:28 -07:00
Dan Bungert c332d62e40
Merge pull request #1130 from dbungert/curtin-rev-lsblk
snapcraft: pickup curtin lsblk fix
2021-11-22 16:55:34 -07:00
Dan Bungert 00c4f0c0a3 snapcraft: pickup curtin lsblk fix 2021-11-19 16:02:40 -07:00
Dan Bungert cf199fbc4d snapcraft: remove python links from snap bin dir
The python links in the bin dir of the snap were resolving to system
python instead of the python binary found at usr/bin.  This appears to
be the root cause of why python scripts would fail to find their own
resources, such as ssh-import-id and lsb_release.
2021-11-19 15:50:14 -07:00
Michael Hudson-Doyle be57dc9da0 fix offline installs 2021-11-17 11:20:18 +13:00
Dan Bungert 5b425b2ea0 ssh: fix PYTHONPATH 2021-10-07 15:57:37 -06:00
Dan Bungert be158a375f snapcraft: environment and package fixes
* adjust environment to set PYTHONPATH to pick up site-packages
* add more required packages
* add script for subiquity-server, and set PYTHONPATH there,
  so that the PYTHONPATH takes effect
2021-10-01 13:59:10 -06:00
Michael Hudson-Doyle 8de369ece2 snapcraft: change base to core20 2021-10-01 13:29:31 -06:00
Michael Hudson-Doyle 288a7e23f4 update curtin 2021-08-24 11:45:15 +12:00
Michael Hudson-Doyle fbfbf67eb5 update curtin 2021-08-12 13:11:04 +12:00
Michael Hudson-Doyle 0bdb965444 update curtin 2021-08-11 10:34:22 +12:00
Michael Hudson-Doyle 31cceabba9 update curtin, you know the drill 2021-08-04 12:51:49 +12:00
Dan Bungert 9d3c156686 Update probert for bitlocker changes 2021-08-02 19:02:09 -06:00
Michael Hudson-Doyle e973b87b92 grab another 2 curtin commits 2021-08-03 12:30:23 +12:00
Michael Hudson-Doyle ae7af3ed4c update curtin to get raid, zipl config, unmounting fixes 2021-08-02 14:39:29 +12:00
Michael Hudson-Doyle c340c6db22 update curtin
this brings in the unmounting fix and lets PYTHON be set in the
environment to choose which python to use
2021-07-23 12:26:49 +12:00
Michael Hudson-Doyle ab97297009 set environment variables in snapcraft.yaml not wrappers 2021-07-14 12:02:45 +12:00
Dan Bungert 4cbfb7f18f
Abstract resource file lookup relative to SNAP (#998)
* Abstract resource file lookup relative to SNAP

Using SNAP to find the resource files is a bit of an odd requirement for
non-subiquity clients.  Start abstracting that away so it's easier to
change later.

Also move loadkeys to lookup from this, since the previous solution is
still a problem for ubuntu-desktop-installer.

* Move loadkeys / configure-apt to bin

loadkeys / configure-apt are in usr/bin only when we specially put them
there by way of snapcraft, which makes things a little harder on
non-subiquity clients.  Move them to bin, which is to say don't have
snapcraft put them in usr/bin.
2021-07-13 16:14:31 -06:00
Michael Hudson-Doyle aac56ae776 update curtin to get some raid container fixes 2021-07-07 08:40:33 +12:00
Michael Hudson-Doyle 8e253fb955 remove some apps from the snapcraft.yaml 2021-07-02 11:59:21 +12:00
Michael Hudson-Doyle 5f6695d9d3 add python3-yaml to build-packages (make-kbd-info.py now indirectly requires this) 2021-06-11 14:21:16 +12:00
Michael Hudson-Doyle c91245600c update probert 2021-06-10 10:04:41 +12:00
Michael Hudson-Doyle 4c03823b06 update probert to version that has mark-wlan-earlier merged 2021-06-03 11:29:49 +12:00
Michael Hudson-Doyle 4965f1000d update curtin 2021-04-16 09:12:00 +12:00
Michael Hudson-Doyle 83823515ca
Merge pull request #921 from mwhudson/no-mount-run
remove curtin hook to bind mount /run into target now curtin does this
2021-03-31 11:47:20 +13:00
Michael Hudson-Doyle c6185075c7 update curtin 2021-03-30 09:30:03 +13:00
Michael Hudson-Doyle fac360b8e7 remove curtin hook to bind mount /run into target now curtin does this
Curtin added this in version 19.3 so we can stop doing it.
2021-03-29 14:49:59 +13:00
Michael Hudson-Doyle 5d93eb824a process keyboard data into api friendly format when building snap
This is a bit sideways from the real thing I'm working on which is
moving most of the logic of keyboard handling to the server side but
anyway. This also lets me check some assumptions while processing the
data rather than in the view code.
2021-03-16 16:02:23 +13:00