From 94dd194c2294e447e0323bf8bc3cac8c381589b4 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Tue, 29 Dec 2020 23:19:44 +0100 Subject: add SSH server to baseline inspired by https://wiki.archlinux.org/index.php/Archiso#Prepare_an_ISO_for_an_installation_via_SSH --- .../airootfs/etc/systemd/system/multi-user.target.wants/sshd.service | 1 + 1 file changed, 1 insertion(+) create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service (limited to 'configs/baseline/airootfs/etc/systemd/system') diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service new file mode 120000 index 0000000..d21ebd9 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/sshd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/sshd.service \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 744b8f13ed04a3c34e15cd4011d97b6dfa5a1a19 Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Tue, 29 Dec 2020 23:26:54 +0100 Subject: make baseline have working ethernet networking, like releng --- .../airootfs/etc/systemd/network/20-ethernet.network | 13 +++++++++++++ .../system/multi-user.target.wants/systemd-networkd.service | 1 + .../system/multi-user.target.wants/systemd-resolved.service | 1 + .../systemd-networkd-wait-online.service | 1 + .../system/sockets.target.wants/systemd-networkd.socket | 1 + .../wait-for-only-one-interface.conf | 5 +++++ 6 files changed, 22 insertions(+) create mode 100644 configs/baseline/airootfs/etc/systemd/network/20-ethernet.network create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket create mode 100644 configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf (limited to 'configs/baseline/airootfs/etc/systemd/system') diff --git a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network new file mode 100644 index 0000000..efa309c --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network @@ -0,0 +1,13 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +[Match] +Name=en* +Name=eth* + +[Network] +DHCP=yes +IPv6PrivacyExtensions=yes + +[DHCP] +RouteMetric=512 diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service new file mode 120000 index 0000000..4c158e6 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-networkd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service new file mode 120000 index 0000000..4f6ae34 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/systemd-resolved.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service b/configs/baseline/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service new file mode 120000 index 0000000..7d6ad92 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd-wait-online.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket b/configs/baseline/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket new file mode 120000 index 0000000..51942c8 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/sockets.target.wants/systemd-networkd.socket @@ -0,0 +1 @@ +/usr/lib/systemd/system/systemd-networkd.socket \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf new file mode 100644 index 0000000..a4d7442 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -0,0 +1,5 @@ +# +# SPDX-License-Identifier: GPL-3.0-or-later + +[Service] +ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any -- cgit v1.2.3-70-g09d2 From e7306a309cd83870a54a1e20618091d3b730bc2b Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Wed, 30 Dec 2020 03:53:40 +0100 Subject: add cloud-init to baseline --- .../etc/systemd/system/cloud-init.target.wants/cloud-config.service | 1 + .../etc/systemd/system/cloud-init.target.wants/cloud-final.service | 1 + .../etc/systemd/system/cloud-init.target.wants/cloud-init-local.service | 1 + .../etc/systemd/system/cloud-init.target.wants/cloud-init.service | 1 + configs/baseline/packages.x86_64 | 1 + 5 files changed, 5 insertions(+) create mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service (limited to 'configs/baseline/airootfs/etc/systemd/system') diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service new file mode 120000 index 0000000..ebc50f0 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-config.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-config.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service new file mode 120000 index 0000000..80fa3c8 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-final.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-final.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service new file mode 120000 index 0000000..dd8e9f1 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-local.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-init-local.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service new file mode 120000 index 0000000..24c7a26 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-init.service \ No newline at end of file diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index efd2417..251e122 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -1,6 +1,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later base +cloud-init linux mkinitcpio mkinitcpio-archiso -- cgit v1.2.3-70-g09d2 From bd2b861aa39167e4fc658a354071b95fbd050c0f Mon Sep 17 00:00:00 2001 From: nl6720 Date: Tue, 27 Apr 2021 09:24:33 +0300 Subject: configs/*: add VM guest packages and enable their services * virtualbox-guest-utils-nox package and vboxservice.service for VirtualBox. * qemu-guest-agent package and qemu-guest-agent.service for QEMU & libvirt. Implements #118. --- .../etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service | 1 + .../etc/systemd/system/multi-user.target.wants/vboxservice.service | 1 + configs/baseline/packages.x86_64 | 2 ++ .../etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service | 1 + .../etc/systemd/system/multi-user.target.wants/vboxservice.service | 1 + configs/releng/packages.x86_64 | 2 ++ 6 files changed, 8 insertions(+) create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service create mode 120000 configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service (limited to 'configs/baseline/airootfs/etc/systemd/system') diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service new file mode 120000 index 0000000..cb2d560 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vboxservice.service \ No newline at end of file diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index 251e122..cadea18 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -6,4 +6,6 @@ linux mkinitcpio mkinitcpio-archiso openssh +qemu-guest-agent syslinux +virtualbox-guest-utils-nox diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service new file mode 120000 index 0000000..cb2d560 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vboxservice.service \ No newline at end of file diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64 index a3d6f79..434ffd2 100644 --- a/configs/releng/packages.x86_64 +++ b/configs/releng/packages.x86_64 @@ -79,6 +79,7 @@ partimage pcsclite ppp pptpclient +qemu-guest-agent reflector reiserfsprogs rp-pppoe @@ -103,6 +104,7 @@ usb_modeswitch usbmuxd usbutils vim +virtualbox-guest-utils-nox vpnc wireless-regdb wireless_tools -- cgit v1.2.3-70-g09d2 From 8fa110e9d71efef57a4d843e54bdff2fe3085e26 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Sun, 11 Jul 2021 17:15:23 +0300 Subject: configs/*/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf: document why the drop-in file exists Related to #142. Add missing `ExecStart=` to baseline's /etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf. --- .../wait-for-only-one-interface.conf | 4 ++++ .../wait-for-only-one-interface.conf | 3 +++ 2 files changed, 7 insertions(+) (limited to 'configs/baseline/airootfs/etc/systemd/system') diff --git a/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index a4d7442..191db81 100644 --- a/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,5 +1,9 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# Allow systemd-networkd-wait-online to succeed with one interface, otherwise, if multiple network interfaces exist, +# network-online.target gets needlessly delayed. +# See https://wiki.archlinux.org/title/systemd-networkd#systemd-networkd-wait-online [Service] +ExecStart= ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any diff --git a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index 1b4c091..191db81 100644 --- a/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/releng/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,6 +1,9 @@ # # SPDX-License-Identifier: GPL-3.0-or-later +# Allow systemd-networkd-wait-online to succeed with one interface, otherwise, if multiple network interfaces exist, +# network-online.target gets needlessly delayed. +# See https://wiki.archlinux.org/title/systemd-networkd#systemd-networkd-wait-online [Service] ExecStart= ExecStart=/usr/lib/systemd/systemd-networkd-wait-online --any -- cgit v1.2.3-70-g09d2 From f4324e2f814733e711ba29b1b0272dc593e014bc Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 29 Jul 2021 20:45:08 +0200 Subject: Remove SPDX license identifier from releng configs configs/baseline/*: Remove the SPDX license identifier comment from the configuration files in the profile, as they are not eligible for copyright. --- configs/baseline/airootfs/etc/mkinitcpio.conf | 3 --- configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset | 3 --- configs/baseline/airootfs/etc/systemd/network/20-ethernet.network | 3 --- .../wait-for-only-one-interface.conf | 3 --- configs/baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf | 3 --- .../baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf | 3 --- configs/baseline/efiboot/loader/loader.conf | 3 --- configs/baseline/packages.x86_64 | 2 -- configs/baseline/pacman.conf | 2 -- configs/baseline/syslinux/syslinux-linux.cfg | 3 --- configs/baseline/syslinux/syslinux.cfg | 3 --- 11 files changed, 31 deletions(-) (limited to 'configs/baseline/airootfs/etc/systemd/system') diff --git a/configs/baseline/airootfs/etc/mkinitcpio.conf b/configs/baseline/airootfs/etc/mkinitcpio.conf index 4b7b7fb..34b1a06 100644 --- a/configs/baseline/airootfs/etc/mkinitcpio.conf +++ b/configs/baseline/airootfs/etc/mkinitcpio.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # vim:set ft=sh # MODULES # The following modules are loaded before any boot hooks are diff --git a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset index d35f137..9f67184 100644 --- a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset +++ b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # mkinitcpio preset file for the 'linux' package on archiso PRESETS=('archiso') diff --git a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network index 9157e96..e8842f2 100644 --- a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - [Match] Name=en* Name=eth* diff --git a/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf b/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf index 191db81..c9f9bce 100644 --- a/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf +++ b/configs/baseline/airootfs/etc/systemd/system/systemd-networkd-wait-online.service.d/wait-for-only-one-interface.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - # Allow systemd-networkd-wait-online to succeed with one interface, otherwise, if multiple network interfaces exist, # network-online.target gets needlessly delayed. # See https://wiki.archlinux.org/title/systemd-networkd#systemd-networkd-wait-online diff --git a/configs/baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/configs/baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf index 8dd7a16..11624b6 100644 --- a/configs/baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/configs/baseline/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - title Arch Linux (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img diff --git a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf b/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf index c5e9ab9..d66f5a6 100644 --- a/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf +++ b/configs/baseline/efiboot/loader/entries/02-archiso-x86_64-ram-linux.conf @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - title Arch Linux (x86_64, UEFI) Copy to RAM linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img diff --git a/configs/baseline/efiboot/loader/loader.conf b/configs/baseline/efiboot/loader/loader.conf index beacd81..17110fa 100644 --- a/configs/baseline/efiboot/loader/loader.conf +++ b/configs/baseline/efiboot/loader/loader.conf @@ -1,5 +1,2 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - timeout 3 default 01-archiso-x86_64-linux.conf diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64 index 224f7f0..0a64120 100644 --- a/configs/baseline/packages.x86_64 +++ b/configs/baseline/packages.x86_64 @@ -1,5 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later base cloud-init linux diff --git a/configs/baseline/pacman.conf b/configs/baseline/pacman.conf index adb1ea8..5ee6c1e 100644 --- a/configs/baseline/pacman.conf +++ b/configs/baseline/pacman.conf @@ -2,8 +2,6 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS diff --git a/configs/baseline/syslinux/syslinux-linux.cfg b/configs/baseline/syslinux/syslinux-linux.cfg index ced6801..6bfd0c3 100644 --- a/configs/baseline/syslinux/syslinux-linux.cfg +++ b/configs/baseline/syslinux/syslinux-linux.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - LABEL arch MENU LABEL Arch Linux (x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg index f35f0c2..561ac7c 100644 --- a/configs/baseline/syslinux/syslinux.cfg +++ b/configs/baseline/syslinux/syslinux.cfg @@ -1,6 +1,3 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later - SERIAL 0 115200 UI menu.c32 MENU TITLE Arch Linux -- cgit v1.2.3-70-g09d2