diff options
author | David P <megver83@parabola.nu> | 2022-02-09 18:44:49 -0300 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2022-02-09 18:44:49 -0300 |
commit | 3358f812eb1c05484a12f287685cef13a7d3d4a0 (patch) | |
tree | 276903cfc4a0175c2522774e3d5a6beef5353918 | |
parent | 84f3e5e706c32d4686b1fc79628498b37cbf4b02 (diff) |
sync with archiso v61v61
archiso:
a814f14 (HEAD -> master, tag: v61, origin/master, origin/HEAD) Add changelog for 61
5b95058 Limit CI pipelines on default branch and merge requests
549ce5b Set all build steps to be interruptable
21ca345 Limit triggering a CI build to change of non-code files
cd14387 Add contributing guideline about merge requests
8d2d779 Add info about adding a changelog entry for merge requests
6c1b466 Add the installation of latest archlinux-keyring to CI
720516e configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf: update ExecStart
18bb8c2 configs/*/airootfs/etc/systemd/network/20-ethernet.network: add a comment to document why an interface name glob is used
7cbd25d Merge remote-tracking branch 'origin/merge-requests/228'
8b1788e Add linux-firmware-marvell for Surface Pro 6 wi-fi
f822578 Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git
7426192 https://gitlab.archlinux.org/archlinux/archiso/-/issues/163
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r-- | CHANGELOG.rst | 18 | ||||
-rw-r--r-- | CONTRIBUTING.rst | 22 | ||||
-rw-r--r-- | configs/baseline/airootfs/etc/systemd/network/20-ethernet.network | 3 | ||||
-rw-r--r-- | configs/releng/airootfs/etc/systemd/network/20-ethernet.network | 7 | ||||
-rw-r--r-- | configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf | 2 | ||||
-rwxr-xr-x | parabolaiso/mkparabolaiso | 2 |
6 files changed, 50 insertions, 4 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 95d6dfd..c74d877 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,24 @@ Changed Removed ------- +[61] - 2022-01-31 +================= + +Added +----- + +- Add documentation to systemd-networkd configuration files +- Add information about the use of changelog and merge requests to the contributing guidelines + +Changed +------- + +- Fix an issue where mkparabolaiso is failing to raise an error when the ``mmd`` and ``mcopy`` commands are not found +- Fix an issue where the architecture detection in mkparabolaiso fails due to an unset ``arch`` variable in the profile + +Removed +------- + [60] - 2021-12-28 ================= diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 53ee73a..9ad94ad 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -19,6 +19,28 @@ All ash and bash scripts are linted using shellcheck: make lint +Changelog +========= + +When adding, changing or removing something in a merge request, add a sentence to the `CHANGELOG.rst <CHANGELOG.rst>`_ +explaining it. +The changelog entry needs to be added to the unreleased section at the top, as that section is used for the next +release. + +Merge requests and signed commits +================================= + +Merge requests are not required to contain signed commits (using ``git commit -S`` - see `man 1 git-commit +<https://man.archlinux.org/man/git-commit.1>`_). +The project maintainers may rebase a given merge request branch at their discretion (if possible), which may remove +signed commits. + +The tip of the project's default branch is required to be a signed commit by the project maintainers. +For external contributors this means, that their merge request will be merged using ``--no-ff`` (see `man 1 git-merge +<https://man.archlinux.org/man/git-merge.1>`_) in a signed merge commit, while contributions by the project maintainers +may be merged using ``--ff`` when the top-most commit of the source branch is signed by a valid PGP key of the given +maintainer. + Testing ======= diff --git a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network index e8842f2..4b6a2ab 100644 --- a/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/baseline/airootfs/etc/systemd/network/20-ethernet.network @@ -1,4 +1,7 @@ [Match] +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. Name=en* Name=eth* diff --git a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network index 0ac5028..9ada778 100644 --- a/configs/releng/airootfs/etc/systemd/network/20-ethernet.network +++ b/configs/releng/airootfs/etc/systemd/network/20-ethernet.network @@ -1,6 +1,9 @@ [Match] -Type=en* -Type=eth* +# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). +# See https://bugs.archlinux.org/task/70892 +# Instead match by globbing the network interface name. +Name=en* +Name=eth* [Network] DHCP=yes diff --git a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index d1d8474..b9d22eb 100644 --- a/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/configs/releng/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -1,3 +1,3 @@ [Service] ExecStart= -ExecStart=-/sbin/agetty --autologin root --noclear %I 38400 linux +ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root - $TERM diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 08349e3..5af1851 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -1287,6 +1287,7 @@ _read_profile() { # shellcheck source=configs/releng/profiledef.sh . "${profile}/profiledef.sh" + [[ -n "$arch" ]] || arch="$(uname -m)" if [[ "${arch}" == "dual" ]]; then # Resolve paths of files that are expected to reside in the profile's directory for each architecture [[ -n "$packages_dual" ]] || packages_files_dual=("${profile}/packages."{both,i686,x86_64}) @@ -1408,7 +1409,6 @@ _set_overrides() { fi # Set variables that do not have overrides - [[ -n "$arch" ]] || arch="$(uname -m)" [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs" [[ -n "$iso_name" ]] || iso_name="${app_name}" } |