diff options
| -rw-r--r-- | debian/changelog | 23 | ||||
| -rw-r--r-- | debian/control | 65 | ||||
| -rwxr-xr-x | debian/extra/gen-signing-template | 45 | ||||
| -rw-r--r-- | debian/not-installed | 1 | ||||
| -rwxr-xr-x | debian/rules | 18 | ||||
| -rw-r--r-- | debian/signing-template/README.source | 4 | ||||
| -rw-r--r-- | debian/signing-template/control | 26 | ||||
| -rw-r--r-- | debian/signing-template/install | 1 | ||||
| -rwxr-xr-x | debian/signing-template/rules | 18 | ||||
| -rw-r--r-- | debian/signing-template/source/format | 1 | ||||
| -rw-r--r-- | debian/systemd-boot-efi.manpages | 1 | ||||
| -rw-r--r-- | debian/systemd-boot.manpages | 3 | ||||
| -rwxr-xr-x | debian/systemd-container.install | 5 | ||||
| -rwxr-xr-x | debian/systemd-container.manpages | 9 | ||||
| -rw-r--r-- | debian/systemd-cryptsetup.install | 25 | ||||
| -rw-r--r-- | debian/systemd-cryptsetup.manpages | 12 | ||||
| -rw-r--r-- | debian/systemd-repart.install | 5 | ||||
| -rw-r--r-- | debian/systemd-repart.manpages | 3 | ||||
| -rwxr-xr-x | debian/systemd-standalone-shutdown.install | 2 | ||||
| -rw-r--r-- | debian/systemd-standalone-shutdown.manpages | 1 | ||||
| -rwxr-xr-x | debian/systemd.install | 35 | ||||
| -rwxr-xr-x | debian/systemd.manpages | 26 | ||||
| -rw-r--r-- | debian/tests/control | 5 |
23 files changed, 268 insertions, 66 deletions
diff --git a/debian/changelog b/debian/changelog index f3b99b9..56f4f58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +systemd (256-2) experimental; urgency=medium + + * Add templated packages for UEFI Secure Boot signing of systemd-boot. + * Add systemd-standalone-shutdown package for exitrds. Allows building + minimal exitrd images, used to gracefully cleanup complex root + filesystems storage. Not intended for normal systems. + * Add systemd-repart package to reduce dependencies sd-repart pulls in + several libraries that binaries in the main systemd package do not + need, so split it out to reduce the dependencies of the main package + * Add systemd-cryptsetup package to reduce dependencies sd- + cryptsetup/integritysetup/veritysetup pull in several libraries that + other files in the main systemd package do not need, so split them out + to reduce the dependencies of the main package + * Move sd-sysupdate to systemd-container + * Move importd manpages to systemd-container, where the binaries are. + Left behind when importd was moved + * Move systemd-boot/stub manpages to systemd-boot. The EFI packages + should just have the EFI binaries, no point in duplicating the docs. + And the stub manpage should also be in the boot package, not the main + package. + + -- Luca Boccassi <bluca@debian.org> Wed, 12 Jun 2024 01:30:51 +0100 + systemd (256-1~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/control b/debian/control index 71b3817..0f657f3 100644 --- a/debian/control +++ b/debian/control @@ -79,6 +79,7 @@ Build-Depends: debhelper-compat (= 13), python3-lxml:native, python3-pefile:native <!stage1 !nocheck> <!stage1 !noinsttest>, python3-pyelftools [amd64 i386 arm64 armhf riscv64] <!stage1>, + jq [amd64 arm64] <!stage1 !pkg.systemd.upstream>, python3-pyparsing <!nocheck>, python3-evdev:native <!nocheck>, tzdata-legacy <!nocheck> | tzdata (<< 2024a-1) <!nocheck>, @@ -94,12 +95,14 @@ Multi-Arch: foreign Priority: important Recommends: default-dbus-system-bus | dbus-system-bus, systemd-timesyncd | time-daemon, + systemd-cryptsetup, ${dlopen:Recommends}, Suggests: systemd-container, systemd-homed, systemd-userdbd, systemd-boot, systemd-resolved, + systemd-repart, libtss2-tcti-device0, polkitd, ${dlopen:Suggests}, @@ -162,6 +165,8 @@ Depends: ${shlibs:Depends}, Recommends: libnss-mymachines, ${dlopen:Recommends}, Suggests: ${dlopen:Suggests}, +Breaks: systemd (<< 256-2~), +Replaces: systemd (<< 256-2~), Description: systemd container/nspawn tools This package provides systemd's tools for nspawn and container/VM management: * systemd-nspawn @@ -471,6 +476,18 @@ Description: standalone tmpfiles binary for use in non-systemd systems This package conflicts with the main systemd package and is meant for use in non-systemd systems. +Package: systemd-standalone-shutdown +Architecture: linux-any +Conflicts: systemd, +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Recommends: ${dlopen:Recommends}, +Suggests: ${dlopen:Suggests}, +Description: standalone shutdown binary for use in exitrds + Standalone shutdown binary with minimal dependencies. + This package conflicts with the main systemd package and is meant for use in + minimal exitrd images. Not intended for normal systems. + Package: systemd-oomd Architecture: linux-any Depends: ${shlibs:Depends}, @@ -527,8 +544,8 @@ Recommends: efibootmgr, ${dlopen:Recommends}, Suggests: systemd-ukify, ${dlopen:Suggests}, -Breaks: systemd (<< 251.2-3~) -Replaces: systemd (<< 251.2-3~) +Breaks: systemd (<< 256-2~), systemd-boot-efi (<< 256-2~), +Replaces: systemd (<< 256-2~), systemd-boot-efi (<< 256-2~), Description: simple UEFI boot manager - tools and services systemd-boot (short: sd-boot) is a simple UEFI boot manager. It provides a textual menu to select the entry to boot and an editor for the kernel command @@ -554,6 +571,22 @@ Description: simple UEFI boot manager - EFI binaries . This package contains the EFI binaries. +Package: systemd-boot-efi-amd64-signed-template +Architecture: amd64 +Depends: ${shlibs:Depends}, ${misc:Depends}, +Build-Profiles: <!stage1 !pkg.systemd.upstream> +Description: Template for signed systemd-boot-efi package + This package is used to control code signing by the Debian signing + service. + +Package: systemd-boot-efi-arm64-signed-template +Architecture: arm64 +Depends: ${shlibs:Depends}, ${misc:Depends}, +Build-Profiles: <!stage1 !pkg.systemd.upstream> +Description: Template for signed systemd-boot-efi package + This package is used to control code signing by the Debian signing + service. + Package: systemd-ukify Build-Profiles: <!stage1 !pkg.systemd.noukify> Architecture: all @@ -610,3 +643,31 @@ Description: systemd development files are different from the libsystemd's and libudev's pkg-config files, which can still be found in the respective dev packages, but instead provide data such as the installation directories for units, and more. + +Package: systemd-repart +Architecture: linux-any +Section: admin +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Recommends: ${dlopen:Recommends}, +Suggests: ${dlopen:Suggests}, +Breaks: systemd (<< 256-2~), +Replaces: systemd (<< 256-2~), +Description: Provides the systemd-repart utility + systemd-repart is a configuration-driven system partitioning tool. It follows + the Discoverable Partitions Specification and provides support for encryption + and dm-verity among other things. + +Package: systemd-cryptsetup +Build-Profiles: <!stage1> +Architecture: linux-any +Section: admin +Depends: ${shlibs:Depends}, + ${misc:Depends}, +Recommends: ${dlopen:Recommends}, +Suggests: ${dlopen:Suggests}, +Breaks: systemd (<< 256-2~), +Replaces: systemd (<< 256-2~), +Description: Provides cryptsetup, integritysetup and veritysetup utilities + Utilities and units that integrated cryptsetup/integritysetup/veritysetup + support in systemd. diff --git a/debian/extra/gen-signing-template b/debian/extra/gen-signing-template new file mode 100755 index 0000000..6c13571 --- /dev/null +++ b/debian/extra/gen-signing-template @@ -0,0 +1,45 @@ +#!/bin/bash + +set -euE + +export DEB_VERSION="$1" +export DEB_HOST_ARCH="$2" +export DEB_HOST_ARCH_EFI="$3" + +DISTRIBUTION="$(dpkg-parsechangelog -SDistribution)" +URGENCY="$(dpkg-parsechangelog -SUrgency)" +MAINT="$(dpkg-parsechangelog -SMaintainer)" +DATE="$(dpkg-parsechangelog -SDate)" + +DEB_VERSION_MANGLED="$(echo "$DEB_VERSION" | sed -re 's/-/\+/;s/\+(b[[:digit:]]+)$/.\1/')" +DEB_VERSION_SOURCE="$(echo "$DEB_VERSION" | sed -re 's/\+b[[:digit:]]+$//')" +export DEB_VERSION_SOURCE +SIGN_TEMPLATE_DIR="debian/systemd-boot-efi-${DEB_HOST_ARCH}-signed-template/usr/share/code-signing/systemd-boot-efi-${DEB_HOST_ARCH}-signed-template" +SIGN_SOURCE_DIR="${SIGN_TEMPLATE_DIR}/source-template/debian" +FILE=usr/lib/systemd/boot/efi/systemd-boot${DEB_HOST_ARCH_EFI}.efi + +for i in $(find debian/signing-template -type f -printf '%P\n'); do + mkdir -p "$SIGN_SOURCE_DIR/$(dirname "$i")" + envsubst < "debian/signing-template/$i" > "$SIGN_SOURCE_DIR/$i" +done + +( + echo "systemd-boot-efi-${DEB_HOST_ARCH}-signed (${DEB_VERSION_MANGLED}) ${DISTRIBUTION}; urgency=${URGENCY}" + echo + echo " * Sign EFI binaries from systemd-boot-efi ${DEB_VERSION}" + dpkg-parsechangelog -SChanges | sed -rne 's/^.$//p' -e '/^ /p' + echo + echo " -- ${MAINT} ${DATE}" +) > "$SIGN_SOURCE_DIR/changelog" + +jq -n --arg file "${FILE}" ' +{ + "packages": { + "systemd-boot-efi": { + "trusted_certs": [], + "files": [ + {"sig_type": "efi", "file": $file} + ] + } + } +}' > "$SIGN_TEMPLATE_DIR/files.json" diff --git a/debian/not-installed b/debian/not-installed index a42a3ef..324b31d 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -1,3 +1,4 @@ # make dh_missing happy for -A builds usr/bin/systemd-sysusers.standalone usr/bin/systemd-tmpfiles.standalone +usr/bin/systemd-shutdown.standalone diff --git a/debian/rules b/debian/rules index fe3fd47..d088b61 100755 --- a/debian/rules +++ b/debian/rules @@ -8,6 +8,13 @@ export LC_ALL = C.UTF-8 include /usr/share/dpkg/default.mk include /usr/share/debhelper/dh_package_notes/package-notes.mk +ifeq (amd64,$(DEB_HOST_ARCH)) +export DEB_HOST_ARCH_EFI=x64 +else ifeq (arm64,$(DEB_HOST_ARCH)) +export DEB_HOST_ARCH_EFI=aa64 +endif + + ifeq ($(DEB_VENDOR),Ubuntu) DEFAULT_NTP_SERVERS = ntp.ubuntu.com SUPPORT_URL = http://www.ubuntu.com/support @@ -268,9 +275,8 @@ execute_before_dh_install: fi # remove obsolete compat symlink rm -f debian/tmp/usr/bin/systemd-resolve - # we don't want repart and shutdown standalone binaries for now + # we don't want the repart standalone binary for now rm -f debian/tmp/usr/bin/systemd-repart.standalone - rm -f debian/tmp/usr/lib/systemd/systemd-shutdown.standalone # files shipped by cryptsetup ifeq (, $(filter stage1, $(DEB_BUILD_PROFILES))) rm -f debian/tmp/usr/share/man/man5/crypttab.5 @@ -294,6 +300,14 @@ else install -D --mode=644 debian/extra/resolved.conf.d/cache-no-negative.conf debian/systemd-resolved/usr/lib/systemd/resolved.conf.d/cache-no-negative.conf endif +ifeq (, $(filter pkg.systemd.upstream, $(DEB_BUILD_PROFILES))) +ifeq ($(DEB_VENDOR),Debian) +ifneq ($(DEB_HOST_ARCH_EFI),) + debian/extra/gen-signing-template $(DEB_VERSION) $(DEB_HOST_ARCH) $(DEB_HOST_ARCH_EFI) +endif +endif +endif + # Remove empty directories from /usr/lib. # Those are not strictly needed and can trigger piuparts errors due to # accidential directory removal by dpkg on merged-/usr systems. diff --git a/debian/signing-template/README.source b/debian/signing-template/README.source new file mode 100644 index 0000000..36fb03e --- /dev/null +++ b/debian/signing-template/README.source @@ -0,0 +1,4 @@ +This source package is generated by the Debian signing service from a +template built by the fwupd package. It should never be updated directly. + + -- Steve McIntyre <93sam@debian.org> Sat, 07 Apr 2018 12:44:55 +0100 diff --git a/debian/signing-template/control b/debian/signing-template/control new file mode 100644 index 0000000..8baaf83 --- /dev/null +++ b/debian/signing-template/control @@ -0,0 +1,26 @@ +Source: systemd-boot-efi-${DEB_HOST_ARCH}-signed +Section: admin +Priority: optional +Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.debian.org> +Build-Depends: debhelper-compat (= 13), + sbsigntool, + systemd-boot-efi (= ${DEB_VERSION}), +Standards-Version: 4.7.0 +Rules-Requires-Root: no +Vcs-Git: https://salsa.debian.org/systemd-team/systemd.git +Vcs-Browser: https://salsa.debian.org/systemd-team/systemd + +Package: systemd-boot-efi-${DEB_HOST_ARCH}-signed +Section: admin +Architecture: ${DEB_HOST_ARCH} +Provides: systemd-boot-efi-signed +Built-Using: systemd (= ${DEB_VERSION_SOURCE}) +Description: Tools to manage UEFI firmware updates (signed) + systemd is a system and service manager for Linux. It provides aggressive + parallelization capabilities, uses socket and D-Bus activation for starting + services, offers on-demand starting of daemons, keeps track of processes using + Linux control groups, maintains mount and automount points and implements an + elaborate transactional dependency-based service control logic. + . + This package provides systemd's tools for EFI boot: + * signed efi binaries diff --git a/debian/signing-template/install b/debian/signing-template/install new file mode 100644 index 0000000..65ed847 --- /dev/null +++ b/debian/signing-template/install @@ -0,0 +1 @@ +*.efi.signed /usr/lib/systemd/boot/efi diff --git a/debian/signing-template/rules b/debian/signing-template/rules new file mode 100755 index 0000000..0887e3e --- /dev/null +++ b/debian/signing-template/rules @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +include /usr/share/dpkg/default.mk + +BINARY = systemd-boot${DEB_HOST_ARCH_EFI}.efi +INSTALLED = usr/lib/systemd/boot/efi/$(BINARY) +SIGNATURE = debian/signatures/systemd-boot-efi/$(INSTALLED).sig + +%: + dh $@ + +override_dh_auto_build: + cp /$(INSTALLED) $(BINARY) + sbattach --attach $(SIGNATURE) $(BINARY) + mv $(BINARY) $(BINARY).signed + +override_dh_gencontrol: + dh_gencontrol -- -v${DEB_VERSION} diff --git a/debian/signing-template/source/format b/debian/signing-template/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/debian/signing-template/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/systemd-boot-efi.manpages b/debian/systemd-boot-efi.manpages deleted file mode 100644 index 4af7d86..0000000 --- a/debian/systemd-boot-efi.manpages +++ /dev/null @@ -1 +0,0 @@ -usr/share/man/man7/*.efi.stub.7 diff --git a/debian/systemd-boot.manpages b/debian/systemd-boot.manpages index 70a4690..91aecb5 100644 --- a/debian/systemd-boot.manpages +++ b/debian/systemd-boot.manpages @@ -1,7 +1,10 @@ usr/share/man/man1/bootctl.1 usr/share/man/man5/loader.conf.5 usr/share/man/man7/sd-boot.7 +usr/share/man/man7/sd-stub.7 +usr/share/man/man7/*.efi.stub.7 usr/share/man/man7/systemd-boot.7 +usr/share/man/man7/systemd-stub.7 usr/share/man/man8/systemd-bless-boot.8 usr/share/man/man8/systemd-bless-boot-generator.8 usr/share/man/man8/systemd-bless-boot.service.8 diff --git a/debian/systemd-container.install b/debian/systemd-container.install index b97c2ae..f3badad 100755 --- a/debian/systemd-container.install +++ b/debian/systemd-container.install @@ -16,12 +16,17 @@ usr/lib/systemd/systemd-nsresourced usr/lib/systemd/systemd-nsresourcework usr/lib/systemd/systemd-portabled usr/lib/systemd/systemd-pull +usr/lib/systemd/systemd-sysupdate usr/lib/systemd/system/systemd-nspawn@.service usr/lib/systemd/system/systemd-importd.service usr/lib/systemd/system/systemd-machined.service usr/lib/systemd/system/systemd-mountfsd* usr/lib/systemd/system/systemd-nsresourced* usr/lib/systemd/system/systemd-portabled.service +usr/lib/systemd/system/systemd-sysupdate-reboot.service +usr/lib/systemd/system/systemd-sysupdate-reboot.timer +usr/lib/systemd/system/systemd-sysupdate.service +usr/lib/systemd/system/systemd-sysupdate.timer usr/lib/systemd/system/var-lib-machines.mount usr/lib/systemd/system/machines.target usr/lib/systemd/system/*.target.wants/var-lib-machines.mount diff --git a/debian/systemd-container.manpages b/debian/systemd-container.manpages index a64dc3f..a027942 100755 --- a/debian/systemd-container.manpages +++ b/debian/systemd-container.manpages @@ -3,10 +3,14 @@ debian/tmp/usr/share/man/man1/importctl.1 <pkg.systemd.upstream> debian/tmp/usr/share/man/man1/systemd-vmspawn.1 debian/tmp/usr/share/man/man1/mount.ddi.1 debian/tmp/usr/share/man/man1/systemd-nspawn.1 +debian/tmp/usr/share/man/man5/org.freedesktop.import1.5 debian/tmp/usr/share/man/man5/systemd.nspawn.5 +debian/tmp/usr/share/man/man5/sysupdate.d.5 debian/tmp/usr/share/man/man1/machinectl.1 debian/tmp/usr/share/man/man1/portablectl.1 debian/tmp/usr/share/man/man1/systemd-dissect.1 +debian/tmp/usr/share/man/man8/systemd-importd.8 +debian/tmp/usr/share/man/man8/systemd-importd.service.8 debian/tmp/usr/share/man/man8/systemd-machined.8 debian/tmp/usr/share/man/man8/systemd-machined.service.8 debian/tmp/usr/share/man/man8/systemd-mountfsd.8 @@ -15,3 +19,8 @@ debian/tmp/usr/share/man/man8/systemd-nsresourced.8 debian/tmp/usr/share/man/man8/systemd-nsresourced.service.8 debian/tmp/usr/share/man/man8/systemd-portabled.8 debian/tmp/usr/share/man/man8/systemd-portabled.service.8 +debian/tmp/usr/share/man/man8/systemd-sysupdate.8 +debian/tmp/usr/share/man/man8/systemd-sysupdate-reboot.service.8 +debian/tmp/usr/share/man/man8/systemd-sysupdate-reboot.timer.8 +debian/tmp/usr/share/man/man8/systemd-sysupdate.service.8 +debian/tmp/usr/share/man/man8/systemd-sysupdate.timer.8 diff --git a/debian/systemd-cryptsetup.install b/debian/systemd-cryptsetup.install new file mode 100644 index 0000000..dc38c37 --- /dev/null +++ b/debian/systemd-cryptsetup.install @@ -0,0 +1,25 @@ +usr/bin/systemd-cryptenroll +usr/bin/systemd-cryptsetup +usr/lib/systemd/system/cryptsetup-pre.target +usr/lib/systemd/system/cryptsetup.target +usr/lib/systemd/system/integritysetup-pre.target +usr/lib/systemd/system/integritysetup.target +usr/lib/systemd/system/veritysetup-pre.target +usr/lib/systemd/system/veritysetup.target +usr/lib/systemd/systemd-cryptsetup +usr/lib/systemd/systemd-integritysetup +usr/lib/systemd/systemd-veritysetup +usr/lib/systemd/system-generators/systemd-cryptsetup-generator +usr/lib/systemd/system-generators/systemd-integritysetup-generator +usr/lib/systemd/system-generators/systemd-veritysetup-generator +usr/lib/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target +usr/lib/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target +usr/lib/systemd/system/remote-cryptsetup.target +usr/lib/systemd/system/remote-veritysetup.target +usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target +usr/lib/systemd/system/sysinit.target.wants/integritysetup.target +usr/lib/systemd/system/sysinit.target.wants/veritysetup.target +usr/lib/systemd/system/system-systemd\x2dcryptsetup.slice +usr/lib/systemd/system/system-systemd\x2dveritysetup.slice +usr/lib/*/cryptsetup/ +usr/share/bash-completion/completions/systemd-cryptenroll diff --git a/debian/systemd-cryptsetup.manpages b/debian/systemd-cryptsetup.manpages new file mode 100644 index 0000000..1fe9247 --- /dev/null +++ b/debian/systemd-cryptsetup.manpages @@ -0,0 +1,12 @@ +usr/share/man/man1/systemd-cryptenroll.1 +usr/share/man/man5/integritytab.5 +usr/share/man/man5/veritytab.5 +usr/share/man/man8/systemd-cryptsetup.8 +usr/share/man/man8/systemd-cryptsetup-generator.8 +usr/share/man/man8/systemd-cryptsetup@.service.8 +usr/share/man/man8/systemd-integritysetup.8 +usr/share/man/man8/systemd-integritysetup-generator.8 +usr/share/man/man8/systemd-integritysetup@.service.8 +usr/share/man/man8/systemd-veritysetup.8 +usr/share/man/man8/systemd-veritysetup-generator.8 +usr/share/man/man8/systemd-veritysetup@.service.8 diff --git a/debian/systemd-repart.install b/debian/systemd-repart.install new file mode 100644 index 0000000..59a4885 --- /dev/null +++ b/debian/systemd-repart.install @@ -0,0 +1,5 @@ +usr/bin/systemd-repart +usr/lib/systemd/repart/ +usr/lib/systemd/system/initrd-root-fs.target.wants/systemd-repart.service +usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service +usr/lib/systemd/system/systemd-repart.service diff --git a/debian/systemd-repart.manpages b/debian/systemd-repart.manpages new file mode 100644 index 0000000..442ee84 --- /dev/null +++ b/debian/systemd-repart.manpages @@ -0,0 +1,3 @@ +usr/share/man/man5/repart.d.5 +usr/share/man/man8/systemd-repart.8 +usr/share/man/man8/systemd-repart.service.8 diff --git a/debian/systemd-standalone-shutdown.install b/debian/systemd-standalone-shutdown.install new file mode 100755 index 0000000..bde793e --- /dev/null +++ b/debian/systemd-standalone-shutdown.install @@ -0,0 +1,2 @@ +#!/usr/bin/dh-exec +usr/lib/systemd/systemd-shutdown.standalone => usr/lib/systemd/systemd-shutdown diff --git a/debian/systemd-standalone-shutdown.manpages b/debian/systemd-standalone-shutdown.manpages new file mode 100644 index 0000000..94095ad --- /dev/null +++ b/debian/systemd-standalone-shutdown.manpages @@ -0,0 +1 @@ +usr/share/man/man8/systemd-shutdown.8 diff --git a/debian/systemd.install b/debian/systemd.install index dbc82a9..b5e0854 100755 --- a/debian/systemd.install +++ b/debian/systemd.install @@ -33,8 +33,6 @@ usr/bin/systemd-cgls usr/bin/systemd-cgtop usr/bin/systemd-confext usr/bin/systemd-creds -<!stage1> usr/bin/systemd-cryptenroll -<!stage1> usr/bin/systemd-cryptsetup usr/bin/systemd-delta usr/bin/systemd-detect-virt usr/bin/systemd-escape @@ -45,7 +43,6 @@ usr/bin/systemd-machine-id-setup usr/bin/systemd-mount usr/bin/systemd-notify usr/bin/systemd-path -usr/bin/systemd-repart usr/bin/systemd-run usr/bin/systemd-socket-activate usr/bin/systemd-stdio-bridge @@ -83,7 +80,6 @@ usr/lib/systemd/network/80-wifi-adhoc.network usr/lib/systemd/network/80-wifi-ap.network.example usr/lib/systemd/network/80-wifi-station.network.example usr/lib/systemd/network/89-ethernet.network.example -usr/lib/systemd/repart/ usr/lib/systemd/resolv.conf usr/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf usr/lib/systemd/system/autovt@.service @@ -95,8 +91,6 @@ usr/lib/systemd/system/capsule.slice usr/lib/systemd/system/capsule@.service usr/lib/systemd/system/console-getty.service usr/lib/systemd/system/container-getty@.service -<!stage1> usr/lib/systemd/system/cryptsetup-pre.target -<!stage1> usr/lib/systemd/system/cryptsetup.target usr/lib/systemd/system/ctrl-alt-del.target usr/lib/systemd/systemd usr/lib/systemd/systemd-backlight @@ -109,7 +103,6 @@ usr/lib/systemd/system/dbus-org.freedesktop.locale1.service usr/lib/systemd/system/dbus-org.freedesktop.login1.service usr/lib/systemd/system/dbus-org.freedesktop.timedate1.service usr/lib/systemd/systemd-cgroups-agent -<!stage1> usr/lib/systemd/systemd-cryptsetup usr/lib/systemd/system/debug-shell.service usr/lib/systemd/system/default.target usr/lib/systemd/system/dev-hugepages.mount @@ -120,7 +113,6 @@ usr/lib/systemd/systemd-growfs usr/lib/systemd/systemd-hibernate-resume usr/lib/systemd/systemd-hostnamed usr/lib/systemd/systemd-initctl -<!stage1> usr/lib/systemd/systemd-integritysetup usr/lib/systemd/systemd-journald usr/lib/systemd/systemd-localed usr/lib/systemd/systemd-logind @@ -146,7 +138,6 @@ usr/lib/systemd/systemd-storagetm usr/lib/systemd/systemd-sulogin-shell usr/lib/systemd/systemd-sysctl usr/lib/systemd/systemd-sysroot-fstab-check -<!stage1> usr/lib/systemd/systemd-sysupdate usr/lib/systemd/systemd-timedated usr/lib/systemd/systemd-time-wait-sync [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/systemd-tpm2-setup @@ -154,7 +145,6 @@ usr/lib/systemd/systemd-update-done usr/lib/systemd/systemd-update-utmp usr/lib/systemd/systemd-user-runtime-dir usr/lib/systemd/systemd-user-sessions -<!stage1> usr/lib/systemd/systemd-veritysetup usr/lib/systemd/systemd-volatile-root usr/lib/systemd/systemd-xdg-autostart-condition usr/lib/systemd/system/emergency.service @@ -163,20 +153,17 @@ usr/lib/systemd/system/exit.target usr/lib/systemd/system/factory-reset.target usr/lib/systemd/system/final.target usr/lib/systemd/system/first-boot-complete.target -<!stage1> usr/lib/systemd/system-generators/systemd-cryptsetup-generator usr/lib/systemd/system-generators/systemd-debug-generator usr/lib/systemd/system-generators/systemd-fstab-generator usr/lib/systemd/system-generators/systemd-getty-generator usr/lib/systemd/system-generators/systemd-gpt-auto-generator usr/lib/systemd/system-generators/systemd-hibernate-resume-generator -<!stage1> usr/lib/systemd/system-generators/systemd-integritysetup-generator usr/lib/systemd/system-generators/systemd-rc-local-generator usr/lib/systemd/system-generators/systemd-run-generator usr/lib/systemd/system-generators/systemd-ssh-generator usr/lib/systemd/system-generators/systemd-system-update-generator usr/lib/systemd/system-generators/systemd-sysv-generator usr/lib/systemd/system-generators/systemd-tpm2-generator -<!stage1> usr/lib/systemd/system-generators/systemd-veritysetup-generator usr/lib/systemd/system/getty-pre.target usr/lib/systemd/system/getty@.service usr/lib/systemd/system/getty.target @@ -189,10 +176,7 @@ usr/lib/systemd/system/initrd-cleanup.service usr/lib/systemd/system/initrd-fs.target usr/lib/systemd/system/initrd-parse-etc.service usr/lib/systemd/system/initrd-root-device.target -<!stage1> usr/lib/systemd/system/initrd-root-device.target.wants/remote-cryptsetup.target -<!stage1> usr/lib/systemd/system/initrd-root-device.target.wants/remote-veritysetup.target usr/lib/systemd/system/initrd-root-fs.target -usr/lib/systemd/system/initrd-root-fs.target.wants/systemd-repart.service usr/lib/systemd/system/initrd-switch-root.service usr/lib/systemd/system/initrd-switch-root.target usr/lib/systemd/system/initrd.target @@ -201,8 +185,6 @@ usr/lib/systemd/system/initrd.target.wants/systemd-battery-check.service [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/initrd.target.wants/systemd-pcrphase-initrd.service usr/lib/systemd/system/initrd-udevadm-cleanup-db.service usr/lib/systemd/system/initrd-usr-fs.target -<!stage1> usr/lib/systemd/system/integritysetup-pre.target -<!stage1> usr/lib/systemd/system/integritysetup.target usr/lib/systemd/system/kexec.target usr/lib/systemd/system/kmod-static-nodes.service usr/lib/systemd/system/ldconfig.service @@ -231,10 +213,8 @@ usr/lib/systemd/system/proc-sys-fs-binfmt_misc.mount usr/lib/systemd/system/quotaon*.service usr/lib/systemd/system/rc-local.service usr/lib/systemd/system/reboot.target -<!stage1> usr/lib/systemd/system/remote-cryptsetup.target usr/lib/systemd/system/remote-fs-pre.target usr/lib/systemd/system/remote-fs.target -<!stage1> usr/lib/systemd/system/remote-veritysetup.target usr/lib/systemd/system/rescue.service usr/lib/systemd/system/rescue.target usr/lib/systemd/system/rescue.target.wants/systemd-update-utmp-runlevel.service @@ -270,11 +250,9 @@ usr/lib/systemd/system/suspend-then-hibernate.target usr/lib/systemd/system/swap.target usr/lib/systemd/system/sys-fs-fuse-connections.mount usr/lib/systemd/system/sysinit.target -<!stage1> usr/lib/systemd/system/sysinit.target.wants/cryptsetup.target usr/lib/systemd/system/sysinit.target.wants/systemd-hibernate-clear.service usr/lib/systemd/system/sysinit.target.wants/dev-hugepages.mount usr/lib/systemd/system/sysinit.target.wants/dev-mqueue.mount -<!stage1> usr/lib/systemd/system/sysinit.target.wants/integritysetup.target usr/lib/systemd/system/sysinit.target.wants/kmod-static-nodes.service usr/lib/systemd/system/sysinit.target.wants/ldconfig.service usr/lib/systemd/system/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount @@ -294,7 +272,6 @@ usr/lib/systemd/system/sysinit.target.wants/systemd-modules-load.service [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase.service [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-pcrphase-sysinit.service usr/lib/systemd/system/sysinit.target.wants/systemd-random-seed.service -usr/lib/systemd/system/sysinit.target.wants/systemd-repart.service usr/lib/systemd/system/sysinit.target.wants/systemd-sysctl.service usr/lib/systemd/system/sysinit.target.wants/systemd-sysusers.service usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev-early.service @@ -304,7 +281,6 @@ usr/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup.service [amd64 i386 arm64 armhf riscv64] <!stage1> usr/lib/systemd/system/sysinit.target.wants/systemd-tpm2-setup.service usr/lib/systemd/system/sysinit.target.wants/systemd-update-done.service usr/lib/systemd/system/sysinit.target.wants/systemd-update-utmp.service -<!stage1> usr/lib/systemd/system/sysinit.target.wants/veritysetup.target usr/lib/systemd/system/sys-kernel-config.mount usr/lib/systemd/system/sys-kernel-debug.mount usr/lib/systemd/system/sys-kernel-tracing.mount @@ -377,7 +353,6 @@ usr/lib/systemd/system/systemd-quotacheck*.service usr/lib/systemd/system/systemd-random-seed.service usr/lib/systemd/system/systemd-reboot.service usr/lib/systemd/system/systemd-remount-fs.service -usr/lib/systemd/system/systemd-repart.service usr/lib/systemd/system/systemd-rfkill.service usr/lib/systemd/system/systemd-rfkill.socket usr/lib/systemd/system/systemd-soft-reboot.service @@ -388,10 +363,6 @@ usr/lib/systemd/system/systemd-sysctl.service usr/lib/systemd/system/systemd-sysext.service usr/lib/systemd/system/systemd-sysext@.service usr/lib/systemd/system/systemd-sysext.socket -<!stage1> usr/lib/systemd/system/systemd-sysupdate-reboot.service -<!stage1> usr/lib/systemd/system/systemd-sysupdate-reboot.timer -<!stage1> usr/lib/systemd/system/systemd-sysupdate.service -<!stage1> usr/lib/systemd/system/systemd-sysupdate.timer usr/lib/systemd/system/systemd-sysusers.service usr/lib/systemd/system/systemd-timedated.service usr/lib/systemd/system/systemd-time-wait-sync.service @@ -407,8 +378,6 @@ usr/lib/systemd/system/systemd-update-utmp-runlevel.service usr/lib/systemd/system/systemd-update-utmp.service usr/lib/systemd/system/systemd-user-sessions.service usr/lib/systemd/system/systemd-volatile-root.service -<!stage1> usr/lib/systemd/system/system-systemd\x2dcryptsetup.slice -<!stage1> usr/lib/systemd/system/system-systemd\x2dveritysetup.slice usr/lib/systemd/system/system-update-cleanup.service usr/lib/systemd/system/system-update-pre.target usr/lib/systemd/system/system-update.target @@ -426,8 +395,6 @@ usr/lib/systemd/system/user@.service usr/lib/systemd/system/user@.service.d/10-login-barrier.conf usr/lib/systemd/system/user.slice usr/lib/systemd/system/user-.slice.d/10-defaults.conf -<!stage1> usr/lib/systemd/system/veritysetup-pre.target -<!stage1> usr/lib/systemd/system/veritysetup.target usr/lib/systemd/user/app.slice usr/lib/systemd/user/background.slice usr/lib/systemd/user/basic.target @@ -474,7 +441,6 @@ usr/lib/udev/rules.d/70-uaccess.rules usr/lib/udev/rules.d/71-seat.rules usr/lib/udev/rules.d/73-seat-late.rules usr/lib/udev/rules.d/99-systemd.rules -<!stage1> usr/lib/*/cryptsetup/ usr/share/bash-completion/completions/busctl usr/share/bash-completion/completions/hostnamectl usr/share/bash-completion/completions/journalctl @@ -489,7 +455,6 @@ usr/share/bash-completion/completions/systemd-cat usr/share/bash-completion/completions/systemd-cgls usr/share/bash-completion/completions/systemd-cgtop usr/share/bash-completion/completions/systemd-confext -<!stage1> usr/share/bash-completion/completions/systemd-cryptenroll usr/share/bash-completion/completions/systemd-delta usr/share/bash-completion/completions/systemd-detect-virt usr/share/bash-completion/completions/systemd-dissect diff --git a/debian/systemd.manpages b/debian/systemd.manpages index ed7eb16..2d20132 100755 --- a/debian/systemd.manpages +++ b/debian/systemd.manpages @@ -15,7 +15,6 @@ debian/tmp/usr/share/man/man1/systemd-cat.1 debian/tmp/usr/share/man/man1/systemd-cgls.1 debian/tmp/usr/share/man/man1/systemd-cgtop.1 debian/tmp/usr/share/man/man1/systemd-creds.1 -<!stage1> debian/tmp/usr/share/man/man1/systemd-cryptenroll.1 debian/tmp/usr/share/man/man1/systemd-delta.1 debian/tmp/usr/share/man/man1/systemd-detect-virt.1 debian/tmp/usr/share/man/man1/systemd-escape.1 @@ -45,7 +44,6 @@ debian/tmp/usr/share/man/man5/environment.d.5 debian/tmp/usr/share/man/man5/extension-release.5 debian/tmp/usr/share/man/man5/hostname.5 debian/tmp/usr/share/man/man5/initrd-release.5 -<!stage1> debian/tmp/usr/share/man/man5/integritytab.5 debian/tmp/usr/share/man/man5/iocost.conf.5 debian/tmp/usr/share/man/man5/journald.conf.5 debian/tmp/usr/share/man/man5/journald@.conf.5 @@ -60,7 +58,6 @@ debian/tmp/usr/share/man/man5/modules-load.d.5 debian/tmp/usr/share/man/man5/networkd.conf.5 debian/tmp/usr/share/man/man5/networkd.conf.d.5 debian/tmp/usr/share/man/man5/org.freedesktop.hostname1.5 -<!stage1> debian/tmp/usr/share/man/man5/org.freedesktop.import1.5 debian/tmp/usr/share/man/man5/org.freedesktop.locale1.5 debian/tmp/usr/share/man/man5/org.freedesktop.LogControl1.5 debian/tmp/usr/share/man/man5/org.freedesktop.login1.5 @@ -72,7 +69,6 @@ debian/tmp/usr/share/man/man5/org.freedesktop.timedate1.5 debian/tmp/usr/share/man/man5/os-release.5 debian/tmp/usr/share/man/man5/pstore.conf.5 debian/tmp/usr/share/man/man5/pstore.conf.d.5 -debian/tmp/usr/share/man/man5/repart.d.5 debian/tmp/usr/share/man/man5/sleep.conf.d.5 debian/tmp/usr/share/man/man5/sysctl.d.5 debian/tmp/usr/share/man/man5/system.conf.d.5 @@ -103,18 +99,15 @@ debian/tmp/usr/share/man/man5/systemd.timer.5 debian/tmp/usr/share/man/man5/systemd.unit.5 debian/tmp/usr/share/man/man5/systemd-user.conf.5 debian/tmp/usr/share/man/man5/systemd-user-runtime-dir.5 -<!stage1> debian/tmp/usr/share/man/man5/sysupdate.d.5 debian/tmp/usr/share/man/man5/sysusers.d.5 debian/tmp/usr/share/man/man5/tmpfiles.d.5 debian/tmp/usr/share/man/man5/user.conf.d.5 debian/tmp/usr/share/man/man5/user-runtime-dir@.service.5 debian/tmp/usr/share/man/man5/user@.service.5 -<!stage1> debian/tmp/usr/share/man/man5/veritytab.5 debian/tmp/usr/share/man/man7/bootup.7 debian/tmp/usr/share/man/man7/daemon.7 debian/tmp/usr/share/man/man7/file-hierarchy.7 debian/tmp/usr/share/man/man7/kernel-command-line.7 -[amd64 i386 arm64 armhf riscv64] <!stage1> debian/tmp/usr/share/man/man7/sd-stub.7 debian/tmp/usr/share/man/man7/smbios-type-11.7 debian/tmp/usr/share/man/man7/systemd.directives.7 debian/tmp/usr/share/man/man7/systemd.environment-generator.7 @@ -125,7 +118,6 @@ debian/tmp/usr/share/man/man7/systemd.journal-fields.7 debian/tmp/usr/share/man/man7/systemd.net-naming-scheme.7 debian/tmp/usr/share/man/man7/systemd.offline-updates.7 debian/tmp/usr/share/man/man7/systemd.special.7 -[amd64 i386 arm64 armhf riscv64] <!stage1> debian/tmp/usr/share/man/man7/systemd-stub.7 debian/tmp/usr/share/man/man7/systemd.syntax.7 debian/tmp/usr/share/man/man7/systemd.system-credentials.7 debian/tmp/usr/share/man/man7/systemd.time.7 @@ -150,9 +142,6 @@ debian/tmp/usr/share/man/man8/systemd-boot-check-no-failures.service.8 <!stage1> debian/tmp/usr/share/man/man8/systemd-bsod.service.8 debian/tmp/usr/share/man/man8/systemd-confext.8 debian/tmp/usr/share/man/man8/systemd-confext.service.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-cryptsetup.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-cryptsetup-generator.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-cryptsetup@.service.8 debian/tmp/usr/share/man/man8/systemd-debug-generator.8 debian/tmp/usr/share/man/man8/systemd-environment-d-generator.8 debian/tmp/usr/share/man/man8/systemd-fsck.8 @@ -174,14 +163,9 @@ debian/tmp/usr/share/man/man8/systemd-hibernate.service.8 debian/tmp/usr/share/man/man8/systemd-hostnamed.8 debian/tmp/usr/share/man/man8/systemd-hostnamed.service.8 debian/tmp/usr/share/man/man8/systemd-hybrid-sleep.service.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-importd.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-importd.service.8 debian/tmp/usr/share/man/man8/systemd-initctl.8 debian/tmp/usr/share/man/man8/systemd-initctl.service.8 debian/tmp/usr/share/man/man8/systemd-initctl.socket.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-integritysetup.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-integritysetup-generator.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-integritysetup@.service.8 debian/tmp/usr/share/man/man8/systemd-journald.8 debian/tmp/usr/share/man/man8/systemd-journald-audit.socket.8 debian/tmp/usr/share/man/man8/systemd-journald-dev-log.socket.8 @@ -234,8 +218,6 @@ debian/tmp/usr/share/man/man8/systemd-rc-local-generator.8 debian/tmp/usr/share/man/man8/systemd-reboot.service.8 debian/tmp/usr/share/man/man8/systemd-remount-fs.8 debian/tmp/usr/share/man/man8/systemd-remount-fs.service.8 -debian/tmp/usr/share/man/man8/systemd-repart.8 -debian/tmp/usr/share/man/man8/systemd-repart.service.8 debian/tmp/usr/share/man/man8/systemd-rfkill.8 debian/tmp/usr/share/man/man8/systemd-rfkill.service.8 debian/tmp/usr/share/man/man8/systemd-rfkill.socket.8 @@ -254,11 +236,6 @@ debian/tmp/usr/share/man/man8/systemd-sysctl.service.8 debian/tmp/usr/share/man/man8/systemd-sysext.8 debian/tmp/usr/share/man/man8/systemd-sysext.service.8 debian/tmp/usr/share/man/man8/systemd-system-update-generator.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-sysupdate.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-sysupdate-reboot.service.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-sysupdate-reboot.timer.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-sysupdate.service.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-sysupdate.timer.8 debian/tmp/usr/share/man/man8/systemd-sysusers.8 debian/tmp/usr/share/man/man8/systemd-sysusers.service.8 debian/tmp/usr/share/man/man8/systemd-sysv-generator.8 @@ -284,9 +261,6 @@ debian/tmp/usr/share/man/man8/systemd-update-utmp-runlevel.service.8 debian/tmp/usr/share/man/man8/systemd-update-utmp.service.8 debian/tmp/usr/share/man/man8/systemd-user-sessions.8 debian/tmp/usr/share/man/man8/systemd-user-sessions.service.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-veritysetup.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-veritysetup-generator.8 -<!stage1> debian/tmp/usr/share/man/man8/systemd-veritysetup@.service.8 debian/tmp/usr/share/man/man8/systemd-volatile-root.8 debian/tmp/usr/share/man/man8/systemd-volatile-root.service.8 debian/tmp/usr/share/man/man8/systemd-xdg-autostart-generator.8 diff --git a/debian/tests/control b/debian/tests/control index c167f97..dcc19eb 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -25,6 +25,7 @@ Restrictions: needs-root, allow-stderr, breaks-testbed Tests: storage Depends: systemd, systemd-resolved, + systemd-cryptsetup, libpam-systemd, libnss-systemd, acl, @@ -39,6 +40,7 @@ Tests: networkd-test.py Tests-Directory: test Depends: systemd, systemd-resolved, + systemd-cryptsetup, libpam-systemd, libnss-systemd, acl, @@ -56,6 +58,7 @@ Restrictions: needs-root, isolation-container, breaks-testbed Tests: build-login Depends: systemd, systemd-resolved, + systemd-cryptsetup, libpam-systemd, libnss-systemd, acl, @@ -137,6 +140,8 @@ Depends: systemd-tests, systemd-oomd, systemd-homed, systemd-resolved, + systemd-repart, + systemd-cryptsetup, systemd-boot-efi [amd64 arm64 armhf i386 riscv64], libnss-myhostname, libnss-mymachines, |