Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump systemd/mkosi from 93098e2406e12ea7f06f962d4808952b8a06d345 to d13ff85610c6fb01a2fff0a8187729ebe4a05595 #166

Open
wants to merge 95 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
eb76587
bootctl: Make sure bootctl install returns 0 on success
DaanDeMeyer May 24, 2022
011161d
Revert "core/device: ignore DEVICE_FOUND_UDEV bit on switching root"
bluca May 24, 2022
dcda9f3
kernel-install: ignore extra args passed when invoked as installkernel
keszybz May 24, 2022
e6b1694
Revert "Revert "core/device: ignore DEVICE_FOUND_UDEV bit on switchin…
yuwata May 26, 2022
165279a
test: cover initrd->sysroot transition in TEST-24
mrc0mmand May 25, 2022
dd46f03
test: generate a custom initrd for TEST-24 if $INITRD is unset
mrc0mmand May 26, 2022
b3781ad
test: store the key on a separate device
mrc0mmand May 26, 2022
4f86dd2
core/device: device_coldplug(): don't set DEVICE_DEAD
mwilck May 25, 2022
131206d
core/device: do not downgrade device state if it is already enumerated
yuwata May 20, 2022
e10683b
test-seccomp: check for CAP_IPC_OWNER before calling shmat()
anitazha May 24, 2022
4bd2056
[sd-boot] improve documentation of beep
rahilarious May 25, 2022
d5be915
loader.conf: Clarify the default value of timeout.
Edu4rdSHL May 26, 2022
0d3ba82
man/systemd.automount: move the main description up and clarify deps
keszybz May 20, 2022
7a73f99
man/automount: say that automounts should not be nested
keszybz May 26, 2022
7c2b2f2
man/shutdown: explain -h more
keszybz May 26, 2022
11b8069
man/sd-bus: discuss negative-return values and add example
keszybz May 26, 2022
cfd6a14
man/homectl: adjust man page to match code
keszybz May 26, 2022
f8bb8d4
shared/find-esp: fix inverted check for XBOOTLDR type
keszybz May 26, 2022
0239991
test: bump the post-reboot expect() timeout
mrc0mmand May 27, 2022
f007166
sd-hwdb: include sys/stat.h in hwdb-internal.h
enr0n May 26, 2022
a5c4e29
sd-bus: fix buffer overflow
yuwata May 26, 2022
75a700e
tests: link tests using fabs against libm explicitly
evverx May 26, 2022
c6dd6af
kernel-install: actually ignore the last two arguments
nabijaczleweli May 26, 2022
e01f55d
kernel-install: don't log each initrd on its own line in verbose mode
nabijaczleweli May 26, 2022
1961d84
cgroup-util: Properly handle conditions where cgroup.threads is empty…
msizanoen1 May 30, 2022
f44e534
seccomp: fix a typo in error message
mrc0mmand May 31, 2022
865b5fb
shared/utmp-wtmp: pass information if entry is local to filter function
keszybz May 31, 2022
befd876
logind: do not print wall messages to local pseudoterminals
keszybz May 31, 2022
423c60a
login: do not issue wall messages on local terminals for suspend and …
cgzones May 27, 2022
7ee5cde
resolved: define source address for proxy-only stub replies
bnf May 31, 2022
98a39c3
man: add missing arguments to systemd-creds synopsis
aafeijoo-suse Jun 2, 2022
761fc09
sha256: use memcpy() when result buffer is unaligned
yuwata May 31, 2022
01dca14
test: add test for sha256
yuwata Jun 2, 2022
eceaa72
shared/bpf: install log callback and suppress most messages from libbpf
keszybz Jun 1, 2022
1b45118
core: define a helper function for basic bpf checks
keszybz Jun 1, 2022
b9f0194
various: add %m in messages
keszybz Jun 1, 2022
2530526
core/bpf: prefix log messages from different bpf subsystems
keszybz Jun 2, 2022
5c3ab8b
[DEB] Do not require a valid version when parsing sd-boot loader entries
viccie30 Nov 14, 2021
a82c03f
[DEB] sha256: fix compilation on efi-ia32
keszybz Jun 3, 2022
0004101
[DEB] Move homectl and userdbctl to bindir
mbiebl May 28, 2022
b2dcfd5
[DEB] meson: install libsystemd-shared into rootpkglibdir
mbiebl Jun 1, 2022
47e5e78
[DEB] shellcheck-clean kernel-install again
nabijaczleweli May 22, 2022
5ba6efb
[DEB] shared/microhttp-util: silence gcc warning
keszybz Jun 5, 2022
017d2c3
[DEB] Use Debian specific config files
mbiebl Jul 18, 2013
9746125
[DEB] Bring tmpfiles.d/tmp.conf in line with Debian defaults
tfheen Jun 5, 2012
6c7669f
[DEB] Make /run/lock tmpfs an API fs
mbiebl Sep 4, 2014
1c4d344
[DEB] Add support for TuxOnIce hibernation
jmuchemb Apr 29, 2014
a018e97
[DEB] Re-enable journal forwarding to syslog
martinpitt Nov 28, 2014
fa103db
[DEB] Don't enable audit by default
martinpitt Dec 28, 2014
49300dc
[DEB] Only start logind if dbus is installed
martinpitt Feb 9, 2015
d3d2416
[DEB] fsckd daemon for inter-fsckd communication
didrocks May 22, 2015
e91de31
[DEB] Skip filesystem check if already done by the initramfs
nmartensen Jan 19, 2016
d0b3dc6
[DEB] Revert "core: one step back again, for nspawn we actually can't…
martinpitt Apr 27, 2015
4b2eede
[DEB] Revert "core: set RLIMIT_CORE to unlimited by default"
martinpitt Feb 27, 2016
e8c394c
[DEB] Let graphical-session-pre.target be manually started
iainlane Aug 22, 2016
7fa3cc7
[DEB] Add env variable for machine ID path
Jan 18, 2017
521ef14
[DEB] deny-list-upstream-test-25
Nov 6, 2019
8b802fe
[DEB] deny-list-upstream-test-02-ppc64el
Nov 6, 2019
a70f3d1
[DEB] udev: drop SystemCallArchitectures=native from systemd-udevd.se…
mbiebl Nov 19, 2019
dc5c7e3
[DEB] Move sysusers.d/sysctl.d/binfmt.d/modules-load.d back to /usr
mbiebl Oct 15, 2020
2213f49
[DEB] systemctl: do not shutdown immediately on scheduled shutdown
joalif Dec 17, 2020
060aec4
[DEB] Downgrade a couple of warnings to debug
mbiebl Feb 15, 2021
0c77b9c
[DEB] Do not fail EFI build with newer binutils
mbiebl Jun 22, 2022
f81aad1
shared: Implement a [white/black]list mechanism for sleep operations
Apr 24, 2015
f7e4940
shared: install an empty sleep-products.conf file under /etc/systemd
Apr 24, 2015
036448f
Disable hibernate and hybrid-sleep by default
mcatanzaro Sep 21, 2016
b43dcd0
Enable suspend by default
dsd May 16, 2017
1ecc9fe
sleep-products: Disable suspend on the Mission One
jprvita Mar 5, 2020
98a4679
[Endless] gpt-auto-generator: Allow non-root to read the ESP in /boot
jprvita Mar 19, 2020
cc75b87
[Endless] test: Fix test-path-util with different build / host split-usr
jprvita Feb 21, 2018
a67ce11
[Endless] Disable coredump processing by default
jprvita Feb 5, 2020
29b9cb1
[Endless] base-filesystem: Only link /lib64 to /usr/lib64
dbnicholson Jul 13, 2016
2c586eb
[Endless] journald.conf: set RuntimeMaxUse=4M by default
cosimoc Nov 14, 2014
5ed0095
[Endless] journald.conf: Set the maximum on-disk joural size to 50 MiB
treitter Apr 3, 2018
8d218f7
[Endless] fsck: Do not fail when fsck returns an error
jprvita Jul 31, 2019
6bec5d4
[Endless] fstab: always mount sysroot rw
dsd Nov 14, 2014
468eab7
[Endless] rules: persistent-storage: Enable 'blkid' for CDROM
Jan 23, 2017
13cc1b7
[Endless] rules: Set mode 0666 for devices in the dialout group
jprvita Jun 19, 2018
9806a3d
[Endless] sd-boot: Read fake symlinks
Jun 20, 2019
e8826df
[Endless] sd-boot: Combine command line parameters for payg
Aug 21, 2019
9a05c25
[Endless] efi-stub: Allow any kernel parameters when not in secure bo…
Aug 28, 2019
855dd91
[Endless] sd-boot: Work around odd behaviour in some firmware
Sep 16, 2019
80f00d6
[Endless] units: Do not enable systemd-boot-system-token.service
jprvita Mar 17, 2020
09596e4
[Endless] Revert "test-mountpoint-util: run test in private mount nam…
jprvita Feb 1, 2021
40e1e21
[Endless] meson: Hardcode SBAT info
jprvita Jul 23, 2022
88e1303
test: Drop close_all_fds in test-fd-util
jprvita Jul 23, 2022
6bff1d2
test: Drop bind_remount_one and bind_remount_recursive in test-mount-…
jprvita Jul 23, 2022
e12b5a1
Revert "[Endless] sd-boot: Work around odd behaviour in some firmware"
starnight Sep 27, 2022
23c8621
Merge pull request #150 from endlessm/T33759
jprvita Sep 27, 2022
600b1dd
Revert "[DEB] Bring tmpfiles.d/tmp.conf in line with Debian defaults"
jprvita Feb 5, 2020
6773bed
Merge pull request #151 from endlessm/T33887
jprvita Oct 5, 2022
75e4ccd
meson: Fix build with --optimization=plain
medhefgo Oct 9, 2022
9738984
Merge pull request #163 from endlessm/fix-build-meson-1.0
starnight Feb 22, 2023
d4832bd
gpt-auto-generator: mount ESP when LoaderDevicePartUUID isn't set
dbnicholson Feb 14, 2023
d83b9b8
build(deps): bump systemd/mkosi
dependabot[bot] Mar 1, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: cover initrd->sysroot transition in TEST-24
This should cover cases regarding devices with `OPTIONS+="db_persist"`
during initrd->sysroot transition.

