SHA256
1
0
forked from pool/systemd

- spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1266
This commit is contained in:
Franck Bui 2022-03-23 15:18:40 +00:00 committed by Git OBS Bridge
parent ecbd67ef23
commit 9c792eff33
14 changed files with 150 additions and 277 deletions

View File

@ -1,4 +1,4 @@
From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001 From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com> From: Franck Bui <fbui@suse.com>
Date: Fri, 22 Jan 2021 14:57:08 +0100 Date: Fri, 22 Jan 2021 14:57:08 +0100
Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins
@ -61,15 +61,15 @@ drop this feature at any time.
Fixes: #2121 Fixes: #2121
--- ---
src/shared/conf-parser.c | 48 +++++++++-- src/shared/conf-parser.c | 48 ++++++++++--
src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++ src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++
2 files changed, 197 insertions(+), 5 deletions(-) 2 files changed, 195 insertions(+), 5 deletions(-)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 1e1967d7ea..eb81732dfa 100644 index d0ac1b2660..cb453fa50d 100644
--- a/src/shared/conf-parser.c --- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c
@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, @@ -430,6 +430,7 @@ int config_parse(
static int config_parse_many_files( static int config_parse_many_files(
const char* const* conf_files, const char* const* conf_files,
@ -77,20 +77,20 @@ index 1e1967d7ea..eb81732dfa 100644
char **files, char **files,
const char *sections, const char *sections,
ConfigItemLookup lookup, ConfigItemLookup lookup,
@@ -481,6 +482,12 @@ static int config_parse_many_files( @@ -442,6 +443,12 @@ static int config_parse_many_files(
stats_by_path = hashmap_new(&path_hash_ops_free_free); char **fn;
if (!stats_by_path) int r;
return -ENOMEM;
+ }
+
+ STRV_FOREACH(fn, early_files) { + STRV_FOREACH(fn, early_files) {
+ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime);
+ if (r < 0) + if (r < 0)
+ return r; + return r;
} + }
+
/* First read the first found main config file. */ /* First read the first found main config file. */
@@ -521,6 +528,28 @@ static int config_parse_many_files( 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(
return 0; return 0;
} }
@ -119,9 +119,9 @@ index 1e1967d7ea..eb81732dfa 100644
/* Parse each config file in the directories specified as nulstr. */ /* Parse each config file in the directories specified as nulstr. */
int config_parse_many_nulstr( int config_parse_many_nulstr(
const char *conf_file, const char *conf_file,
@@ -532,15 +561,19 @@ int config_parse_many_nulstr( @@ -475,15 +504,19 @@ int config_parse_many_nulstr(
void *userdata, void *userdata,
Hashmap **ret_stats_by_path) { usec_t *ret_mtime) {
- _cleanup_strv_free_ char **files = NULL; - _cleanup_strv_free_ char **files = NULL;
+ _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL;
@ -139,12 +139,12 @@ index 1e1967d7ea..eb81732dfa 100644
+ +
+ return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, + return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files,
+ sections, lookup, table, flags, userdata, + sections, lookup, table, flags, userdata,
ret_stats_by_path); ret_mtime);
} }
@@ -556,8 +589,8 @@ int config_parse_many( @@ -499,8 +532,8 @@ int config_parse_many(
void *userdata, void *userdata,
Hashmap **ret_stats_by_path) { usec_t *ret_mtime) {
+ _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL;
_cleanup_strv_free_ char **dropin_dirs = NULL; _cleanup_strv_free_ char **dropin_dirs = NULL;
@ -152,22 +152,22 @@ index 1e1967d7ea..eb81732dfa 100644
const char *suffix; const char *suffix;
int r; int r;
@@ -570,7 +603,12 @@ int config_parse_many( @@ -513,7 +546,12 @@ int config_parse_many(
if (r < 0) if (r < 0)
return r; return r;
- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); - return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime);
+ r = config_parse_split_conf_files(files, &early_files, &late_files); + r = config_parse_split_conf_files(files, &early_files, &late_files);
+ if (r < 0) + if (r < 0)
+ return r; + return r;
+ +
+ return config_parse_many_files(conf_files, early_files, late_files, + return config_parse_many_files(conf_files, early_files, late_files,
+ sections, lookup, table, flags, userdata, ret_stats_by_path); + sections, lookup, table, flags, userdata, ret_mtime);
} }
#define DEFINE_PARSER(type, vartype, conv_func) \ #define DEFINE_PARSER(type, vartype, conv_func) \
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c
index e61932ab16..de408272f0 100644 index 5da864347e..77d9f28a79 100644
--- a/src/test/test-conf-parser.c --- a/src/test/test-conf-parser.c
+++ b/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c
@@ -5,6 +5,9 @@ @@ -5,6 +5,9 @@
@ -179,9 +179,9 @@ index e61932ab16..de408272f0 100644
+#include "rm-rf.h" +#include "rm-rf.h"
#include "string-util.h" #include "string-util.h"
#include "strv.h" #include "strv.h"
#include "tests.h" #include "tmpfile-util.h"
@@ -391,4 +394,155 @@ TEST(config_parse) { @@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) {
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) { +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) {
@ -228,8 +228,8 @@ index e61932ab16..de408272f0 100644
+ } + }
+} +}
+ +
+static void test_config_parse_many_nulstr_one(bool nulstr, const char *main, char **conf_files, +static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files,
+ const char *name, const char *early, const char *late) { + const char *name, const char *early, const char *late) {
+ +
+ _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL; + _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL;
+ _cleanup_strv_free_ char **conf_dirs = NULL; + _cleanup_strv_free_ char **conf_dirs = NULL;
@ -281,61 +281,67 @@ index e61932ab16..de408272f0 100644
+ assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); + assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);
+} +}
+ +
+static void test_config_parse_many_nulstr(bool nulstr) { +static void test_config_parse_many(bool nulstr) {
+ log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : ""); + log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : "");
+ +
+ test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL, NULL); + test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL);
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ "dir/main.conf", NULL, + "dir/main.conf", NULL,
+ "dir/main.conf", NULL, NULL); + "dir/main.conf", NULL, NULL);
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ NULL, STRV_MAKE("dir1/50-foo.conf"), + NULL, STRV_MAKE("dir1/50-foo.conf"),
+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + "dir1/50-foo.conf", NULL, "dir1/50-foo.conf");
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ NULL, STRV_MAKE("dir1/__50-foo.conf"), + NULL, STRV_MAKE("dir1/__50-foo.conf"),
+ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); + "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL);
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), + NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"),
+ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); + "dir1/50-bar.conf", NULL, "dir1/50-bar.conf");
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), + NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"),
+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + "dir1/50-foo.conf", NULL, "dir1/50-foo.conf");
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), + NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"),
+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + "dir1/10-foo.conf", NULL, "dir1/10-foo.conf");
+ +
+ /* Early conf files should never override the main one whatever their + /* Early conf files should never override the main one whatever their
+ * priority/location. */ + * priority/location. */
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ "dir/10-main.conf", + "dir/10-main.conf",
+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), + STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"),
+ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); + "dir/10-main.conf", "dir2/__99-foo.conf", NULL);
+ +
+ /* Late conf files always take precendence over the early conf files + /* Late conf files always take precendence over the early conf files
+ * and the main one. */ + * and the main one. */
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), + "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"),
+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + "dir1/10-foo.conf", NULL, "dir1/10-foo.conf");
+ +
+ test_config_parse_many_nulstr_one(nulstr, + test_config_parse_many_one(nulstr,
+ "dir/10-main.conf", + "dir/10-main.conf",
+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", + STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf",
+ "dir2/10-foo.conf"), + "dir2/10-foo.conf"),
+ "dir2/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) { int main(int argc, char **argv) {
+ test_config_parse_many_nulstr(true); unsigned i;
+ test_config_parse_many_nulstr(false);
+} @@ -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);
+ +
DEFINE_TEST_MAIN(LOG_INFO); return 0;
}
-- --
2.34.1 2.26.2

