From 61fde4824e76b4f29f5d61ade20ebd9e5d909ad428ed296e504a6e0cba9c4cd0 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 28 Mar 2022 19:03:59 +0000 Subject: [PATCH 1/5] - spec: enable 'efi' support regardless of whether sd_boot is enabled or not We should support EFI systems even if systemd-boot is not enabled. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1267 --- ...conf-parser-introduce-early-drop-ins.patch | 142 +++++++++--------- ...and-var-lock-bind-mount-if-they-aren.patch | 10 +- ...twork.service-an-alias-of-systemd-ne.patch | 29 ---- ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 90 +++++++++++ baselibs.conf | 5 +- files.container | 7 +- files.devel | 7 +- files.network | 9 ++ files.systemd | 103 ++++++++++--- files.udev | 9 +- systemd-v249.10+suse.86.g0bb1977021.tar.xz | 3 - systemd-v250.4+suse.35.g8ef8dfd540.tar.xz | 3 + systemd.changes | 7 + systemd.spec | 4 +- 14 files changed, 287 insertions(+), 141 deletions(-) delete mode 100644 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch create mode 100644 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch delete mode 100644 systemd-v249.10+suse.86.g0bb1977021.tar.xz create mode 100644 systemd-v250.4+suse.35.g8ef8dfd540.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index bf5a21d..bcd9614 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,4 +1,4 @@ -From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001 +From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 48 ++++++++++-- - src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 195 insertions(+), 5 deletions(-) + src/shared/conf-parser.c | 48 +++++++++-- + src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 197 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index d0ac1b2660..cb453fa50d 100644 +index 1e1967d7ea..eb81732dfa 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -430,6 +430,7 @@ int config_parse( +@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, static int config_parse_many_files( const char* const* conf_files, @@ -77,20 +77,20 @@ index d0ac1b2660..cb453fa50d 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -442,6 +443,12 @@ static int config_parse_many_files( - char **fn; - int r; - +@@ -481,6 +482,12 @@ static int config_parse_many_files( + stats_by_path = hashmap_new(&path_hash_ops_free_free); + if (!stats_by_path) + return -ENOMEM; ++ } ++ + STRV_FOREACH(fn, early_files) { -+ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + if (r < 0) + return r; -+ } -+ + } + /* First read the first found main config file. */ - STRV_FOREACH(fn, (char**) conf_files) { - r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); -@@ -464,6 +471,28 @@ static int config_parse_many_files( +@@ -521,6 +528,28 @@ static int config_parse_many_files( return 0; } @@ -119,9 +119,9 @@ index d0ac1b2660..cb453fa50d 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -475,15 +504,19 @@ int config_parse_many_nulstr( +@@ -532,15 +561,19 @@ int config_parse_many_nulstr( void *userdata, - usec_t *ret_mtime) { + Hashmap **ret_stats_by_path) { - _cleanup_strv_free_ char **files = NULL; + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; @@ -139,12 +139,12 @@ index d0ac1b2660..cb453fa50d 100644 + + return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, + sections, lookup, table, flags, userdata, - ret_mtime); + ret_stats_by_path); } -@@ -499,8 +532,8 @@ int config_parse_many( +@@ -556,8 +589,8 @@ int config_parse_many( void *userdata, - usec_t *ret_mtime) { + Hashmap **ret_stats_by_path) { + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; _cleanup_strv_free_ char **dropin_dirs = NULL; @@ -152,22 +152,22 @@ index d0ac1b2660..cb453fa50d 100644 const char *suffix; int r; -@@ -513,7 +546,12 @@ int config_parse_many( +@@ -570,7 +603,12 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + + return config_parse_many_files(conf_files, early_files, late_files, -+ sections, lookup, table, flags, userdata, ret_mtime); ++ sections, lookup, table, flags, userdata, ret_stats_by_path); } #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 5da864347e..77d9f28a79 100644 +index e61932ab16..de408272f0 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -179,9 +179,9 @@ index 5da864347e..77d9f28a79 100644 +#include "rm-rf.h" #include "string-util.h" #include "strv.h" - #include "tmpfile-util.h" -@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) { - } + #include "tests.h" +@@ -391,4 +394,155 @@ TEST(config_parse) { + test_config_parse_one(i, config_file[i]); } +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) { @@ -228,8 +228,8 @@ index 5da864347e..77d9f28a79 100644 + } +} + -+static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files, -+ const char *name, const char *early, const char *late) { ++static void test_config_parse_many_nulstr_one(bool nulstr, const char *main, char **conf_files, ++ const char *name, const char *early, const char *late) { + + _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL; + _cleanup_strv_free_ char **conf_dirs = NULL; @@ -281,67 +281,61 @@ index 5da864347e..77d9f28a79 100644 + assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); +} + -+static void test_config_parse_many(bool nulstr) { ++static void test_config_parse_many_nulstr(bool nulstr) { + log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : ""); + -+ test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL); ++ test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL, NULL); + -+ test_config_parse_many_one(nulstr, -+ "dir/main.conf", NULL, -+ "dir/main.conf", NULL, NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/main.conf", NULL, ++ "dir/main.conf", NULL, NULL); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/__50-foo.conf"), -+ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/__50-foo.conf"), ++ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), -+ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), ++ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + + /* Early conf files should never override the main one whatever their + * priority/location. */ -+ test_config_parse_many_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), -+ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), ++ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); + + /* Late conf files always take precendence over the early conf files + * and the main one. */ -+ test_config_parse_many_one(nulstr, -+ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", -+ "dir2/10-foo.conf"), -+ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", ++ "dir2/10-foo.conf"), ++ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); +} + - int main(int argc, char **argv) { - unsigned i; - -@@ -407,5 +556,8 @@ int main(int argc, char **argv) { - for (i = 0; i < ELEMENTSOF(config_file); i++) - test_config_parse(i, config_file[i]); - -+ test_config_parse_many(true); -+ test_config_parse_many(false); ++TEST(config_parse_many) { ++ test_config_parse_many_nulstr(true); ++ test_config_parse_many_nulstr(false); ++} + - return 0; - } + DEFINE_TEST_MAIN(LOG_INFO); -- -2.26.2 +2.34.1 diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch index 8cdd1ce..00e1cb0 100644 --- a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -1,4 +1,4 @@ -From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001 +From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 29 Oct 2012 13:01:20 +0000 Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they @@ -13,10 +13,10 @@ Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they create mode 100644 units/var-run.mount diff --git a/units/meson.build b/units/meson.build -index 17e9ead9c1..7b926f9f91 100644 +index a9bf28f6d9..739fd84d2c 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -160,6 +160,8 @@ units = [ +@@ -165,6 +165,8 @@ units = [ ['umount.target', ''], ['usb-gadget.target', ''], ['user.slice', ''], @@ -24,7 +24,7 @@ index 17e9ead9c1..7b926f9f91 100644 + ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], ['var-lib-machines.mount', 'ENABLE_MACHINED', 'remote-fs.target.wants/ machines.target.wants/'], - ] + ['systemd-oomd.socket', 'ENABLE_OOMD'], diff --git a/units/var-lock.mount b/units/var-lock.mount new file mode 100644 index 0000000000..07277adac3 @@ -76,5 +76,5 @@ index 0000000000..ab4da424c9 +Type=bind +Options=bind -- -2.26.2 +2.34.1 diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch deleted file mode 100644 index cb8f69a..0000000 --- a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001 -From: Pawel Wieczorkiewicz -Date: Tue, 2 Jun 2015 13:33:24 +0000 -Subject: [PATCH 07/11] networkd: make network.service an alias of - systemd-networkd.service - -NetworkManager and wicked does this already. This is needed by yast2 -and other parts of the system. - -[fixes boo#933092] ---- - units/systemd-networkd.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index ffa45ba049..6a5d0dea3c 100644 ---- a/units/systemd-networkd.service.in -+++ b/units/systemd-networkd.service.in -@@ -53,6 +53,7 @@ User=systemd-network - - [Install] - WantedBy=multi-user.target -+Alias=network.service - Also=systemd-networkd.socket - Alias=dbus-org.freedesktop.network1.service - --- -2.26.2 - diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch new file mode 100644 index 0000000..107b655 --- /dev/null +++ b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch @@ -0,0 +1,90 @@ +From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 17 Mar 2022 11:35:33 +0100 +Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin" + +This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. +--- + units/console-getty.service.in | 4 +--- + units/container-getty@.service.in | 4 +--- + units/getty@.service.in | 4 +--- + units/serial-getty@.service.in | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/units/console-getty.service.in b/units/console-getty.service.in +index 73871d6f50..bb67541dce 100644 +--- a/units/console-getty.service.in ++++ b/units/console-getty.service.in +@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM + Type=idle + Restart=always + UtmpIdentifier=cons +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/console + TTYReset=yes + TTYVHangup=yes +diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in +index a6e3f94e2a..ed1eb7bde1 100644 +--- a/units/container-getty@.service.in ++++ b/units/container-getty@.service.in +@@ -28,13 +28,11 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM + Type=idle + Restart=always + RestartSec=0 + UtmpIdentifier=pts/%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/pts/%I + TTYReset=yes + TTYVHangup=yes +diff --git a/units/getty@.service.in b/units/getty@.service.in +index 21d66f9367..78deb7cffe 100644 +--- a/units/getty@.service.in ++++ b/units/getty@.service.in +@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0 + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM + Type=idle + Restart=always + RestartSec=0 + UtmpIdentifier=%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/%I + TTYReset=yes + TTYVHangup=yes +diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in +index 2433124c55..bb7af3105d 100644 +--- a/units/serial-getty@.service.in ++++ b/units/serial-getty@.service.in +@@ -33,12 +33,10 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I $TERM + Type=idle + Restart=always + UtmpIdentifier=%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/%I + TTYReset=yes + TTYVHangup=yes +-- +2.34.1 + diff --git a/baselibs.conf b/baselibs.conf index 4e05606..d8badad 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,9 +2,10 @@ # https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart # systemd - supplements "packageand(systemd:pam-)" + supplements "(systemd and pam-)" -/lib/systemd/system/ - -/usr/lib/systemd/libsystemd-shared.*\.so + -/usr/lib/systemd + -/usr/lib/cryptsetup post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 diff --git a/files.container b/files.container index faac267..cae9352 100644 --- a/files.container +++ b/files.container @@ -3,7 +3,7 @@ # %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn %{_mandir}/man1/systemd-nspawn.1.gz @@ -17,6 +17,9 @@ %dir %{_unitdir}/machines.target.wants %{_bindir}/machinectl %{_datadir}/bash-completion/completions/machinectl +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy @@ -40,6 +43,8 @@ %endif %if %{with importd} +%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy diff --git a/files.devel b/files.devel index e551dc7..7cd0b08 100644 --- a/files.devel +++ b/files.devel @@ -7,7 +7,7 @@ %{_libdir}/libudev.so %{_libdir}/pkgconfig/libsystemd.pc %{_libdir}/pkgconfig/libudev.pc -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man3/SD_ALERT.3.gz %{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz %{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz @@ -55,6 +55,7 @@ %{_mandir}/man3/SD_BUS_PROPERTY.3.gz %{_mandir}/man3/SD_BUS_SIGNAL.3.gz %{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_CAPABILITY.3.gz %{_mandir}/man3/SD_BUS_VTABLE_END.3.gz %{_mandir}/man3/SD_BUS_VTABLE_START.3.gz %{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz @@ -84,6 +85,8 @@ %{_mandir}/man3/SD_ID128_MAKE_STR.3.gz %{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz %{_mandir}/man3/SD_ID128_NULL.3.gz +%{_mandir}/man3/SD_ID128_STRING_MAX.3.gz +%{_mandir}/man3/SD_ID128_TO_STRING.3.gz %{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz %{_mandir}/man3/SD_INFO.3.gz %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz @@ -426,6 +429,7 @@ %{_mandir}/man3/sd_event_add_defer.3.gz %{_mandir}/man3/sd_event_add_exit.3.gz %{_mandir}/man3/sd_event_add_inotify.3.gz +%{_mandir}/man3/sd_event_add_inotify_fd.3.gz %{_mandir}/man3/sd_event_add_io.3.gz %{_mandir}/man3/sd_event_add_post.3.gz %{_mandir}/man3/sd_event_add_signal.3.gz @@ -495,6 +499,7 @@ %{_mandir}/man3/sd_event_source_set_prepare.3.gz %{_mandir}/man3/sd_event_source_set_priority.3.gz %{_mandir}/man3/sd_event_source_set_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_set_ratelimit_expire_callback.3.gz %{_mandir}/man3/sd_event_source_set_time.3.gz %{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz %{_mandir}/man3/sd_event_source_set_time_relative.3.gz diff --git a/files.network b/files.network index 4118d63..9e3f698 100644 --- a/files.network +++ b/files.network @@ -7,6 +7,10 @@ %dir %{_systemd_util_dir}/network %{_bindir}/networkctl %{_datadir}/bash-completion/completions/networkctl +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Link.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Network.xml %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy @@ -15,11 +19,13 @@ %{_mandir}/man1/networkctl.1.gz %{_mandir}/man5/networkd.conf.5.gz %{_mandir}/man5/networkd.conf.d.5.gz +%{_mandir}/man5/org.freedesktop.network1.5.gz %{_mandir}/man5/systemd.network.5.gz %{_mandir}/man8/systemd-networkd-wait-online.8.gz %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz %{_mandir}/man8/systemd-networkd.8.gz %{_mandir}/man8/systemd-networkd.service.8.gz +%{_systemd_util_dir}/network/80-6rd-tunnel.network %{_systemd_util_dir}/network/80-container-host0.network %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.network @@ -40,6 +46,9 @@ %{_bindir}/systemd-resolve %{_datadir}/bash-completion/completions/resolvectl %{_datadir}/bash-completion/completions/systemd-resolve +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy diff --git a/files.systemd b/files.systemd index 8f0f173..b919c2a 100644 --- a/files.systemd +++ b/files.systemd @@ -8,11 +8,12 @@ %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_binfmtdir} -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %endif %dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/interfaces %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %dir %{_datadir}/dbus-1/system.d @@ -20,14 +21,15 @@ %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %dir %{_datadir}/systemd -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif -%dir %{xinitconfdir} -%dir %{xinitconfdir}/xinitrc.d %dir %{_environmentdir} %dir %{_journalcatalogdir} +%if ! %{bootstrap} +%dir %{_libdir}/cryptsetup +%endif %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} @@ -82,6 +84,8 @@ %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants %dir %{_unitdir}/timers.target.wants +%dir %{xinitconfdir} +%dir %{xinitconfdir}/xinitrc.d %doc %{_modprobedir}/README %doc %{_sysctldir}/README %doc %{_sysusersdir}/README @@ -113,7 +117,8 @@ %{_bindir}/systemd-cat %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop -%if ! 0%{?bootstrap} +%{_bindir}/systemd-creds +%if ! %{bootstrap} %{_bindir}/systemd-cryptenroll %endif %{_bindir}/systemd-delta @@ -136,7 +141,7 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-umount %{_bindir}/timedatectl -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %if %{with sd_boot} %{_datadir}/bash-completion/completions/bootctl %endif @@ -160,6 +165,29 @@ %{_datadir}/bash-completion/completions/systemd-run %{_datadir}/bash-completion/completions/timedatectl %endif +# dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294 +%{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Seat.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Session.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.User.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service @@ -181,7 +209,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %if %{with sd_boot} %{_datadir}/zsh/site-functions/_bootctl %endif @@ -205,7 +233,6 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog @@ -220,6 +247,11 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if ! 0%{bootstrap} +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%endif +%if ! 0%{bootstrap} %if %{with sd_boot} %{_mandir}/man1/bootctl.1.gz %endif @@ -235,6 +267,7 @@ %{_mandir}/man1/systemd-cat.1.gz %{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgtop.1.gz +%{_mandir}/man1/systemd-creds.1.gz %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz @@ -250,6 +283,7 @@ %{_mandir}/man1/systemd-path.1.gz %{_mandir}/man1/systemd-run.1.gz %{_mandir}/man1/systemd-socket-activate.1.gz +%{_mandir}/man1/systemd-stdio-bridge.1.gz %{_mandir}/man1/systemd-tty-ask-password-agent.1.gz %{_mandir}/man1/systemd-umount.1.gz %{_mandir}/man1/systemd.1.gz @@ -258,8 +292,10 @@ %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz +%{_mandir}/man5/extension-release.5.gz %{_mandir}/man5/hostname.5.gz %{_mandir}/man5/initrd-release.5.gz +%{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald@.conf.5.gz @@ -323,8 +359,12 @@ %{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/kernel-command-line.7.gz %if %{with sd_boot} +%{_mandir}/man7/linuxaa64.efi.stub.7.gz +%{_mandir}/man7/linuxia32.efi.stub.7.gz +%{_mandir}/man7/linuxx64.efi.stub.7.gz %{_mandir}/man7/sd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz +%{_mandir}/man7/systemd-stub.7.gz %endif %{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz @@ -383,6 +423,9 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz +%{_mandir}/man8/systemd-integritysetup-generator.8.gz +%{_mandir}/man8/systemd-integritysetup.8.gz +%{_mandir}/man8/systemd-integritysetup@.service.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -455,7 +498,7 @@ %{_modprobedir}/systemd.conf %{_pam_moduledir}/pam_systemd.so %{_pam_vendordir}/systemd-user -%{_prefix}/lib/kernel/install.d/00-entry-directory.install +%{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_sbindir}/halt @@ -472,7 +515,7 @@ %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi %endif -%{_systemd_util_dir}/libsystemd-shared-249.so +%{_systemd_util_dir}/libsystemd-shared-250.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -486,13 +529,16 @@ %endif %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif %{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-integritysetup +%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind @@ -516,7 +562,7 @@ %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-vconsole-setup -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemd_util_dir}/systemd-veritysetup %endif %{_systemd_util_dir}/systemd-volatile-root @@ -548,7 +594,7 @@ %if %{with sd_boot} %{_systemdgeneratordir}/systemd-bless-boot-generator %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemdgeneratordir}/systemd-cryptsetup-generator %endif %{_systemdgeneratordir}/systemd-debug-generator @@ -556,9 +602,12 @@ %{_systemdgeneratordir}/systemd-getty-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-integritysetup-generator +%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_sysusersdir}/systemd-journal.conf @@ -586,7 +635,7 @@ %{_unitdir}/boot-complete.target %{_unitdir}/console-getty.service %{_unitdir}/container-getty@.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/cryptsetup-pre.target %{_unitdir}/cryptsetup.target %endif @@ -602,6 +651,7 @@ %{_unitdir}/emergency.service %{_unitdir}/emergency.target %{_unitdir}/exit.target +%{_unitdir}/factory-reset.target %{_unitdir}/final.target %{_unitdir}/first-boot-complete.target %{_unitdir}/getty-pre.target @@ -615,7 +665,7 @@ %{_unitdir}/initrd-fs.target %{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-root-device.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target %endif @@ -624,6 +674,10 @@ %{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd.target +%if ! %{bootstrap} +%{_unitdir}/integritysetup-pre.target +%{_unitdir}/integritysetup.target +%endif %{_unitdir}/kexec.target %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target @@ -646,12 +700,12 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service %{_unitdir}/reboot.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/remote-cryptsetup.target %endif %{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/remote-veritysetup.target %endif %{_unitdir}/rescue.service @@ -675,11 +729,14 @@ %{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/sysinit.target.wants/cryptsetup.target %endif %{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-mqueue.mount +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/integritysetup.target +%endif %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount @@ -703,11 +760,11 @@ %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/sysinit.target.wants/veritysetup.target %endif %{_unitdir}/syslog.socket -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/system-update-cleanup.service @@ -725,6 +782,7 @@ %{_unitdir}/systemd-boot-check-no-failures.service %if %{with sd_boot} %{_unitdir}/systemd-boot-system-token.service +%{_unitdir}/systemd-boot-update.service %endif %{_unitdir}/systemd-exit.service %{_unitdir}/systemd-firstboot.service @@ -784,10 +842,11 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup.target %endif +%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl /sbin/halt diff --git a/files.udev b/files.udev index 4f75bcc..52a309e 100644 --- a/files.udev +++ b/files.udev @@ -14,14 +14,14 @@ %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %{_bindir}/systemd-hwdb %{_bindir}/udevadm -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/zsh/site-functions/_udevadm %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man5/udev.conf.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz @@ -70,6 +70,8 @@ %{_udevhwdbdir}/60-keyboard.hwdb %{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-sensor.hwdb +%{_udevhwdbdir}/70-analyzers.hwdb +%{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb @@ -92,6 +94,7 @@ %{_udevrulesdir}/60-serial.rules %{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/64-btrfs.rules +%{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips %{_udevrulesdir}/70-memory.rules diff --git a/systemd-v249.10+suse.86.g0bb1977021.tar.xz b/systemd-v249.10+suse.86.g0bb1977021.tar.xz deleted file mode 100644 index fdcaf7f..0000000 --- a/systemd-v249.10+suse.86.g0bb1977021.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812 -size 7281992 diff --git a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz new file mode 100644 index 0000000..d2bee6f --- /dev/null +++ b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5 +size 7626056 diff --git a/systemd.changes b/systemd.changes index e8567d8..06dfd7a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 28 17:02:04 UTC 2022 - Franck Bui + +- spec: enable 'efi' support regardless of whether sd_boot is enabled or not + + We should support EFI systems even if systemd-boot is not enabled. + ------------------------------------------------------------------- Wed Mar 23 15:17:40 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 464b683..53805e4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -675,12 +675,15 @@ Have fun with these services at your own risk. -Delfutils=auto \ -Doomd=false \ %if %{bootstrap} + -Defi=false \ -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ -Dtranslations=false \ -Dnss-myhostname=false \ -Dnss-systemd=false \ %else + -Defi=true \ + -Dtpm=true \ -Dtpm2=true \ -Dman=true \ -Dhtml=true \ @@ -692,7 +695,6 @@ Have fun with these services at your own risk. -Dportabled=%{when portabled} \ -Dremote=%{when journal_remote} \ \ - -Defi=%{when sd_boot} \ -Dgnu-efi=%{when sd_boot} \ -Dsbat-distro= \ \ From 7fb63d1d262b7e958996f561a43ca63fdf91df16d1ebc2bcf003934c27debb67 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 29 Mar 2022 09:34:07 +0000 Subject: [PATCH 2/5] - Move systemd-boot and all components managing (secure) UEFI boot into udev sub-package: they may deserve a dedicated sub-package in the future but for now move them to udev so they aren't installed in systemd based containers. - Move a bunch of components operating on (mainly block) devices into udev as without udev they're most likely useless. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1268 --- files.systemd | 178 ------------------------------------------------ files.udev | 117 +++++++++++++++++++++++++++++++ files.uefi-boot | 34 +++++++++ systemd.changes | 10 +++ systemd.spec | 55 ++++++++------- 5 files changed, 192 insertions(+), 202 deletions(-) create mode 100644 files.uefi-boot diff --git a/files.systemd b/files.systemd index b919c2a..044ab79 100644 --- a/files.systemd +++ b/files.systemd @@ -27,18 +27,11 @@ %endif %dir %{_environmentdir} %dir %{_journalcatalogdir} -%if ! %{bootstrap} -%dir %{_libdir}/cryptsetup -%endif %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} -%dir %{_modulesloaddir} -%dir %{_prefix}/lib/kernel -%dir %{_prefix}/lib/kernel/install.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/binfmt.d -%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system @@ -49,10 +42,6 @@ %dir %{_systemd_system_env_generator_dir} %dir %{_systemd_user_env_generator_dir} %dir %{_systemd_util_dir} -%if %{with sd_boot} -%dir %{_systemd_util_dir}/boot -%dir %{_systemd_util_dir}/boot/efi -%endif %dir %{_systemd_util_dir}/ntp-units.d %dir %{_systemd_util_dir}/scripts %dir %{_systemd_util_dir}/system-preset @@ -97,18 +86,13 @@ %ghost %config(noreplace) %{_sysconfdir}/machine-info %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal -%ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/i18n-migrated %license LICENSE.GPL2 %license LICENSE.LGPL2.1 -%if %{with sd_boot} -%{_bindir}/bootctl -%endif %{_bindir}/busctl %{_bindir}/hostnamectl %{_bindir}/journalctl -%{_bindir}/kernel-install %{_bindir}/localectl %{_bindir}/loginctl %{_bindir}/systemctl @@ -118,9 +102,6 @@ %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-creds -%if ! %{bootstrap} -%{_bindir}/systemd-cryptenroll -%endif %{_bindir}/systemd-delta %{_bindir}/systemd-detect-virt %{_bindir}/systemd-dissect @@ -142,14 +123,10 @@ %{_bindir}/systemd-umount %{_bindir}/timedatectl %if ! %{bootstrap} -%if %{with sd_boot} -%{_datadir}/bash-completion/completions/bootctl -%endif %{_datadir}/bash-completion/completions/busctl %{_datadir}/bash-completion/completions/coredumpctl %{_datadir}/bash-completion/completions/hostnamectl %{_datadir}/bash-completion/completions/journalctl -%{_datadir}/bash-completion/completions/kernel-install %{_datadir}/bash-completion/completions/localectl %{_datadir}/bash-completion/completions/loginctl %{_datadir}/bash-completion/completions/portablectl @@ -210,14 +187,10 @@ %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map %if ! %{bootstrap} -%if %{with sd_boot} -%{_datadir}/zsh/site-functions/_bootctl -%endif %{_datadir}/zsh/site-functions/_busctl %{_datadir}/zsh/site-functions/_coredumpctl %{_datadir}/zsh/site-functions/_hostnamectl %{_datadir}/zsh/site-functions/_journalctl -%{_datadir}/zsh/site-functions/_kernel-install %{_datadir}/zsh/site-functions/_localectl %{_datadir}/zsh/site-functions/_loginctl %{_datadir}/zsh/site-functions/_sd_hosts_or_user_at_host @@ -247,14 +220,6 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if ! 0%{bootstrap} -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so -%endif -%if ! 0%{bootstrap} -%if %{with sd_boot} -%{_mandir}/man1/bootctl.1.gz -%endif %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/init.1.gz @@ -268,7 +233,6 @@ %{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgtop.1.gz %{_mandir}/man1/systemd-creds.1.gz -%{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz %{_mandir}/man1/systemd-dissect.1.gz @@ -289,26 +253,20 @@ %{_mandir}/man1/systemd.1.gz %{_mandir}/man1/timedatectl.1.gz %{_mandir}/man5/binfmt.d.5.gz -%{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz %{_mandir}/man5/extension-release.5.gz %{_mandir}/man5/hostname.5.gz %{_mandir}/man5/initrd-release.5.gz -%{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald@.conf.5.gz -%if %{with sd_boot} -%{_mandir}/man5/loader.conf.5.gz -%endif %{_mandir}/man5/locale.conf.5.gz %{_mandir}/man5/localtime.5.gz %{_mandir}/man5/logind.conf.5.gz %{_mandir}/man5/logind.conf.d.5.gz %{_mandir}/man5/machine-id.5.gz %{_mandir}/man5/machine-info.5.gz -%{_mandir}/man5/modules-load.d.5.gz %{_mandir}/man5/org.freedesktop.LogControl1.5.gz %{_mandir}/man5/org.freedesktop.hostname1.5.gz %{_mandir}/man5/org.freedesktop.locale1.5.gz @@ -353,19 +311,10 @@ %{_mandir}/man5/user.conf.d.5.gz %{_mandir}/man5/user@.service.5.gz %{_mandir}/man5/vconsole.conf.5.gz -%{_mandir}/man5/veritytab.5.gz %{_mandir}/man7/bootup.7.gz %{_mandir}/man7/daemon.7.gz %{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/kernel-command-line.7.gz -%if %{with sd_boot} -%{_mandir}/man7/linuxaa64.efi.stub.7.gz -%{_mandir}/man7/linuxia32.efi.stub.7.gz -%{_mandir}/man7/linuxx64.efi.stub.7.gz -%{_mandir}/man7/sd-boot.7.gz -%{_mandir}/man7/systemd-boot.7.gz -%{_mandir}/man7/systemd-stub.7.gz -%endif %{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz %{_mandir}/man7/systemd.generator.7.gz @@ -378,7 +327,6 @@ %{_mandir}/man7/systemd.time.7.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz %{_mandir}/man8/halt.8.gz -%{_mandir}/man8/kernel-install.8.gz %{_mandir}/man8/pam_systemd.8.gz %{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/rc-local.service.8.gz @@ -388,33 +336,16 @@ %{_mandir}/man8/systemd-ask-password-console.service.8.gz %{_mandir}/man8/systemd-ask-password-wall.path.8.gz %{_mandir}/man8/systemd-ask-password-wall.service.8.gz -%{_mandir}/man8/systemd-backlight.8.gz -%{_mandir}/man8/systemd-backlight@.service.8.gz %{_mandir}/man8/systemd-binfmt.8.gz %{_mandir}/man8/systemd-binfmt.service.8.gz -%if %{with sd_boot} -%{_mandir}/man8/systemd-bless-boot-generator.8.gz -%{_mandir}/man8/systemd-bless-boot.8.gz -%{_mandir}/man8/systemd-bless-boot.service.8.gz -%endif %{_mandir}/man8/systemd-boot-check-no-failures.8.gz %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz -%if %{with sd_boot} -%{_mandir}/man8/systemd-boot-system-token.service.8.gz -%endif -%{_mandir}/man8/systemd-cryptsetup-generator.8.gz -%{_mandir}/man8/systemd-cryptsetup.8.gz -%{_mandir}/man8/systemd-cryptsetup@.service.8.gz %{_mandir}/man8/systemd-debug-generator.8.gz %{_mandir}/man8/systemd-environment-d-generator.8.gz %{_mandir}/man8/systemd-fsck-root.service.8.gz %{_mandir}/man8/systemd-fsck.8.gz %{_mandir}/man8/systemd-fsck@.service.8.gz -%{_mandir}/man8/systemd-fstab-generator.8.gz %{_mandir}/man8/systemd-getty-generator.8.gz -%{_mandir}/man8/systemd-gpt-auto-generator.8.gz -%{_mandir}/man8/systemd-growfs.8.gz -%{_mandir}/man8/systemd-growfs@.service.8.gz %{_mandir}/man8/systemd-halt.service.8.gz %{_mandir}/man8/systemd-hibernate-resume-generator.8.gz %{_mandir}/man8/systemd-hibernate-resume.8.gz @@ -423,9 +354,6 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz -%{_mandir}/man8/systemd-integritysetup-generator.8.gz -%{_mandir}/man8/systemd-integritysetup.8.gz -%{_mandir}/man8/systemd-integritysetup@.service.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -440,11 +368,7 @@ %{_mandir}/man8/systemd-logind.8.gz %{_mandir}/man8/systemd-logind.service.8.gz %{_mandir}/man8/systemd-machine-id-commit.service.8.gz -%{_mandir}/man8/systemd-makefs.8.gz -%{_mandir}/man8/systemd-makefs@.service.8.gz %{_mandir}/man8/systemd-mkswap@.service.8.gz -%{_mandir}/man8/systemd-modules-load.8.gz -%{_mandir}/man8/systemd-modules-load.service.8.gz %{_mandir}/man8/systemd-poweroff.service.8.gz %{_mandir}/man8/systemd-quotacheck.8.gz %{_mandir}/man8/systemd-quotacheck.service.8.gz @@ -453,9 +377,6 @@ %{_mandir}/man8/systemd-reboot.service.8.gz %{_mandir}/man8/systemd-remount-fs.8.gz %{_mandir}/man8/systemd-remount-fs.service.8.gz -%{_mandir}/man8/systemd-rfkill.8.gz -%{_mandir}/man8/systemd-rfkill.service.8.gz -%{_mandir}/man8/systemd-rfkill.socket.8.gz %{_mandir}/man8/systemd-run-generator.8.gz %{_mandir}/man8/systemd-shutdown.8.gz %{_mandir}/man8/systemd-sleep.8.gz @@ -477,7 +398,6 @@ %{_mandir}/man8/systemd-timesyncd.service.8.gz %{_mandir}/man8/systemd-tmpfiles-clean.service.8.gz %{_mandir}/man8/systemd-tmpfiles-clean.timer.8.gz -%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz %{_mandir}/man8/systemd-tmpfiles-setup.service.8.gz %{_mandir}/man8/systemd-tmpfiles.8.gz %{_mandir}/man8/systemd-update-done.8.gz @@ -488,19 +408,11 @@ %{_mandir}/man8/systemd-user-sessions.service.8.gz %{_mandir}/man8/systemd-vconsole-setup.8.gz %{_mandir}/man8/systemd-vconsole-setup.service.8.gz -%{_mandir}/man8/systemd-veritysetup-generator.8.gz -%{_mandir}/man8/systemd-veritysetup.8.gz -%{_mandir}/man8/systemd-veritysetup@.service.8.gz -%{_mandir}/man8/systemd-volatile-root.8.gz -%{_mandir}/man8/systemd-volatile-root.service.8.gz %{_mandir}/man8/systemd-xdg-autostart-generator.8.gz %endif %{_modprobedir}/systemd.conf %{_pam_moduledir}/pam_systemd.so %{_pam_vendordir}/systemd-user -%{_prefix}/lib/kernel/install.conf -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_sbindir}/halt %{_sbindir}/init %{_sbindir}/poweroff @@ -509,12 +421,6 @@ %{_sysconfdir}/xdg/systemd/user %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator -%if %{with sd_boot} -# These are part of the very few exceptions where glob pattern is allowd. -%{_systemd_util_dir}/boot/efi/linux*.efi.stub -%{_systemd_util_dir}/boot/efi/linux*.elf.stub -%{_systemd_util_dir}/boot/efi/systemd-boot*.efi -%endif %{_systemd_util_dir}/libsystemd-shared-250.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh @@ -522,33 +428,19 @@ %{_systemd_util_dir}/system-preset/99-default.preset %{_systemd_util_dir}/systemd %{_systemd_util_dir}/systemd-ac-power -%{_systemd_util_dir}/systemd-backlight %{_systemd_util_dir}/systemd-binfmt -%if %{with sd_boot} -%{_systemd_util_dir}/systemd-bless-boot -%endif %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-cryptsetup -%endif %{_systemd_util_dir}/systemd-fsck -%{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-integritysetup -%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind -%{_systemd_util_dir}/systemd-makefs -%{_systemd_util_dir}/systemd-modules-load %{_systemd_util_dir}/systemd-quotacheck %{_systemd_util_dir}/systemd-random-seed %{_systemd_util_dir}/systemd-remount-fs %{_systemd_util_dir}/systemd-reply-password -%{_systemd_util_dir}/systemd-rfkill %{_systemd_util_dir}/systemd-shutdown %{_systemd_util_dir}/systemd-sleep %{_systemd_util_dir}/systemd-socket-proxyd @@ -562,10 +454,6 @@ %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-vconsole-setup -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-veritysetup -%endif -%{_systemd_util_dir}/systemd-volatile-root %{_systemd_util_dir}/systemd-xdg-autostart-condition %{_systemd_util_dir}/user-generators/systemd-xdg-autostart-generator %{_systemd_util_dir}/user-preset/90-systemd.preset @@ -591,25 +479,11 @@ %{_systemd_util_dir}/user/systemd-tmpfiles-setup.service %{_systemd_util_dir}/user/timers.target %{_systemd_util_dir}/user/xdg-desktop-autostart.target -%if %{with sd_boot} -%{_systemdgeneratordir}/systemd-bless-boot-generator -%endif -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-cryptsetup-generator -%endif %{_systemdgeneratordir}/systemd-debug-generator -%{_systemdgeneratordir}/systemd-fstab-generator %{_systemdgeneratordir}/systemd-getty-generator -%{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-integritysetup-generator -%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-veritysetup-generator -%endif %{_sysusersdir}/systemd-journal.conf %if %{with networkd} # Yes, systemd-network.conf really belongs here, see @@ -635,10 +509,6 @@ %{_unitdir}/boot-complete.target %{_unitdir}/console-getty.service %{_unitdir}/container-getty@.service -%if ! %{bootstrap} -%{_unitdir}/cryptsetup-pre.target -%{_unitdir}/cryptsetup.target -%endif %{_unitdir}/ctrl-alt-del.target %{_unitdir}/dbus-org.freedesktop.hostname1.service %{_unitdir}/dbus-org.freedesktop.locale1.service @@ -665,19 +535,11 @@ %{_unitdir}/initrd-fs.target %{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-root-device.target -%if ! %{bootstrap} -%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target -%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target -%endif %{_unitdir}/initrd-root-fs.target %{_unitdir}/initrd-switch-root.service %{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd.target -%if ! %{bootstrap} -%{_unitdir}/integritysetup-pre.target -%{_unitdir}/integritysetup.target -%endif %{_unitdir}/kexec.target %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target @@ -700,14 +562,8 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service %{_unitdir}/reboot.target -%if ! %{bootstrap} -%{_unitdir}/remote-cryptsetup.target -%endif %{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs.target -%if ! %{bootstrap} -%{_unitdir}/remote-veritysetup.target -%endif %{_unitdir}/rescue.service %{_unitdir}/rescue.target %{_unitdir}/rpcbind.target @@ -729,14 +585,8 @@ %{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/cryptsetup.target -%endif %{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-mqueue.mount -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/integritysetup.target -%endif %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount @@ -744,29 +594,18 @@ %{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount %{_unitdir}/sysinit.target.wants/systemd-ask-password-console.path %{_unitdir}/sysinit.target.wants/systemd-binfmt.service -%if %{with sd_boot} -%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service -%endif %{_unitdir}/sysinit.target.wants/systemd-firstboot.service %{_unitdir}/sysinit.target.wants/systemd-journal-catalog-update.service %{_unitdir}/sysinit.target.wants/systemd-journal-flush.service %{_unitdir}/sysinit.target.wants/systemd-journald.service %{_unitdir}/sysinit.target.wants/systemd-machine-id-commit.service -%{_unitdir}/sysinit.target.wants/systemd-modules-load.service %{_unitdir}/sysinit.target.wants/systemd-random-seed.service %{_unitdir}/sysinit.target.wants/systemd-sysctl.service %{_unitdir}/sysinit.target.wants/systemd-sysusers.service -%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/veritysetup.target -%endif %{_unitdir}/syslog.socket -%if ! %{bootstrap} -%{_unitdir}/system-systemd\x2dcryptsetup.slice -%endif %{_unitdir}/system-update-cleanup.service %{_unitdir}/system-update-pre.target %{_unitdir}/system-update.target @@ -774,16 +613,8 @@ %{_unitdir}/systemd-ask-password-console.service %{_unitdir}/systemd-ask-password-wall.path %{_unitdir}/systemd-ask-password-wall.service -%{_unitdir}/systemd-backlight@.service %{_unitdir}/systemd-binfmt.service -%if %{with sd_boot} -%{_unitdir}/systemd-bless-boot.service -%endif %{_unitdir}/systemd-boot-check-no-failures.service -%if %{with sd_boot} -%{_unitdir}/systemd-boot-system-token.service -%{_unitdir}/systemd-boot-update.service -%endif %{_unitdir}/systemd-exit.service %{_unitdir}/systemd-firstboot.service %{_unitdir}/systemd-fsck-root.service @@ -805,14 +636,11 @@ %{_unitdir}/systemd-localed.service %{_unitdir}/systemd-logind.service %{_unitdir}/systemd-machine-id-commit.service -%{_unitdir}/systemd-modules-load.service %{_unitdir}/systemd-poweroff.service %{_unitdir}/systemd-quotacheck.service %{_unitdir}/systemd-random-seed.service %{_unitdir}/systemd-reboot.service %{_unitdir}/systemd-remount-fs.service -%{_unitdir}/systemd-rfkill.service -%{_unitdir}/systemd-rfkill.socket %{_unitdir}/systemd-suspend-then-hibernate.service %{_unitdir}/systemd-suspend.service %{_unitdir}/systemd-sysctl.service @@ -823,13 +651,11 @@ %{_unitdir}/systemd-timesyncd.service %{_unitdir}/systemd-tmpfiles-clean.service %{_unitdir}/systemd-tmpfiles-clean.timer -%{_unitdir}/systemd-tmpfiles-setup-dev.service %{_unitdir}/systemd-tmpfiles-setup.service %{_unitdir}/systemd-update-done.service %{_unitdir}/systemd-update-utmp.service %{_unitdir}/systemd-user-sessions.service %{_unitdir}/systemd-vconsole-setup.service -%{_unitdir}/systemd-volatile-root.service %{_unitdir}/time-set.target %{_unitdir}/time-sync.target %{_unitdir}/timers.target @@ -842,10 +668,6 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if ! %{bootstrap} -%{_unitdir}/veritysetup-pre.target -%{_unitdir}/veritysetup.target -%endif %{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl diff --git a/files.udev b/files.udev index 52a309e..389f959 100644 --- a/files.udev +++ b/files.udev @@ -2,7 +2,16 @@ # Please keep the list sorted (with `LC_ALL=C sort`). # %config(noreplace) %{_sysconfdir}/udev/udev.conf +%if ! %{bootstrap} +%dir %{_libdir}/cryptsetup +%dir %{_modulesloaddir} +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d +%endif %dir %{_prefix}/lib/udev +%if ! %{bootstrap} +%dir %{_sysconfdir}/modules-load.d +%endif %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %dir %{_systemd_util_dir}/network @@ -12,28 +21,72 @@ %doc %{_udevrulesdir}/README %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation +%ghost %{_localstatedir}/lib/systemd/backlight +%if ! %{bootstrap} +%{_bindir}/kernel-install +%{_bindir}/systemd-cryptenroll +%endif %{_bindir}/systemd-hwdb %{_bindir}/udevadm %if ! %{bootstrap} +%{_datadir}/bash-completion/completions/kernel-install %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc %if ! %{bootstrap} +%{_datadir}/zsh/site-functions/_kernel-install %{_datadir}/zsh/site-functions/_udevadm %endif %if ! %{bootstrap} +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%{_mandir}/man1/systemd-cryptenroll.1.gz +%{_mandir}/man5/crypttab.5.gz +%{_mandir}/man5/integritytab.5.gz +%{_mandir}/man5/modules-load.d.5.gz %{_mandir}/man5/udev.conf.5.gz +%{_mandir}/man5/veritytab.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz +%{_mandir}/man8/kernel-install.8.gz +%{_mandir}/man8/systemd-backlight.8.gz +%{_mandir}/man8/systemd-backlight@.service.8.gz +%{_mandir}/man8/systemd-cryptsetup-generator.8.gz +%{_mandir}/man8/systemd-cryptsetup.8.gz +%{_mandir}/man8/systemd-cryptsetup@.service.8.gz +%{_mandir}/man8/systemd-fstab-generator.8.gz +%{_mandir}/man8/systemd-gpt-auto-generator.8.gz +%{_mandir}/man8/systemd-growfs.8.gz +%{_mandir}/man8/systemd-growfs@.service.8.gz %{_mandir}/man8/systemd-hwdb.8.gz +%{_mandir}/man8/systemd-integritysetup-generator.8.gz +%{_mandir}/man8/systemd-integritysetup.8.gz +%{_mandir}/man8/systemd-integritysetup@.service.8.gz +%{_mandir}/man8/systemd-makefs.8.gz +%{_mandir}/man8/systemd-makefs@.service.8.gz +%{_mandir}/man8/systemd-modules-load.8.gz +%{_mandir}/man8/systemd-modules-load.service.8.gz %{_mandir}/man8/systemd-network-generator.8.gz %{_mandir}/man8/systemd-network-generator.service.8.gz +%{_mandir}/man8/systemd-rfkill.8.gz +%{_mandir}/man8/systemd-rfkill.service.8.gz +%{_mandir}/man8/systemd-rfkill.socket.8.gz +%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz %{_mandir}/man8/systemd-udev-settle.service.8.gz %{_mandir}/man8/systemd-udevd-control.socket.8.gz %{_mandir}/man8/systemd-udevd-kernel.socket.8.gz %{_mandir}/man8/systemd-udevd.8.gz %{_mandir}/man8/systemd-udevd.service.8.gz +%{_mandir}/man8/systemd-veritysetup-generator.8.gz +%{_mandir}/man8/systemd-veritysetup.8.gz +%{_mandir}/man8/systemd-veritysetup@.service.8.gz +%{_mandir}/man8/systemd-volatile-root.8.gz +%{_mandir}/man8/systemd-volatile-root.service.8.gz %{_mandir}/man8/udevadm.8.gz +%{_prefix}/lib/kernel/install.conf +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install %endif %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id @@ -47,8 +100,34 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_systemd_util_dir}/network/99-default.link +%{_systemd_util_dir}/systemd-backlight +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-cryptsetup +%endif +%{_systemd_util_dir}/systemd-growfs +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-integritysetup +%endif +%{_systemd_util_dir}/systemd-makefs +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-modules-load +%endif %{_systemd_util_dir}/systemd-network-generator +%{_systemd_util_dir}/systemd-rfkill %{_systemd_util_dir}/systemd-udevd +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-veritysetup +%endif +%{_systemd_util_dir}/systemd-volatile-root +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-cryptsetup-generator +%endif +%{_systemdgeneratordir}/systemd-fstab-generator +%{_systemdgeneratordir}/systemd-gpt-auto-generator +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-integritysetup-generator +%{_systemdgeneratordir}/systemd-veritysetup-generator +%endif %{_tmpfilesdir}/static-nodes-permissions.conf %{_udevhwdbdir}/20-OUI.hwdb %{_udevhwdbdir}/20-acpi-vendor.hwdb @@ -105,25 +184,63 @@ %{_udevrulesdir}/75-net-description.rules %{_udevrulesdir}/75-probe_mtd.rules %{_udevrulesdir}/78-sound-card.rules +%if ! %{bootstrap} %{_udevrulesdir}/80-drivers.rules +%endif %{_udevrulesdir}/80-net-setup-link.rules %{_udevrulesdir}/81-net-dhcp.rules %{_udevrulesdir}/90-vconsole.rules +%if ! %{bootstrap} +%{_unitdir}/cryptsetup-pre.target +%{_unitdir}/cryptsetup.target +%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target +%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target +%endif %{_unitdir}/initrd-udevadm-cleanup-db.service +%if ! %{bootstrap} +%{_unitdir}/integritysetup-pre.target +%{_unitdir}/integritysetup.target %{_unitdir}/kmod-static-nodes.service +%{_unitdir}/remote-cryptsetup.target +%{_unitdir}/remote-veritysetup.target +%endif %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/cryptsetup.target +%{_unitdir}/sysinit.target.wants/integritysetup.target %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%endif %{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/systemd-modules-load.service +%endif +%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service %{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service %{_unitdir}/sysinit.target.wants/systemd-udevd.service +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/veritysetup.target +%{_unitdir}/system-systemd\x2dcryptsetup.slice +%endif +%{_unitdir}/systemd-backlight@.service %{_unitdir}/systemd-hwdb-update.service +%if ! %{bootstrap} +%{_unitdir}/systemd-modules-load.service +%endif %{_unitdir}/systemd-network-generator.service +%{_unitdir}/systemd-rfkill.service +%{_unitdir}/systemd-rfkill.socket +%{_unitdir}/systemd-tmpfiles-setup-dev.service %{_unitdir}/systemd-udev-settle.service %{_unitdir}/systemd-udev-trigger.service %{_unitdir}/systemd-udevd-control.socket %{_unitdir}/systemd-udevd-kernel.socket %{_unitdir}/systemd-udevd.service +%{_unitdir}/systemd-volatile-root.service +%if ! %{bootstrap} +%{_unitdir}/veritysetup-pre.target +%{_unitdir}/veritysetup.target +%endif %if %{with split_usr} /sbin/udevadm %endif diff --git a/files.uefi-boot b/files.uefi-boot new file mode 100644 index 0000000..ebb3ff2 --- /dev/null +++ b/files.uefi-boot @@ -0,0 +1,34 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%if %{with sd_boot} +%dir %{_systemd_util_dir}/boot +%dir %{_systemd_util_dir}/boot/efi +%{_bindir}/bootctl +%if ! %{bootstrap} +%{_datadir}/bash-completion/completions/bootctl +%{_datadir}/zsh/site-functions/_bootctl +%{_mandir}/man1/bootctl.1.gz +%{_mandir}/man5/loader.conf.5.gz +%{_mandir}/man7/linuxaa64.efi.stub.7.gz +%{_mandir}/man7/linuxia32.efi.stub.7.gz +%{_mandir}/man7/linuxx64.efi.stub.7.gz +%{_mandir}/man7/sd-boot.7.gz +%{_mandir}/man7/systemd-boot.7.gz +%{_mandir}/man7/systemd-stub.7.gz +%{_mandir}/man8/systemd-bless-boot-generator.8.gz +%{_mandir}/man8/systemd-bless-boot.8.gz +%{_mandir}/man8/systemd-bless-boot.service.8.gz +%{_mandir}/man8/systemd-boot-system-token.service.8.gz +%endif +# These are part of the very few exceptions where glob pattern is allowd. +%{_systemd_util_dir}/boot/efi/linux*.efi.stub +%{_systemd_util_dir}/boot/efi/linux*.elf.stub +%{_systemd_util_dir}/boot/efi/systemd-boot*.efi +%{_systemd_util_dir}/systemd-bless-boot +%{_systemdgeneratordir}/systemd-bless-boot-generator +%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service +%{_unitdir}/systemd-bless-boot.service +%{_unitdir}/systemd-boot-system-token.service +%{_unitdir}/systemd-boot-update.service +%endif diff --git a/systemd.changes b/systemd.changes index 06dfd7a..5c3597e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 28 18:36:39 UTC 2022 - Franck Bui + +- Move systemd-boot and all components managing (secure) UEFI boot into udev + sub-package: they may deserve a dedicated sub-package in the future but for + now move them to udev so they aren't installed in systemd based containers. + +- Move a bunch of components operating on (mainly block) devices into udev as + without udev they're most likely useless. + ------------------------------------------------------------------- Mon Mar 28 17:02:04 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 53805e4..f097922 100644 --- a/systemd.spec +++ b/systemd.spec @@ -87,9 +87,7 @@ BuildRequires: polkit BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(audit) -BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) -BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) @@ -97,9 +95,6 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) -BuildRequires: pkgconfig(tss2-esys) -BuildRequires: pkgconfig(tss2-mu) -BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -117,20 +112,7 @@ BuildRequires: python3-jinja2 BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 -BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 -%if %{with importd} -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(zlib) -%endif -%if %{with journal_remote} -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 -%endif -%if %{with sd_boot} -BuildRequires: gnu-efi -%endif %if %{bootstrap} #!BuildIgnore: dbus-1 @@ -156,11 +138,6 @@ Requires: util-linux >= 2.27.1 Requires: group(lock) # This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl Recommends: libpcre2-8-0 -# ditto but dlopen()ed by systemd-cryptenroll -Recommends: libfido2 -Recommends: libtss2-esys0 -Recommends: libtss2-mu0 -Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -201,6 +178,7 @@ Source202: files.container Source203: files.network Source204: files.devel Source205: files.sysvcompat +Source206: files.uefi-boot # # All changes backported from upstream are tracked by the git repository, which @@ -328,6 +306,9 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +%if %{with sd_boot} +BuildRequires: gnu-efi +%endif Requires: %{name} = %{version}-%{release} %systemd_requires Requires: filesystem @@ -337,6 +318,22 @@ Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun):coreutils +%if ! %{bootstrap} +BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(libkmod) >= 15 +# Enable fido2 and tpm supports in systemd-cryptsetup, systemd-enroll. However +# these tools are not linked against the libs directly but instead are +# dlopen()ed at runtime to avoid hard dependencies. Hence the use of soft +# dependencies. +BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) +Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 +%endif Conflicts: ConsoleKit < 0.4.1 Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 @@ -385,6 +382,11 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later +%if %{with importd} +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(zlib) +%endif Requires: %{name} = %{version}-%{release} %systemd_requires Obsoletes: nss-mymachines < %{version}-%{release} @@ -494,6 +496,8 @@ To activate this NSS module, you will need to include it in %package journal-remote Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 Requires: %{name} = %{version}-%{release} %systemd_requires @@ -695,6 +699,7 @@ Have fun with these services at your own risk. -Dportabled=%{when portabled} \ -Dremote=%{when journal_remote} \ \ + -Dkernel-install=%{when sd_boot} \ -Dgnu-efi=%{when sd_boot} \ -Dsbat-distro= \ \ @@ -996,7 +1001,6 @@ fi # Create default config in /etc at first install. # Later package updates should not overwrite these settings. -%systemd_post remote-cryptsetup.target %systemd_post getty@.service %systemd_post machines.target %systemd_post remote-fs.target @@ -1075,6 +1079,8 @@ fi %regenerate_initrd_post %udev_hwdb_update +%systemd_post remote-cryptsetup.target + # add KERNEL name match to existing persistent net rules sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ /etc/udev/rules.d/70-persistent-net.rules 2>/dev/null || : @@ -1257,6 +1263,7 @@ fi %files -n udev%{?mini} %defattr(-,root,root) %include %{SOURCE201} +%include %{SOURCE206} %files container %defattr(-,root,root) From 86fc057a15865b90b3feb3ef22fb7f64027499152fe6b486f29c32683f1294fd Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 31 Mar 2022 08:26:50 +0000 Subject: [PATCH 3/5] fix previous commit: kernel-install needs to be installed only when sd_boot is enabled OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1269 --- files.udev | 9 --------- files.uefi-boot | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/files.udev b/files.udev index 389f959..c3e2473 100644 --- a/files.udev +++ b/files.udev @@ -5,8 +5,6 @@ %if ! %{bootstrap} %dir %{_libdir}/cryptsetup %dir %{_modulesloaddir} -%dir %{_prefix}/lib/kernel -%dir %{_prefix}/lib/kernel/install.d %endif %dir %{_prefix}/lib/udev %if ! %{bootstrap} @@ -23,18 +21,15 @@ %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %ghost %{_localstatedir}/lib/systemd/backlight %if ! %{bootstrap} -%{_bindir}/kernel-install %{_bindir}/systemd-cryptenroll %endif %{_bindir}/systemd-hwdb %{_bindir}/udevadm %if ! %{bootstrap} -%{_datadir}/bash-completion/completions/kernel-install %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc %if ! %{bootstrap} -%{_datadir}/zsh/site-functions/_kernel-install %{_datadir}/zsh/site-functions/_udevadm %endif %if ! %{bootstrap} @@ -49,7 +44,6 @@ %{_mandir}/man5/veritytab.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz -%{_mandir}/man8/kernel-install.8.gz %{_mandir}/man8/systemd-backlight.8.gz %{_mandir}/man8/systemd-backlight@.service.8.gz %{_mandir}/man8/systemd-cryptsetup-generator.8.gz @@ -84,9 +78,6 @@ %{_mandir}/man8/systemd-volatile-root.8.gz %{_mandir}/man8/systemd-volatile-root.service.8.gz %{_mandir}/man8/udevadm.8.gz -%{_prefix}/lib/kernel/install.conf -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install %endif %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id diff --git a/files.uefi-boot b/files.uefi-boot index ebb3ff2..49bcdfe 100644 --- a/files.uefi-boot +++ b/files.uefi-boot @@ -2,12 +2,17 @@ # Please keep the list sorted (with `LC_ALL=C sort`). # %if %{with sd_boot} +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d %dir %{_systemd_util_dir}/boot %dir %{_systemd_util_dir}/boot/efi %{_bindir}/bootctl +%{_bindir}/kernel-install %if ! %{bootstrap} %{_datadir}/bash-completion/completions/bootctl +%{_datadir}/bash-completion/completions/kernel-install %{_datadir}/zsh/site-functions/_bootctl +%{_datadir}/zsh/site-functions/_kernel-install %{_mandir}/man1/bootctl.1.gz %{_mandir}/man5/loader.conf.5.gz %{_mandir}/man7/linuxaa64.efi.stub.7.gz @@ -16,11 +21,15 @@ %{_mandir}/man7/sd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz %{_mandir}/man7/systemd-stub.7.gz +%{_mandir}/man8/kernel-install.8.gz %{_mandir}/man8/systemd-bless-boot-generator.8.gz %{_mandir}/man8/systemd-bless-boot.8.gz %{_mandir}/man8/systemd-bless-boot.service.8.gz %{_mandir}/man8/systemd-boot-system-token.service.8.gz %endif +%{_prefix}/lib/kernel/install.conf +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install # These are part of the very few exceptions where glob pattern is allowd. %{_systemd_util_dir}/boot/efi/linux*.efi.stub %{_systemd_util_dir}/boot/efi/linux*.elf.stub From 26840ffa049dd437698d60daa32ab090092c0bff07f2910adf47e36bb853fd23 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 31 Mar 2022 11:23:51 +0000 Subject: [PATCH 4/5] - Add 0001-meson-build-kernel-install-man-page-when-necessary.patch Submitted to upstream: https://github.com/systemd/systemd/pull/22918 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1270 --- ...rnel-install-man-page-when-necessary.patch | 90 +++++++++++++++++++ systemd.changes | 7 ++ systemd.spec | 1 + 3 files changed, 98 insertions(+) create mode 100644 0001-meson-build-kernel-install-man-page-when-necessary.patch diff --git a/0001-meson-build-kernel-install-man-page-when-necessary.patch b/0001-meson-build-kernel-install-man-page-when-necessary.patch new file mode 100644 index 0000000..8e60185 --- /dev/null +++ b/0001-meson-build-kernel-install-man-page-when-necessary.patch @@ -0,0 +1,90 @@ +From fecffebc9a0f4e2309e9d8d561c0b0c4b6678b0b Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 31 Mar 2022 11:17:10 +0200 +Subject: [PATCH 1/1] meson: build kernel-install man page when necessary + +--- + man/rules/meson.build | 2 +- + meson.build | 5 ++++- + shell-completion/bash/meson.build | 2 +- + shell-completion/zsh/meson.build | 2 +- + src/kernel-install/meson.build | 2 -- + 5 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/man/rules/meson.build b/man/rules/meson.build +index aaa69d3038..f10abdaf0d 100644 +--- a/man/rules/meson.build ++++ b/man/rules/meson.build +@@ -30,7 +30,7 @@ manpages = [ + ['journalctl', '1', [], ''], + ['journald.conf', '5', ['journald.conf.d', 'journald@.conf'], ''], + ['kernel-command-line', '7', [], ''], +- ['kernel-install', '8', [], ''], ++ ['kernel-install', '8', [], 'ENABLE_KERNEL_INSTALL'], + ['libudev', '3', [], ''], + ['loader.conf', '5', [], 'HAVE_GNU_EFI'], + ['locale.conf', '5', [], ''], +diff --git a/meson.build b/meson.build +index e68791b8b4..311895db5e 100644 +--- a/meson.build ++++ b/meson.build +@@ -1675,6 +1675,9 @@ else + endif + conf.set10('ENABLE_IMPORTD', have) + ++want_kernel_install = get_option('kernel-install') ++conf.set10('ENABLE_KERNEL_INSTALL', want_kernel_install) ++ + want_homed = get_option('homed') + if want_homed != 'false' + have = (conf.get('HAVE_OPENSSL') == 1 and +@@ -4143,7 +4146,7 @@ foreach tuple : [ + ['hwdb'], + ['importd'], + ['initrd'], +- ['kernel-install', get_option('kernel-install')], ++ ['kernel-install'], + ['localed'], + ['logind'], + ['machined'], +diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build +index 963a11b6ce..ae6a61e555 100644 +--- a/shell-completion/bash/meson.build ++++ b/shell-completion/bash/meson.build +@@ -31,7 +31,7 @@ items = [['busctl', ''], + ['systemd-path', ''], + ['systemd-run', ''], + ['udevadm', ''], +- ['kernel-install', ''], ++ ['kernel-install', 'ENABLE_KERNEL_INSTALL'], + ['bootctl', 'HAVE_GNU_EFI'], + ['coredumpctl', 'ENABLE_COREDUMP'], + ['homectl', 'ENABLE_HOMED'], +diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build +index 6dca9dd595..bac531798c 100644 +--- a/shell-completion/zsh/meson.build ++++ b/shell-completion/zsh/meson.build +@@ -22,7 +22,7 @@ items = [['_busctl', ''], + ['_systemd-path', ''], + ['_systemd-run', ''], + ['_udevadm', ''], +- ['_kernel-install', ''], ++ ['_kernel-install', 'ENABLE_KERNEL_INSTALL'], + ['_sd_hosts_or_user_at_host', ''], + ['_sd_outputmodes', ''], + ['_sd_unit_files', ''], +diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build +index 508058f1cf..abc3520b62 100644 +--- a/src/kernel-install/meson.build ++++ b/src/kernel-install/meson.build +@@ -1,7 +1,5 @@ + # SPDX-License-Identifier: LGPL-2.1-or-later + +-want_kernel_install = get_option('kernel-install') +- + if want_kernel_install + install_data('kernel-install', + install_mode : 'rwxr-xr-x', +-- +2.34.1 + diff --git a/systemd.changes b/systemd.changes index 5c3597e..f289564 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 31 11:22:12 UTC 2022 - Franck Bui + +- Add 0001-meson-build-kernel-install-man-page-when-necessary.patch + + Submitted to upstream: https://github.com/systemd/systemd/pull/22918 + ------------------------------------------------------------------- Mon Mar 28 18:36:39 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f097922..a869708 100644 --- a/systemd.spec +++ b/systemd.spec @@ -209,6 +209,7 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch6000: 0001-meson-build-kernel-install-man-page-when-necessary.patch %description Systemd is a system and service manager, compatible with SysV and LSB From b20d6fcb13f4ac353ce9a655d3f36d9b5d0fbcde3282335cfd41ab0399e06e6c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 31 Mar 2022 12:04:43 +0000 Subject: [PATCH 5/5] - Temporarily disable 'libcryptsetup plugins until dracut 056 is merged in Factory OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1271 --- files.udev | 8 ++++---- systemd.changes | 6 ++++++ systemd.spec | 1 + 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/files.udev b/files.udev index c3e2473..273dd04 100644 --- a/files.udev +++ b/files.udev @@ -3,7 +3,7 @@ # %config(noreplace) %{_sysconfdir}/udev/udev.conf %if ! %{bootstrap} -%dir %{_libdir}/cryptsetup +# %%dir %{_libdir}/cryptsetup %dir %{_modulesloaddir} %endif %dir %{_prefix}/lib/udev @@ -33,9 +33,9 @@ %{_datadir}/zsh/site-functions/_udevadm %endif %if ! %{bootstrap} -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/integritytab.5.gz diff --git a/systemd.changes b/systemd.changes index f289564..05c8d8e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 31 12:03:19 UTC 2022 - Franck Bui + +- Temporarily disable 'libcryptsetup plugins until dracut 056 is merged in + Factory + ------------------------------------------------------------------- Thu Mar 31 11:22:12 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a869708..355fa44 100644 --- a/systemd.spec +++ b/systemd.spec @@ -693,6 +693,7 @@ Have fun with these services at your own risk. -Dman=true \ -Dhtml=true \ %endif + -Dlibcryptsetup-plugins=false \ -Dcoredump=%{when coredump} \ -Dimportd=%{when importd} \ -Dmachined=%{when machined} \