See:
  * systemd/systemd#23429
  * systemd/systemd#23218
  * systemd/systemd#23489
  * https://bugzilla.redhat.com/show_bug.cgi?id=2087225
(cherry picked from commit 1fb7f8e)
  • Loading branch information
mrc0mmand authored and yuwata committed May 27, 2022
commit 165279a79d9453101b39386773239f7df0b6ade7
63 changes: 30 additions & 33 deletions test/TEST-24-CRYPTSETUP/test.sh
Original file line number Diff line number Diff line change
@@ -10,20 +10,27 @@ TEST_FORCE_NEWIMAGE=1
# shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions"

PART_UUID="deadbeef-dead-dead-beef-000000000000"
DM_NAME="test24_varcrypt"
# Mount the keyfile only in initrd (hence rd.luks.key), since it resides on
# the rootfs and we would get a (harmless) error when trying to mount it after
# switching root (since rootfs is already mounted)
KERNEL_APPEND+=" rd.luks=1 luks.name=$PART_UUID=$DM_NAME rd.luks.key=$PART_UUID=/etc/varkey:LABEL=systemd_boot"

check_result_qemu() {
local ret=1

mount_initdir
[[ -e "${initdir:?}/testok" ]] && ret=0
[[ -f "$initdir/failed" ]] && cp -a "$initdir/failed" "${TESTDIR:?}"

cryptsetup luksOpen "${LOOPDEV:?}p2" varcrypt <"$TESTDIR/keyfile"
mount /dev/mapper/varcrypt "$initdir/var"
cryptsetup luksOpen "${LOOPDEV:?}p2" "${DM_NAME:?}" <"$TESTDIR/keyfile"
mount "/dev/mapper/$DM_NAME" "$initdir/var"
save_journal "$initdir/var/log/journal"
check_coverage_reports "${initdir:?}" || ret=5
_umount_dir "$initdir/var"
_umount_dir "$initdir"
cryptsetup luksClose /dev/mapper/varcrypt
cryptsetup luksClose "/dev/mapper/$DM_NAME"

[[ -f "$TESTDIR/failed" ]] && cat "$TESTDIR/failed"
echo "${JOURNAL_LIST:-No journals were saved}"
@@ -36,45 +43,35 @@ test_create_image() {
create_empty_image_rootdir

echo -n test >"${TESTDIR:?}/keyfile"
cryptsetup -q luksFormat --pbkdf pbkdf2 --pbkdf-force-iterations 1000 "${LOOPDEV:?}p2" "$TESTDIR/keyfile"
cryptsetup luksOpen "${LOOPDEV}p2" varcrypt <"$TESTDIR/keyfile"
mkfs.ext4 -L var /dev/mapper/varcrypt
cryptsetup -q luksFormat --uuid="$PART_UUID" --pbkdf pbkdf2 --pbkdf-force-iterations 1000 "${LOOPDEV:?}p2" "$TESTDIR/keyfile"
cryptsetup luksOpen "${LOOPDEV}p2" "${DM_NAME:?}" <"$TESTDIR/keyfile"
mkfs.ext4 -L var "/dev/mapper/$DM_NAME"
mkdir -p "${initdir:?}/var"
mount /dev/mapper/varcrypt "$initdir/var"

# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
# shellcheck source=/dev/null
source <(udevadm info --export --query=env --name=/dev/mapper/varcrypt)
# shellcheck source=/dev/null
source <(udevadm info --export --query=env --name="${LOOPDEV}p2")

setup_basic_environment
mask_supporting_services

install_dmevent
generate_module_dependencies
cat >"$initdir/etc/crypttab" <<EOF
$DM_NAME UUID=$ID_FS_UUID /etc/varkey
EOF
echo -n test >"$initdir/etc/varkey"
ddebug <"$initdir/etc/crypttab"
mount "/dev/mapper/$DM_NAME" "$initdir/var"

LOG_LEVEL=5

setup_basic_environment
mask_supporting_services

install_dmevent
generate_module_dependencies

echo -n test >"$initdir/etc/varkey"

cat >>"$initdir/etc/fstab" <<EOF
/dev/mapper/varcrypt /var ext4 defaults 0 1
cat >>"$initdir/etc/fstab" <<EOF
/dev/mapper/$DM_NAME /var ext4 defaults 0 1
EOF

# Forward journal messages to the console, so we have something
# to investigate even if we fail to mount the encrypted /var
echo ForwardToConsole=yes >> "$initdir/etc/systemd/journald.conf"
)
# Forward journal messages to the console, so we have something
# to investigate even if we fail to mount the encrypted /var
echo ForwardToConsole=yes >> "$initdir/etc/systemd/journald.conf"
}

cleanup_root_var() {
ddebug "umount ${initdir:?}/var"
mountpoint "$initdir/var" && umount "$initdir/var"
[[ -b /dev/mapper/varcrypt ]] && cryptsetup luksClose /dev/mapper/varcrypt
[[ -b "/dev/mapper/${DM_NAME:?}" ]] && cryptsetup luksClose "/dev/mapper/$DM_NAME"
}

test_cleanup() {