Daan De Meyer [Wed, 6 Jan 2021 17:17:11 +0000 (18:17 +0100)]
Remove "quiet" and "rhgb" from default kernel cmdline
We seem to be running into boot issues semi-regularly in CI because
of the usage of systemd.volatile=overlay. These issues are hard to
debug because we silence boot output by default. Let's enable boot
output by default so we have an easier time debugging these issues
when they occur. Also, mkosi boot shows the same output on
container startup anyway so this brings qemu more in line with mkosi
boot as well.
Daan De Meyer [Tue, 5 Jan 2021 21:07:50 +0000 (22:07 +0100)]
Search for "mkosi.default.d" relative to working directory
Searching for the mkosi.default.d dir relative to the file passed
via --default makes it almost impossible to share common settings
between multiple configs when using --default as simply specifying
a config file via --default changes the location where common configs
are searched. Instead, let's simply look for mkosi.default.d in the
mkosi working directory regardless of the path passed to --default.
Daan De Meyer [Sun, 27 Dec 2020 17:47:49 +0000 (18:47 +0100)]
Arch: Remove network configuration
Let's pull Arch in line with the other distros and not do any network
configuration. If needed, we can add this back, but let's do it behind
an option that we implement for all distros so we at least have uniformity
between distros.
Daan De Meyer [Fri, 25 Dec 2020 15:49:33 +0000 (16:49 +0100)]
Drop centos from CI (but not centos_epel)
centos_epel should be sufficient testing for centos as well. By
dropping centos, we can test SSH in CI without needing extra logic
to exclude centos from the SSH tests because networkd isn't available
on stock centos without epel.
Luca Boccassi [Wed, 23 Dec 2020 19:39:47 +0000 (19:39 +0000)]
Debian: ensure efivars.ko is installed if uefi is used
When --hostonly is used, efivars.ko is missing and thus the bootloader
cannot get the UUID of the EFI partition and fails to pivot root.
Specify it manually with add_drivers+=efivarfs if building for Debian
with EFI.
Daan De Meyer [Wed, 23 Dec 2020 14:23:48 +0000 (15:23 +0100)]
Skip output clean/check when using --skip-final-phase
When using --skip-final-phase, we're not touching any of the output
artifacts so it doesn't make sense to clean the previous output artifacts
or block execution if they already exist.
Daan De Meyer [Mon, 21 Dec 2020 15:46:36 +0000 (16:46 +0100)]
Make --autologin work even when a root password is set
Currently, --autologin still asks for a password if the root
password is not explicitly deleted. By adding some PAM short circuit
rules for the relevant TTYs, we avoid PAM asking for the root password
when a user logs in on either pts/0 (nspawn) or ttyS0 (QEMU with
--qemu-headless).
Daan De Meyer [Mon, 21 Dec 2020 14:42:21 +0000 (15:42 +0100)]
Add --source-file-transfer-final option
When debugging in the final image using a debugger, the debugging
experience is greatly improved by having the source files available.
--source-file-transfer-final does exactly what --source-file-transfer
does but applies to the final image instead of the bulid image. While
supporting 'mount' might be possible, we don't do so yet because
the use case is unclear and configuring QEMU to pass through
folders is non-trivial.
Daan De Meyer [Mon, 21 Dec 2020 12:44:01 +0000 (13:44 +0100)]
Change --source-file-transfer default to copy-git-others
I've gotten bitten multiple times by the fact that by default,
untracked files in git are not copied into the build image. Let's
fix this by changing the --source-file-transfer default to
copy-git-others. This adds any untracked files to the build image
(but still excludes ignored files).
ValdikSS [Sun, 20 Dec 2020 12:23:02 +0000 (15:23 +0300)]
Add option to strip SELinux file context from tar'ed files
This option removes (or not includes) SELinux xattrs into output tar archive.
This is a hack as mkosi does not properly support SELinux contexts. See #130.
The patch adds `--tar-strip-selinux-context` flag and `TarStripSELinuxContext` configuration file option.
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.