From 73bb680596b50aeb61f59fb203510a8f35c9c4b3 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Feb 24 2022 17:29:11 +0000 Subject: Add back deleted files from the main branch To further reduce the diff with the main branch, let's add back the deleted files from the main branch branch. Note that while we add back the files, we don't add them back to the spec itself, so they'll exist but won't be used. Adding the files back allows us to merge changes from the main branch into the hyperscale branch without running into merge conflicts because the file was modified in the main branch but we deleted it. It also makes it easier at a glance to compare the diff from the hyperscale branch with the main branch since the diff will be smaller. The files were taken from commit 46a40810, which is the commit that c8s-hyperscale-sig was based on for the 249-4 release. --- diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..591bb8a --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,5 @@ +- project: + vars: + install_repo_exclude: + - systemd-standalone-tmpfiles + - systemd-standalone-sysuser diff --git a/inittab b/inittab new file mode 100644 index 0000000..3f5e83c --- /dev/null +++ b/inittab @@ -0,0 +1,16 @@ +# inittab is no longer used. +# +# ADDING CONFIGURATION HERE WILL HAVE NO EFFECT ON YOUR SYSTEM. +# +# Ctrl-Alt-Delete is handled by /usr/lib/systemd/system/ctrl-alt-del.target +# +# systemd uses 'targets' instead of runlevels. By default, there are two main targets: +# +# multi-user.target: analogous to runlevel 3 +# graphical.target: analogous to runlevel 5 +# +# To view current default target, run: +# systemctl get-default +# +# To set a default target, run: +# systemctl set-default TARGET.target diff --git a/owner-check.sh b/owner-check.sh new file mode 100755 index 0000000..3273a3f --- /dev/null +++ b/owner-check.sh @@ -0,0 +1,53 @@ +#!/bin/bash +set -e + +verb="$1" + +[ "$verb" = "-s" ] && do_send=1 || do_send= + +[ -n "$do_send" ] && [ -z "$server" -o -z "login" ] && { echo '$server and $login need to be set'; exit 1; } + +header= +from=systemd-maint@fedoraproject.org +time='2 years ago' +# time='1 day ago' +port=587 + +for user in "$@"; do + echo "checking $user…" + + p=$(git log -1 --all --author "$user") + if [ -z "$p" ]; then + echo "No commits from $user, check spelling" + exit 1 + fi + + t=$(git shortlog --all --author "$user" --since "@{$time}" | wc -l) + if [ $t != 0 ]; then + echo "$t commits in the last two years, OK" + echo + continue + fi + + echo "$p" | head -n6 + echo ".. adding to list" + + if [ -z "$header" ]; then + echo '$USER$;$EMAIL$' >.mail.list + header=done + fi + + echo "$user;$user@fedoraproject.org" >>.mail.list + echo +done + +[ -z "$header" ] && exit 0 +[ -n "$do_send" ] || exit 0 + +echo "Sending mails…" +set -x +massmail -F "$from" \ + -C "$from" \ + -S 'write access to the fedora systemd package' \ + -z "$server" -u "$login" -P "$port" \ + .mail.list /tmp/avc.log && result=fail + ausearch -m avc -m selinux_err -m user_avc -ts boot &>> /tmp/avc.log + grep -q '' /tmp/avc.log || result=fail + echo -e "\nresults:\n- test: reboot and collect AVC\n result: $result\n logs:\n - avc.log\n\n" > /tmp/results.yml + ( [ $result = "pass" ] && echo PASS test-reboot || echo FAIL test-reboot ) > /tmp/test.log + + always: + - name: Pull out the artifacts + fetch: + dest: "{{ artifacts }}/" + src: "{{ item }}" + flat: yes + with_items: + - /tmp/test.log + - /tmp/avc.log + - /tmp/results.yml diff --git a/use-bfq-scheduler.patch b/use-bfq-scheduler.patch new file mode 100644 index 0000000..d0e6762 --- /dev/null +++ b/use-bfq-scheduler.patch @@ -0,0 +1,41 @@ +From 223ea50950f97ed4e67311dfcffed7ffc27a7cd3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 14 Aug 2019 15:57:42 +0200 +Subject: [PATCH] udev: use bfq as the default scheduler + +As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828. +Test results are that bfq seems to behave better and more consistently on +typical hardware. The kernel does not have a configuration option to set +the default scheduler, and it currently needs to be set by userspace. + +See the bug for more discussion and links. +--- + rules.d/60-block-scheduler.rules | 5 +++++ + rules.d/meson.build | 1 + + 2 files changed, 6 insertions(+) + create mode 100644 rules.d/60-block-scheduler.rules + +diff --git a/rules.d/60-block-scheduler.rules b/rules.d/60-block-scheduler.rules +new file mode 100644 +index 0000000000..480b941761 +--- /dev/null ++++ b/rules.d/60-block-scheduler.rules +@@ -0,0 +1,6 @@ ++# do not edit this file, it will be overwritten on update ++ ++ACTION=="add", SUBSYSTEM=="block", \ ++ KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \ ++ ENV{DEVTYPE}=="disk", \ ++ ATTR{queue/scheduler}="bfq" +diff --git a/rules.d/meson.build b/rules.d/meson.build +index ca4445d774..38d6aa6970 100644 +--- a/rules.d/meson.build ++++ b/rules.d/meson.build +@@ -3,6 +3,7 @@ + rules = files(''' + 60-autosuspend.rules + 60-block.rules ++ 60-block-scheduler.rules + 60-cdrom_id.rules + 60-drm.rules + 60-evdev.rules