View File

@ -1,4 +1,4 @@
From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001 From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com> From: Frederic Crozat <fcrozat@suse.com>
Date: Mon, 29 Oct 2012 13:01:20 +0000 Date: Mon, 29 Oct 2012 13:01:20 +0000
Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they 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 create mode 100644 units/var-run.mount
diff --git a/units/meson.build b/units/meson.build diff --git a/units/meson.build b/units/meson.build
index a9bf28f6d9..739fd84d2c 100644 index 17e9ead9c1..7b926f9f91 100644
--- a/units/meson.build --- a/units/meson.build
+++ b/units/meson.build +++ b/units/meson.build
@@ -165,6 +165,8 @@ units = [ @@ -160,6 +160,8 @@ units = [
['umount.target', ''], ['umount.target', ''],
['usb-gadget.target', ''], ['usb-gadget.target', ''],
['user.slice', ''], ['user.slice', ''],
@ -24,7 +24,7 @@ index a9bf28f6d9..739fd84d2c 100644
+ ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], + ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'],
['var-lib-machines.mount', 'ENABLE_MACHINED', ['var-lib-machines.mount', 'ENABLE_MACHINED',
'remote-fs.target.wants/ machines.target.wants/'], 'remote-fs.target.wants/ machines.target.wants/'],
['systemd-oomd.socket', 'ENABLE_OOMD'], ]
diff --git a/units/var-lock.mount b/units/var-lock.mount diff --git a/units/var-lock.mount b/units/var-lock.mount
new file mode 100644 new file mode 100644
index 0000000000..07277adac3 index 0000000000..07277adac3
@ -76,5 +76,5 @@ index 0000000000..ab4da424c9
+Type=bind +Type=bind
+Options=bind +Options=bind
-- --
2.34.1 2.26.2

