Peter Hutterer [Thu, 17 Dec 2020 00:13:12 +0000 (10:13 +1000)]
Fix flake8 warnings
These are all whitespace fixes with a few exceptions:
- one "if not foo is None" -> "if foo is not None"
- one f"static string" changed to "static string"
- two "except Something as e" changed to "except Something" where e isn't
being used
Flake8 errors disabled:
501: line too long
504: line break after binary operator
741: ambiguous variable name
Flake8 errors left after this patch:
E241 multiple spaces after ','
F541 f-string is missing placeholders
Both of the above warnings are triggered by lines that are better left as-is
for consistency with the surrounding code.
Peter Hutterer [Wed, 16 Dec 2020 23:43:51 +0000 (09:43 +1000)]
Add backticks around the workspace command error
Better visual separation between the actual command and the full sentence.
We'll never have backticks in our command so unlike other quotes we don't have
to worry about escaping them, and at this point we're all used to backticks
for markdown anyway.
Daan De Meyer [Mon, 14 Dec 2020 22:19:22 +0000 (22:19 +0000)]
Explicitly specify dracut filesystem when using --hostonly-initrd
It seems dracut includes the host's filesystem when building a
hostonly image and not the image's filesystem. This causes issues
when these two don't match. Include the correct one explicitly
as a workaround.
Daan De Meyer [Fri, 11 Dec 2020 20:14:33 +0000 (20:14 +0000)]
Redirect non-redirected subprocesses output to stderr except build-script
When running a language server via mkosi, communication with the editor
is done via mkosi's stdin/stdout. If the client reads output from mkosi's
subprocesses instead of LSP json messages from stdout, it won't recognize
the output and crash. To make the language server integration work when the
build image needs to be built from scratch, we redirect all non-redirected
output from subprocesses to stderr except for the build-script. This way,
we can get progress output from mkosi right in the editor without breaking
the language server integration.
The split was already quite arbitrary in the first place. All of mkosi's messages
go to stderr and most subprocess output went to stdout. Instead, let's define
the split between stdout/stderr a bit more so we can take advantage of it.
Only the build script gets to write to stdout which simplifies language server
usage with mkosi.
Daan De Meyer [Sat, 12 Dec 2020 22:31:51 +0000 (22:31 +0000)]
Add --install-directory option
While binaries can already be retrieved using the --build-directory
option. Sometimes it's a lot easier to have access to the installed
contents instead. --install-directory allows accessing the contents
of /root/dest from the build container outside of the build image.
Daan De Meyer [Sat, 12 Dec 2020 23:00:22 +0000 (23:00 +0000)]
Create /usr/include with correct mode when --include-directory is used
Currently, when we're using --include-directory, /usr/include is created
by mount_bind() which creates /usr with 0700 (because makedirs mode
only applies to the leaf directory). Create /usr/include explicitly with
the correct mode to avoid permission warnings from pacman.
Daan De Meyer [Sat, 12 Dec 2020 22:55:36 +0000 (22:55 +0000)]
Empty include directory before installing to it
Pacman (and probably other package managers as well) expect
/usr/include to be empty when we're bootstrapping so let's make
sure we empty the directory before installing to it.
Daan De Meyer [Sat, 12 Dec 2020 14:19:41 +0000 (14:19 +0000)]
CI: Install mkosi explicitly
Since we'll soon be installing the latest stable version with the
action, let's modify CI already to do an explicit install that
installs mkosi with the latest changes from the PR.
Daan De Meyer [Sat, 12 Dec 2020 11:54:34 +0000 (11:54 +0000)]
CI: Simplify install step
Remove duplicate packages already installed by the Github Action.
Also, with the recent speedups in dpkg, we can now run the action
for Ubuntu and Debian as well without these becoming the major
bottleneck in CI.
Daan De Meyer [Fri, 11 Dec 2020 17:37:33 +0000 (17:37 +0000)]
Add --include-directory option
--include-directory makes the header files installed in the container
available on the host. This is useful when running a language server
such as clangd in the mkosi container. If we define a path mapping
in clangd from /usr/include to the include directory, we can jump
to all the header files of external dependencies in the include
directory right from the editor.
Daan De Meyer [Fri, 11 Dec 2020 00:08:27 +0000 (00:08 +0000)]
Allow build script to read from stdin when running in a script
When running language servers like clangd via a mkosi build-script,
we need clangd to be able to read from stdin to interact with the
editor. By default, systemd-nspawn doesn't do this for security
issues but in this case we trust the build script so we can specify
--pipe to enable the build script to read from stdin.
Daan De Meyer [Mon, 7 Dec 2020 21:41:52 +0000 (21:41 +0000)]
Arch: Switch back to using a single call to pacman
We shouldn't be working around dependency issues in Arch. I'm not
getting any failures using this anymore right now but if any turn
up, we should file bug reports for the relevant Arch packages to
add the necessary dependencies. Now that base is a metapackage and
not a group, the burden to add it as a dependency should be very
minimal.
Daan De Meyer [Sun, 6 Dec 2020 14:56:11 +0000 (14:56 +0000)]
Replace -boot c option with -nodefaults
-boot c doesn't actually change anything. Boot order when using
OVMF can only be changed by editing OVMF_VARS.fd. Instead, we
remove the default CDROM device by specifying -nodefaults and
add back the serial device manually. This avoids the boot warning
as well and saves a second on boot time.
Daan De Meyer [Sun, 6 Dec 2020 13:48:31 +0000 (13:48 +0000)]
Change QEMU boot order so it doesn't try the CD-ROM
Currently, when booting with QEMU, there's a log message about
QEMU trying to boot from the CD-ROM device but not finding anything
there. By changing the boot order, QEMU skips the CD-ROM device and
immediately boots our image.
Daan De Meyer [Sun, 6 Dec 2020 13:37:19 +0000 (13:37 +0000)]
Set COLUMNS and LINES to current terminal values when using --qemu-headless
By default, systemd uses 80x24 dimensions for terminal size when logging
in over the serial console. Just like we set TERM already when using
--qemu-headless, set COLUMNS and LINES as well so the serial terminal
can use the full size of the screen.
Daan De Meyer [Sun, 6 Dec 2020 13:16:08 +0000 (13:16 +0000)]
Fix all-ethernet.network permissions
systemd-networkd currently complains about the permissions for
all-ethernet (world-writable). Restrict the permissions so
systemd-networkd doesn't complain anymore.
Daan De Meyer [Sun, 6 Dec 2020 12:28:41 +0000 (12:28 +0000)]
Add --network-veth option
Sets up a virtual ethernet link between the host and the container/vm.
For boot, we just pass --network-veth to nspawn. For qemu, we set up
a TAP nic with the correct ifname so that it is picked up by
systemd-networkd on the host.
Daan De Meyer [Wed, 2 Dec 2020 19:57:48 +0000 (19:57 +0000)]
CI: Drop clear, photon, opensuse, openmandriva and mageia
The overhead of supporting these in CI is too big compared to the
benefit of maintaining them in CI. We can add back support for these
distros once a dedicated maintainer shows up willing to do the work.
Thore Bödecker [Fri, 21 Aug 2020 09:46:20 +0000 (11:46 +0200)]
run postinstall nspawn with loopdev if bootable
This enables nspawn blockdev access for the postinstall script when a
bootable image is being created.
(Needed in order to e.g. make changes to bootloader from within the
postinstall script.)
Also this commit deduplicates the code required for setting up these
nspawn parameters and moves it into a separate method, that is being
called from multiple places.
Thore Bödecker [Fri, 21 Aug 2020 09:34:38 +0000 (11:34 +0200)]
fix bootable CentOS 7 efi by using grub2-efi
First of all the `systemd-udev` package does not exist in the CentOS 7
repository and thus will cause the `dnf` step to always fail.
The `bootctl` / `systemd-boot` feature in CentOS 7 is very broken and
does not work.
To create bootable CentOS 7 EFI images, this commit switches to
`grub2-efi`.
Furthermore it will fail early if unified kernel images were not
explicitly disabled via the commandline switch. They are simply not
supported by grub.
There are some quirks when an EFI image is being built on a non-EFI
system, since grub2 will check for existence of `/sys/firmware/efi` and
only create an efi-compatible boot config if that directory exists.
Otherwise it will generate 16bit `linux16` and `initrd16` boot
entries, which are obviously incorrect. This is subsequently fixed
by patching the generated file.
Also the `grub2-efi` setup requires a more ellaborate nspawn setup,
just like `clr-boot-manager`
Thore Bödecker [Fri, 21 Aug 2020 09:24:04 +0000 (11:24 +0200)]
extend mkfs to support adding cmdline args
The `mkfs_<filesystem>()` methods have been renamed to
`mkfs_<filesystem>_cmd()` and just return the cmdline now.
This allows for some easier adjustments within `mkfs_generic()`.
The e2fsprogs packaged within CentOS 7 is very old and does not support
the `metadata_csum` ext4 feature.
This commit explicitly disables this feature upon filesystem creation.
Otherwise all e2fsprogs utilities will not work or misbehave within the
created image. (e.g. `tune2fs -l`)
Additionally this commit explicitly enabled the `64bit` feature for ext4
on supported architectures. Previously this might or might not have been
enabled by default, depending on the e2fsprogs version where mkosi is
running.
Thore Bödecker [Fri, 21 Aug 2020 09:18:29 +0000 (11:18 +0200)]
allow optional override of GPT first-lba header
Usage of this feature is totally optional and the defaults are actually
preferred, which should set the First (usable) Logical Byte Address to
sector 2048, leaving a 1MiB gap before the first partition.
However there might be a reason to override this, e.g. if the created
image is being altered later on by tools which need a different
first-lba value. One example would be the `prl_disk_tool` utility from
the Parallels virtualization suite.
Daan De Meyer [Thu, 20 Aug 2020 20:37:03 +0000 (21:37 +0100)]
Give prepare scripts access to SRCDIR.
There are often project specific files that contain the dependencies
necessary to be installed. Make sure the prepare script has access to
these files so the logic doesn't have to be repeated in the prepare
script itself.
Daan De Meyer [Mon, 17 Aug 2020 17:34:35 +0000 (18:34 +0100)]
CI: Add QEMU boot tests
Adding these gives us a clear idea of which setups should work and which
are broken. This helps with triaging issues since we can immediately see
if a setup is supposed to work or not. It also makes sure setups that do
work keep working in the future.
Currently, only Arch, CentOS and Fedora can boot on all included setups
(nspawn, UEFI + systemd-boot with unified kernel images, UEFI +
systemd-boot and BIOS). Debian, Ubuntu, OpenSUSE and Mageia fail
on UEFI without unified kernel images because their package managers
don't install any boot loader entries that systemd-boot can read.
Photon doesn't work on any of the setups. Clear also has a lot of issues
due to it using its own bootloader and OpenMandriva has QEMU failures.
For now, we disable all these but we hope support by them can be added
by interested contributors in the future.
Daan De Meyer [Sat, 22 Aug 2020 10:04:08 +0000 (11:04 +0100)]
Fix grub installation
If we don't mount /dev/block and /dev/disk into the container, grub will
add root=/dev/loop... to the kernel command line which breaks when
booting the image. If we mount these directories, grub will correctly
use the PARTUUID or UUID instead.
Daan De Meyer [Wed, 19 Aug 2020 20:13:28 +0000 (21:13 +0100)]
Arch: Handle no kernels installed case in kernel-install hook
If a bash glob doesn't match any files, it returns the glob itself which
trips up the current logic. Explicitly check if the file exists to avoid
this.