View File

@ -0,0 +1,29 @@
From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001
From: Pawel Wieczorkiewicz <pwieczorkiewicz@suse.de>
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

View File

@ -1,90 +0,0 @@
From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001
From: Franck Bui <fbui@suse.com>
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

View File

@ -2,10 +2,9 @@
# https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart # https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart
# #
systemd systemd
supplements "(systemd and pam-<targettype>)" supplements "packageand(systemd:pam-<targettype>)"
-/lib/systemd/system/ -/lib/systemd/system/
-/usr/lib/systemd -/usr/lib/systemd/libsystemd-shared.*\.so
-/usr/lib/cryptsetup
post "<prefix>%{_sbindir}/pam-config -a --systemd || :" post "<prefix>%{_sbindir}/pam-config -a --systemd || :"
libsystemd0 libsystemd0
libudev1 libudev1

View File

@ -3,7 +3,7 @@
# #
%dir %{_sysconfdir}/systemd/nspawn %dir %{_sysconfdir}/systemd/nspawn
%{_bindir}/systemd-nspawn %{_bindir}/systemd-nspawn
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/bash-completion/completions/systemd-nspawn
%{_datadir}/zsh/site-functions/_systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn
%{_mandir}/man1/systemd-nspawn.1.gz %{_mandir}/man1/systemd-nspawn.1.gz
@ -17,9 +17,6 @@
%dir %{_unitdir}/machines.target.wants %dir %{_unitdir}/machines.target.wants
%{_bindir}/machinectl %{_bindir}/machinectl
%{_datadir}/bash-completion/completions/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-services/org.freedesktop.machine1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy
@ -43,8 +40,6 @@
%endif %endif
%if %{with importd} %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-services/org.freedesktop.import1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy

View File

@ -7,7 +7,7 @@
%{_libdir}/libudev.so %{_libdir}/libudev.so
%{_libdir}/pkgconfig/libsystemd.pc %{_libdir}/pkgconfig/libsystemd.pc
%{_libdir}/pkgconfig/libudev.pc %{_libdir}/pkgconfig/libudev.pc
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_mandir}/man3/SD_ALERT.3.gz %{_mandir}/man3/SD_ALERT.3.gz
%{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz %{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz
%{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz %{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz
@ -55,7 +55,6 @@
%{_mandir}/man3/SD_BUS_PROPERTY.3.gz %{_mandir}/man3/SD_BUS_PROPERTY.3.gz
%{_mandir}/man3/SD_BUS_SIGNAL.3.gz %{_mandir}/man3/SD_BUS_SIGNAL.3.gz
%{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.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_END.3.gz
%{_mandir}/man3/SD_BUS_VTABLE_START.3.gz %{_mandir}/man3/SD_BUS_VTABLE_START.3.gz
%{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz %{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz
@ -85,8 +84,6 @@
%{_mandir}/man3/SD_ID128_MAKE_STR.3.gz %{_mandir}/man3/SD_ID128_MAKE_STR.3.gz
%{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz %{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz
%{_mandir}/man3/SD_ID128_NULL.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_ID128_UUID_FORMAT_STR.3.gz
%{_mandir}/man3/SD_INFO.3.gz %{_mandir}/man3/SD_INFO.3.gz
%{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz
@ -429,7 +426,6 @@
%{_mandir}/man3/sd_event_add_defer.3.gz %{_mandir}/man3/sd_event_add_defer.3.gz
%{_mandir}/man3/sd_event_add_exit.3.gz %{_mandir}/man3/sd_event_add_exit.3.gz
%{_mandir}/man3/sd_event_add_inotify.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_io.3.gz
%{_mandir}/man3/sd_event_add_post.3.gz %{_mandir}/man3/sd_event_add_post.3.gz
%{_mandir}/man3/sd_event_add_signal.3.gz %{_mandir}/man3/sd_event_add_signal.3.gz
@ -499,7 +495,6 @@
%{_mandir}/man3/sd_event_source_set_prepare.3.gz %{_mandir}/man3/sd_event_source_set_prepare.3.gz
%{_mandir}/man3/sd_event_source_set_priority.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.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.3.gz
%{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz %{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz
%{_mandir}/man3/sd_event_source_set_time_relative.3.gz %{_mandir}/man3/sd_event_source_set_time_relative.3.gz

View File

@ -7,10 +7,6 @@
%dir %{_systemd_util_dir}/network %dir %{_systemd_util_dir}/network
%{_bindir}/networkctl %{_bindir}/networkctl
%{_datadir}/bash-completion/completions/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-services/org.freedesktop.network1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy
@ -19,13 +15,11 @@
%{_mandir}/man1/networkctl.1.gz %{_mandir}/man1/networkctl.1.gz
%{_mandir}/man5/networkd.conf.5.gz %{_mandir}/man5/networkd.conf.5.gz
%{_mandir}/man5/networkd.conf.d.5.gz %{_mandir}/man5/networkd.conf.d.5.gz
%{_mandir}/man5/org.freedesktop.network1.5.gz
%{_mandir}/man5/systemd.network.5.gz %{_mandir}/man5/systemd.network.5.gz
%{_mandir}/man8/systemd-networkd-wait-online.8.gz %{_mandir}/man8/systemd-networkd-wait-online.8.gz
%{_mandir}/man8/systemd-networkd-wait-online.service.8.gz %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz
%{_mandir}/man8/systemd-networkd.8.gz %{_mandir}/man8/systemd-networkd.8.gz
%{_mandir}/man8/systemd-networkd.service.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-host0.network
%{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-ve.network
%{_systemd_util_dir}/network/80-container-vz.network %{_systemd_util_dir}/network/80-container-vz.network
@ -46,9 +40,6 @@
%{_bindir}/systemd-resolve %{_bindir}/systemd-resolve
%{_datadir}/bash-completion/completions/resolvectl %{_datadir}/bash-completion/completions/resolvectl
%{_datadir}/bash-completion/completions/systemd-resolve %{_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-services/org.freedesktop.resolve1.service
%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf
%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy

View File

@ -8,12 +8,11 @@
%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf
%config(noreplace) %{_sysconfdir}/systemd/user.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf
%dir %{_binfmtdir} %dir %{_binfmtdir}
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion
%dir %{_datadir}/bash-completion/completions %dir %{_datadir}/bash-completion/completions
%endif %endif
%dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1
%dir %{_datadir}/dbus-1/interfaces
%dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/services
%dir %{_datadir}/dbus-1/system-services %dir %{_datadir}/dbus-1/system-services
%dir %{_datadir}/dbus-1/system.d %dir %{_datadir}/dbus-1/system.d
@ -21,15 +20,14 @@
%dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1
%dir %{_datadir}/polkit-1/actions %dir %{_datadir}/polkit-1/actions
%dir %{_datadir}/systemd %dir %{_datadir}/systemd
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%dir %{_datadir}/zsh %dir %{_datadir}/zsh
%dir %{_datadir}/zsh/site-functions %dir %{_datadir}/zsh/site-functions
%endif %endif
%dir %{xinitconfdir}
%dir %{xinitconfdir}/xinitrc.d
%dir %{_environmentdir} %dir %{_environmentdir}
%dir %{_journalcatalogdir} %dir %{_journalcatalogdir}
%if ! %{bootstrap}
%dir %{_libdir}/cryptsetup
%endif
%dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/catalog %dir %{_localstatedir}/lib/systemd/catalog
%dir %{_modprobedir} %dir %{_modprobedir}
@ -84,8 +82,6 @@
%dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sockets.target.wants
%dir %{_unitdir}/sysinit.target.wants %dir %{_unitdir}/sysinit.target.wants
%dir %{_unitdir}/timers.target.wants %dir %{_unitdir}/timers.target.wants
%dir %{xinitconfdir}
%dir %{xinitconfdir}/xinitrc.d
%doc %{_modprobedir}/README %doc %{_modprobedir}/README
%doc %{_sysctldir}/README %doc %{_sysctldir}/README
%doc %{_sysusersdir}/README %doc %{_sysusersdir}/README
@ -117,8 +113,7 @@
%{_bindir}/systemd-cat %{_bindir}/systemd-cat
%{_bindir}/systemd-cgls %{_bindir}/systemd-cgls
%{_bindir}/systemd-cgtop %{_bindir}/systemd-cgtop
%{_bindir}/systemd-creds %if ! 0%{?bootstrap}
%if ! %{bootstrap}
%{_bindir}/systemd-cryptenroll %{_bindir}/systemd-cryptenroll
%endif %endif
%{_bindir}/systemd-delta %{_bindir}/systemd-delta
@ -141,7 +136,7 @@
%{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tty-ask-password-agent
%{_bindir}/systemd-umount %{_bindir}/systemd-umount
%{_bindir}/timedatectl %{_bindir}/timedatectl
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%if %{with sd_boot} %if %{with sd_boot}
%{_datadir}/bash-completion/completions/bootctl %{_datadir}/bash-completion/completions/bootctl
%endif %endif
@ -165,29 +160,6 @@
%{_datadir}/bash-completion/completions/systemd-run %{_datadir}/bash-completion/completions/systemd-run
%{_datadir}/bash-completion/completions/timedatectl %{_datadir}/bash-completion/completions/timedatectl
%endif %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/services/org.freedesktop.systemd1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service
%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service
@ -209,7 +181,7 @@
%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy
%{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/kbd-model-map
%{_datadir}/systemd/language-fallback-map %{_datadir}/systemd/language-fallback-map
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%if %{with sd_boot} %if %{with sd_boot}
%{_datadir}/zsh/site-functions/_bootctl %{_datadir}/zsh/site-functions/_bootctl
%endif %endif
@ -233,6 +205,7 @@
%{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_systemd-tmpfiles
%{_datadir}/zsh/site-functions/_timedatectl %{_datadir}/zsh/site-functions/_timedatectl
%endif %endif
%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
%{_environmentdir}/99-environment.conf %{_environmentdir}/99-environment.conf
%{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be.catalog
%{_journalcatalogdir}/systemd.be@latin.catalog %{_journalcatalogdir}/systemd.be@latin.catalog
@ -247,11 +220,6 @@
%{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_CN.catalog
%{_journalcatalogdir}/systemd.zh_TW.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog
%if ! 0%{bootstrap} %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} %if %{with sd_boot}
%{_mandir}/man1/bootctl.1.gz %{_mandir}/man1/bootctl.1.gz
%endif %endif
@ -267,7 +235,6 @@
%{_mandir}/man1/systemd-cat.1.gz %{_mandir}/man1/systemd-cat.1.gz
%{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgls.1.gz
%{_mandir}/man1/systemd-cgtop.1.gz %{_mandir}/man1/systemd-cgtop.1.gz
%{_mandir}/man1/systemd-creds.1.gz
%{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-cryptenroll.1.gz
%{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-delta.1.gz
%{_mandir}/man1/systemd-detect-virt.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz
@ -283,7 +250,6 @@
%{_mandir}/man1/systemd-path.1.gz %{_mandir}/man1/systemd-path.1.gz
%{_mandir}/man1/systemd-run.1.gz %{_mandir}/man1/systemd-run.1.gz
%{_mandir}/man1/systemd-socket-activate.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-tty-ask-password-agent.1.gz
%{_mandir}/man1/systemd-umount.1.gz %{_mandir}/man1/systemd-umount.1.gz
%{_mandir}/man1/systemd.1.gz %{_mandir}/man1/systemd.1.gz
@ -292,10 +258,8 @@
%{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/crypttab.5.gz
%{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz
%{_mandir}/man5/environment.d.5.gz %{_mandir}/man5/environment.d.5.gz
%{_mandir}/man5/extension-release.5.gz
%{_mandir}/man5/hostname.5.gz %{_mandir}/man5/hostname.5.gz
%{_mandir}/man5/initrd-release.5.gz %{_mandir}/man5/initrd-release.5.gz
%{_mandir}/man5/integritytab.5.gz
%{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.5.gz
%{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald.conf.d.5.gz
%{_mandir}/man5/journald@.conf.5.gz %{_mandir}/man5/journald@.conf.5.gz
@ -359,12 +323,8 @@
%{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/file-hierarchy.7.gz
%{_mandir}/man7/kernel-command-line.7.gz %{_mandir}/man7/kernel-command-line.7.gz
%if %{with sd_boot} %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/sd-boot.7.gz
%{_mandir}/man7/systemd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz
%{_mandir}/man7/systemd-stub.7.gz
%endif %endif
%{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.directives.7.gz
%{_mandir}/man7/systemd.environment-generator.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz
@ -423,9 +383,6 @@
%{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.8.gz
%{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz
%{_mandir}/man8/systemd-hybrid-sleep.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-audit.socket.8.gz
%{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz
%{_mandir}/man8/systemd-journald-varlink@.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz
@ -498,7 +455,7 @@
%{_modprobedir}/systemd.conf %{_modprobedir}/systemd.conf
%{_pam_moduledir}/pam_systemd.so %{_pam_moduledir}/pam_systemd.so
%{_pam_vendordir}/systemd-user %{_pam_vendordir}/systemd-user
%{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/00-entry-directory.install
%{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/50-depmod.install
%{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install
%{_sbindir}/halt %{_sbindir}/halt
@ -515,7 +472,7 @@
%{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/linux*.elf.stub
%{_systemd_util_dir}/boot/efi/systemd-boot*.efi %{_systemd_util_dir}/boot/efi/systemd-boot*.efi
%endif %endif
%{_systemd_util_dir}/libsystemd-shared-250.so %{_systemd_util_dir}/libsystemd-shared-249.so
%{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list
%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh
%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh
@ -529,16 +486,13 @@
%endif %endif
%{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-boot-check-no-failures
%{_systemd_util_dir}/systemd-cgroups-agent %{_systemd_util_dir}/systemd-cgroups-agent
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_systemd_util_dir}/systemd-cryptsetup %{_systemd_util_dir}/systemd-cryptsetup
%endif %endif
%{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-fsck
%{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-growfs
%{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hibernate-resume
%{_systemd_util_dir}/systemd-hostnamed %{_systemd_util_dir}/systemd-hostnamed
%if ! %{bootstrap}
%{_systemd_util_dir}/systemd-integritysetup
%endif
%{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-journald
%{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-localed
%{_systemd_util_dir}/systemd-logind %{_systemd_util_dir}/systemd-logind
@ -562,7 +516,7 @@
%{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-runtime-dir
%{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-user-sessions
%{_systemd_util_dir}/systemd-vconsole-setup %{_systemd_util_dir}/systemd-vconsole-setup
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_systemd_util_dir}/systemd-veritysetup %{_systemd_util_dir}/systemd-veritysetup
%endif %endif
%{_systemd_util_dir}/systemd-volatile-root %{_systemd_util_dir}/systemd-volatile-root
@ -594,7 +548,7 @@
%if %{with sd_boot} %if %{with sd_boot}
%{_systemdgeneratordir}/systemd-bless-boot-generator %{_systemdgeneratordir}/systemd-bless-boot-generator
%endif %endif
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_systemdgeneratordir}/systemd-cryptsetup-generator %{_systemdgeneratordir}/systemd-cryptsetup-generator
%endif %endif
%{_systemdgeneratordir}/systemd-debug-generator %{_systemdgeneratordir}/systemd-debug-generator
@ -602,12 +556,9 @@
%{_systemdgeneratordir}/systemd-getty-generator %{_systemdgeneratordir}/systemd-getty-generator
%{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator
%{_systemdgeneratordir}/systemd-hibernate-resume-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator
%if ! %{bootstrap}
%{_systemdgeneratordir}/systemd-integritysetup-generator
%endif
%{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-run-generator
%{_systemdgeneratordir}/systemd-system-update-generator %{_systemdgeneratordir}/systemd-system-update-generator
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_systemdgeneratordir}/systemd-veritysetup-generator %{_systemdgeneratordir}/systemd-veritysetup-generator
%endif %endif
%{_sysusersdir}/systemd-journal.conf %{_sysusersdir}/systemd-journal.conf
@ -635,7 +586,7 @@
%{_unitdir}/boot-complete.target %{_unitdir}/boot-complete.target
%{_unitdir}/console-getty.service %{_unitdir}/console-getty.service
%{_unitdir}/container-getty@.service %{_unitdir}/container-getty@.service
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/cryptsetup-pre.target %{_unitdir}/cryptsetup-pre.target
%{_unitdir}/cryptsetup.target %{_unitdir}/cryptsetup.target
%endif %endif
@ -651,7 +602,6 @@
%{_unitdir}/emergency.service %{_unitdir}/emergency.service
%{_unitdir}/emergency.target %{_unitdir}/emergency.target
%{_unitdir}/exit.target %{_unitdir}/exit.target
%{_unitdir}/factory-reset.target
%{_unitdir}/final.target %{_unitdir}/final.target
%{_unitdir}/first-boot-complete.target %{_unitdir}/first-boot-complete.target
%{_unitdir}/getty-pre.target %{_unitdir}/getty-pre.target
@ -665,7 +615,7 @@
%{_unitdir}/initrd-fs.target %{_unitdir}/initrd-fs.target
%{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-parse-etc.service
%{_unitdir}/initrd-root-device.target %{_unitdir}/initrd-root-device.target
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target
%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target
%endif %endif
@ -674,10 +624,6 @@
%{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-switch-root.target
%{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd-usr-fs.target
%{_unitdir}/initrd.target %{_unitdir}/initrd.target
%if ! %{bootstrap}
%{_unitdir}/integritysetup-pre.target
%{_unitdir}/integritysetup.target
%endif
%{_unitdir}/kexec.target %{_unitdir}/kexec.target
%{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs-pre.target
%{_unitdir}/local-fs.target %{_unitdir}/local-fs.target
@ -700,12 +646,12 @@
%{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/proc-sys-fs-binfmt_misc.mount
%{_unitdir}/quotaon.service %{_unitdir}/quotaon.service
%{_unitdir}/reboot.target %{_unitdir}/reboot.target
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/remote-cryptsetup.target %{_unitdir}/remote-cryptsetup.target
%endif %endif
%{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs-pre.target
%{_unitdir}/remote-fs.target %{_unitdir}/remote-fs.target
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/remote-veritysetup.target %{_unitdir}/remote-veritysetup.target
%endif %endif
%{_unitdir}/rescue.service %{_unitdir}/rescue.service
@ -729,14 +675,11 @@
%{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-debug.mount
%{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sys-kernel-tracing.mount
%{_unitdir}/sysinit.target %{_unitdir}/sysinit.target
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/sysinit.target.wants/cryptsetup.target %{_unitdir}/sysinit.target.wants/cryptsetup.target
%endif %endif
%{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-hugepages.mount
%{_unitdir}/sysinit.target.wants/dev-mqueue.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/proc-sys-fs-binfmt_misc.automount
%{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount
%{_unitdir}/sysinit.target.wants/sys-kernel-config.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount
@ -760,11 +703,11 @@
%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service
%{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service
%{_unitdir}/sysinit.target.wants/systemd-update-utmp.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/sysinit.target.wants/veritysetup.target %{_unitdir}/sysinit.target.wants/veritysetup.target
%endif %endif
%{_unitdir}/syslog.socket %{_unitdir}/syslog.socket
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/system-systemd\x2dcryptsetup.slice %{_unitdir}/system-systemd\x2dcryptsetup.slice
%endif %endif
%{_unitdir}/system-update-cleanup.service %{_unitdir}/system-update-cleanup.service
@ -782,7 +725,6 @@
%{_unitdir}/systemd-boot-check-no-failures.service %{_unitdir}/systemd-boot-check-no-failures.service
%if %{with sd_boot} %if %{with sd_boot}
%{_unitdir}/systemd-boot-system-token.service %{_unitdir}/systemd-boot-system-token.service
%{_unitdir}/systemd-boot-update.service
%endif %endif
%{_unitdir}/systemd-exit.service %{_unitdir}/systemd-exit.service
%{_unitdir}/systemd-firstboot.service %{_unitdir}/systemd-firstboot.service
@ -842,11 +784,10 @@
%{_unitdir}/user-runtime-dir@.service %{_unitdir}/user-runtime-dir@.service
%{_unitdir}/user.slice %{_unitdir}/user.slice
%{_unitdir}/user@.service %{_unitdir}/user@.service
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup-pre.target
%{_unitdir}/veritysetup.target %{_unitdir}/veritysetup.target
%endif %endif
%{xinitconfdir}/xinitrc.d/50-systemd-user.sh
%if %{with split_usr} %if %{with split_usr}
/bin/systemctl /bin/systemctl
/sbin/halt /sbin/halt

View File

@ -14,14 +14,14 @@
%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
%{_bindir}/systemd-hwdb %{_bindir}/systemd-hwdb
%{_bindir}/udevadm %{_bindir}/udevadm
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_datadir}/bash-completion/completions/udevadm %{_datadir}/bash-completion/completions/udevadm
%endif %endif
%{_datadir}/pkgconfig/udev.pc %{_datadir}/pkgconfig/udev.pc
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_datadir}/zsh/site-functions/_udevadm %{_datadir}/zsh/site-functions/_udevadm
%endif %endif
%if ! %{bootstrap} %if ! 0%{?bootstrap}
%{_mandir}/man5/udev.conf.5.gz %{_mandir}/man5/udev.conf.5.gz
%{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/hwdb.7.gz
%{_mandir}/man7/udev.7.gz %{_mandir}/man7/udev.7.gz
@ -70,8 +70,6 @@
%{_udevhwdbdir}/60-keyboard.hwdb %{_udevhwdbdir}/60-keyboard.hwdb
%{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-seat.hwdb
%{_udevhwdbdir}/60-sensor.hwdb %{_udevhwdbdir}/60-sensor.hwdb
%{_udevhwdbdir}/70-analyzers.hwdb
%{_udevhwdbdir}/70-cameras.hwdb
%{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-joystick.hwdb
%{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-mouse.hwdb
%{_udevhwdbdir}/70-pointingstick.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb
@ -94,7 +92,6 @@
%{_udevrulesdir}/60-serial.rules %{_udevrulesdir}/60-serial.rules
%{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/61-persistent-storage-compat.rules
%{_udevrulesdir}/64-btrfs.rules %{_udevrulesdir}/64-btrfs.rules
%{_udevrulesdir}/70-camera.rules
%{_udevrulesdir}/70-joystick.rules %{_udevrulesdir}/70-joystick.rules
%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips
%{_udevrulesdir}/70-memory.rules %{_udevrulesdir}/70-memory.rules

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812
size 7281992

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5
size 7626056

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 23 15:17:40 UTC 2022 - Franck Bui <fbui@suse.com>
- spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 17 10:38:16 UTC 2022 - Franck Bui <fbui@suse.com> Thu Mar 17 10:38:16 UTC 2022 - Franck Bui <fbui@suse.com>

View File

@ -764,6 +764,11 @@ rm -f %{buildroot}/etc/systemd/system/default.target
# Replace upstream systemd-user with the openSUSE one. # Replace upstream systemd-user with the openSUSE one.
install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2} install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2}
# kmod keeps insisting on using /lib on SLE.
if [ "%{_modprobedir}" != /usr/lib/modprobe.d ]; then
mv %{buildroot}/usr/lib/modprobe.d %{buildroot}%{_modprobedir}
fi
# don't enable wall ask password service, it spams every console (bnc#747783) # don't enable wall ask password service, it spams every console (bnc#747783)
rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path