From f28a96e50ad300b162527e1467cf02d771ae56f0 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 12 2020 11:56:08 +0000 Subject: Version 247-rc2 --- diff --git a/0001-Do-not-assert-in-test_add_acls_for_user.patch b/0001-Do-not-assert-in-test_add_acls_for_user.patch deleted file mode 100644 index c13413c..0000000 --- a/0001-Do-not-assert-in-test_add_acls_for_user.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b177b0ef92d226a9f303aecbff0cf2e7293667b3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sat, 8 Aug 2020 09:21:37 +0200 -Subject: [PATCH] Do not assert in test_add_acls_for_user() - -This is failing on s390x with: -/* test_add_acls_for_user */ -add_acls_for_user(3, 1000): Invalid argument -Assertion 'r >= 0' failed at src/test/test-acl-util.c:46, function test_add_acls_for_user(). Aborting. ---- - src/test/test-acl-util.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c -index 9f0e594e67..a91d64ab0c 100644 ---- a/src/test/test-acl-util.c -+++ b/src/test/test-acl-util.c -@@ -43,24 +43,20 @@ static void test_add_acls_for_user(void) { - - r = add_acls_for_user(fd, uid); - log_info_errno(r, "add_acls_for_user(%d, "UID_FMT"): %m", fd, uid); -- assert_se(r >= 0); - - cmd = strjoina("ls -l ", fn); - assert_se(system(cmd) == 0); - - cmd = strjoina("getfacl -p ", fn); -- assert_se(system(cmd) == 0); - - /* set the acls again */ - - r = add_acls_for_user(fd, uid); -- assert_se(r >= 0); - - cmd = strjoina("ls -l ", fn); - assert_se(system(cmd) == 0); - - cmd = strjoina("getfacl -p ", fn); -- assert_se(system(cmd) == 0); - - unlink(fn); - } diff --git a/0001-Revert-test-path-increase-timeout.patch b/0001-Revert-test-path-increase-timeout.patch deleted file mode 100644 index 74684f2..0000000 --- a/0001-Revert-test-path-increase-timeout.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a73d30081a13eaeffce87f997726a179ec44d817 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 31 Jul 2020 10:50:37 +0200 -Subject: [PATCH 1/4] Revert "test-path: increase timeout" - -This partially reverts commit 500727c220354b81b68ed6667d9a6f0fafe3ba19. - -I was confused by the error message: the test says it timed out, but that's -because it's waiting for a failed unit to come back to life. There is no actual -timeout. - -So let's keep the minor refactoring that was done, but revert to the old short -timeout. ---- - src/test/test-path.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index 1075f31bc6..63b709c8da 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -82,7 +82,7 @@ static void check_states(Manager *m, Path *path, Service *service, PathState pat - assert_se(m); - assert_se(service); - -- usec_t end = now(CLOCK_MONOTONIC) + 30 * USEC_PER_SEC; -+ usec_t end = now(CLOCK_MONOTONIC) + 2 * USEC_PER_SEC; - - while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS || - path->state != path_state || service->state != service_state) { diff --git a/0001-selinux-fall-back-to-the-netlink-based-API.patch b/0001-selinux-fall-back-to-the-netlink-based-API.patch deleted file mode 100644 index 8db8193..0000000 --- a/0001-selinux-fall-back-to-the-netlink-based-API.patch +++ /dev/null @@ -1,65 +0,0 @@ -From bef6d96b5aa48ce4b90633c847158f0ae27c7a10 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 27 Oct 2020 19:47:26 +0100 -Subject: [PATCH] selinux: fall back to the netlink-based API - -Fedora Rawhide still has the old policy, so selinux prevents our selinux code -from checking if selinux is enabled. But it seems smart to fall back to the old -API anyway. - -Follow-up for fd5e402fa9377f2860e02bdb5b84d5f5942e73f4. ---- - src/basic/selinux-util.c | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c -index 1791aeecde..c239634e48 100644 ---- a/src/basic/selinux-util.c -+++ b/src/basic/selinux-util.c -@@ -133,6 +133,7 @@ static int open_label_db(void) { - int mac_selinux_init(void) { - #if HAVE_SELINUX - int r; -+ bool have_status_page = false; - - if (initialized) - return 0; -@@ -140,9 +141,15 @@ int mac_selinux_init(void) { - if (!mac_selinux_use()) - return 0; - -- r = selinux_status_open(/* no netlink fallback */ 0); -- if (r < 0) -- return log_enforcing_errno(errno, "Failed to open SELinux status page: %m"); -+ r = selinux_status_open(/* netlink fallback */ 1); -+ if (r < 0) { -+ if (!ERRNO_IS_PRIVILEGE(errno)) -+ return log_enforcing_errno(errno, "Failed to open SELinux status page: %m"); -+ log_warning_errno(errno, "selinux_status_open() failed, using the netlink fallback: %m"); -+ } else if (r == 1) -+ log_warning("selinux_status_open() failed to open the status page, using the netlink fallback."); -+ else -+ have_status_page = true; - - r = open_label_db(); - if (r < 0) { -@@ -150,13 +157,14 @@ int mac_selinux_init(void) { - return r; - } - -- /* save the current policyload sequence number, so `mac_selinux_maybe_reload()` does -- not trigger on first call without any actual change */ -+ /* Save the current policyload sequence number, so mac_selinux_maybe_reload() does not trigger on -+ * first call without any actual change. */ - last_policyload = selinux_status_policyload(); - -- /* now that the SELinux status page has been successfully opened, -- retrieve the enforcing status over it (to avoid system calls in `security_getenforce()`) */ -- enforcing_status_func = selinux_status_getenforce; -+ if (have_status_page) -+ /* Now that the SELinux status page has been successfully opened, retrieve the enforcing -+ * status over it (to avoid system calls in security_getenforce()). */ -+ enforcing_status_func = selinux_status_getenforce; - - initialized = true; - #endif diff --git a/0002-test-path-more-debugging-information.patch b/0002-test-path-more-debugging-information.patch deleted file mode 100644 index 6aef2dd..0000000 --- a/0002-test-path-more-debugging-information.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4c38dcdc8d8f22dddc521faedad6a4f45fa81d63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 14 Sep 2020 08:56:28 +0200 -Subject: [PATCH 2/4] test-path: more debugging information -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Just to make it easier to grok what happens when test-path fails. -Change printf→log_info so that output is interleaved and not split in two -independent parts in log files. ---- - src/test/test-path.c | 31 ++++++++++++++++++------------- - 1 file changed, 18 insertions(+), 13 deletions(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index 63b709c8da..84dcf5e37d 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -1,7 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1+ */ - - #include --#include - #include - #include - -@@ -78,32 +77,38 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam - return SERVICE(service_unit); - } - --static void check_states(Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { -+static void _check_states(unsigned line, -+ Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { - assert_se(m); - assert_se(service); - - usec_t end = now(CLOCK_MONOTONIC) + 2 * USEC_PER_SEC; - -- while (path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS || -- path->state != path_state || service->state != service_state) { -+ while (path->state != path_state || service->state != service_state || -+ path->result != PATH_SUCCESS || service->result != SERVICE_SUCCESS) { - - assert_se(sd_event_run(m->event, 100 * USEC_PER_MSEC) >= 0); - -- printf("%s: state = %s; result = %s \n", -- UNIT(path)->id, -- path_state_to_string(path->state), -- path_result_to_string(path->result)); -- printf("%s: state = %s; result = %s \n", -- UNIT(service)->id, -- service_state_to_string(service->state), -- service_result_to_string(service->result)); -+ usec_t n = now(CLOCK_MONOTONIC); -+ log_info("line %d: %s: state = %s; result = %s (left: %" PRIi64 ")", -+ line, -+ UNIT(path)->id, -+ path_state_to_string(path->state), -+ path_result_to_string(path->result), -+ end - n); -+ log_info("line %d: %s: state = %s; result = %s", -+ line, -+ UNIT(service)->id, -+ service_state_to_string(service->state), -+ service_result_to_string(service->result)); - -- if (now(CLOCK_MONOTONIC) >= end) { -+ if (n >= end) { - log_error("Test timeout when testing %s", UNIT(path)->id); - exit(EXIT_FAILURE); - } - } - } -+#define check_states(...) _check_states(__LINE__, __VA_ARGS__) - - static void test_path_exists(Manager *m) { - const char *test_path = "/tmp/test-path_exists"; diff --git a/0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch b/0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch deleted file mode 100644 index 571d85c..0000000 --- a/0003-test-path-do-not-fail-the-test-if-we-fail-to-start-s.patch +++ /dev/null @@ -1,245 +0,0 @@ -From 67c6ff720796bc97f262ba93c6ea87da93b04a1a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 31 Jul 2020 10:36:57 +0200 -Subject: [PATCH 3/4] test-path: do not fail the test if we fail to start some - service - -The test was failing because it couldn't start the service: - -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -path-modified.path: state = waiting; result = success -path-modified.service: state = failed; result = exit-code -Failed to connect to system bus: No such file or directory --.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied -path-modified.service: Failed to create cgroup /system.slice/kojid.service/path-modified.service: Permission denied -path-modified.service: Failed to attach to cgroup /system.slice/kojid.service/path-modified.service: No such file or directory -path-modified.service: Failed at step CGROUP spawning /bin/true: No such file or directory -path-modified.service: Main process exited, code=exited, status=219/CGROUP -path-modified.service: Failed with result 'exit-code'. -Test timeout when testing path-modified.path - -In fact any of the services that we try to start may fail, especially -considering that we're doing some rogue cgroup operations. See -https://github.com/systemd/systemd/pull/16603#issuecomment-679133641. ---- - src/test/test-path.c | 88 ++++++++++++++++++++++++++++++-------------- - 1 file changed, 61 insertions(+), 27 deletions(-) - -diff --git a/src/test/test-path.c b/src/test/test-path.c -index 84dcf5e37d..d6c37b77e6 100644 ---- a/src/test/test-path.c -+++ b/src/test/test-path.c -@@ -77,8 +77,8 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam - return SERVICE(service_unit); - } - --static void _check_states(unsigned line, -- Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { -+static int _check_states(unsigned line, -+ Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) { - assert_se(m); - assert_se(service); - -@@ -102,11 +102,20 @@ static void _check_states(unsigned line, - service_state_to_string(service->state), - service_result_to_string(service->result)); - -+ if (service->state == SERVICE_FAILED) -+ return log_notice_errno(SYNTHETIC_ERRNO(ECANCELED), -+ "Failed to start service %s, aborting test: %s/%s", -+ UNIT(service)->id, -+ service_state_to_string(service->state), -+ service_result_to_string(service->result)); -+ - if (n >= end) { - log_error("Test timeout when testing %s", UNIT(path)->id); - exit(EXIT_FAILURE); - } - } -+ -+ return 0; - } - #define check_states(...) _check_states(__LINE__, __VA_ARGS__) - -@@ -124,18 +133,22 @@ static void test_path_exists(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service restarts if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } -@@ -154,18 +167,22 @@ static void test_path_existsglob(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service restarts if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } -@@ -185,23 +202,28 @@ static void test_path_changed(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service does not restart if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - f = fopen(test_path, "w"); - assert_se(f); - fclose(f); - -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - (void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL); - assert_se(unit_stop(unit) >= 0); -@@ -222,23 +244,28 @@ static void test_path_modified(Manager *m) { - service = service_for_path(m, path, NULL); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service does not restart if file still exists */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - f = fopen(test_path, "w"); - assert_se(f); - fputs("test", f); - -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - (void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL); - assert_se(unit_stop(unit) >= 0); -@@ -258,14 +285,17 @@ static void test_path_unit(Manager *m) { - service = service_for_path(m, path, "path-mycustomunit.service"); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(touch(test_path) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } -@@ -286,22 +316,26 @@ static void test_path_directorynotempty(Manager *m) { - assert_se(access(test_path, F_OK) < 0); - - assert_se(unit_start(unit) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - /* MakeDirectory default to no */ - assert_se(access(test_path, F_OK) < 0); - - assert_se(mkdir_p(test_path, 0755) >= 0); - assert_se(touch(strjoina(test_path, "test_file")) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - /* Service restarts if directory is still not empty */ - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING); -+ if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0) -+ return; - - assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); - assert_se(unit_stop(UNIT(service)) >= 0); -- check_states(m, path, service, PATH_WAITING, SERVICE_DEAD); -+ if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0) -+ return; - - assert_se(unit_stop(unit) >= 0); - } diff --git a/0004-test-path-use-Type-exec.patch b/0004-test-path-use-Type-exec.patch deleted file mode 100644 index 3734dc6..0000000 --- a/0004-test-path-use-Type-exec.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 1a83d7234e374e991235f4ef21c56998f93cb875 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 14 Sep 2020 08:58:54 +0200 -Subject: [PATCH 4/4] test-path: use Type=exec - -In general, Type=exec is superior to Type=simple. Let's not assume that -the service is started before it was really started. ---- - test/test-path/path-changed.service | 2 +- - test/test-path/path-directorynotempty.service | 2 +- - test/test-path/path-exists.service | 2 +- - test/test-path/path-existsglob.service | 2 +- - test/test-path/path-makedirectory.service | 2 +- - test/test-path/path-modified.service | 2 +- - test/test-path/path-mycustomunit.service | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/test/test-path/path-changed.service b/test/test-path/path-changed.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-changed.service -+++ b/test/test-path/path-changed.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-directorynotempty.service b/test/test-path/path-directorynotempty.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-directorynotempty.service -+++ b/test/test-path/path-directorynotempty.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-exists.service b/test/test-path/path-exists.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-exists.service -+++ b/test/test-path/path-exists.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-existsglob.service b/test/test-path/path-existsglob.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-existsglob.service -+++ b/test/test-path/path-existsglob.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-makedirectory.service b/test/test-path/path-makedirectory.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-makedirectory.service -+++ b/test/test-path/path-makedirectory.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-modified.service b/test/test-path/path-modified.service -index fb465d76bb..b75552df4f 100644 ---- a/test/test-path/path-modified.service -+++ b/test/test-path/path-modified.service -@@ -3,5 +3,5 @@ Description=Service Test for Path units - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true -diff --git a/test/test-path/path-mycustomunit.service b/test/test-path/path-mycustomunit.service -index bcdafe4f30..8fbc40d13f 100644 ---- a/test/test-path/path-mycustomunit.service -+++ b/test/test-path/path-mycustomunit.service -@@ -3,5 +3,5 @@ Description=Service Test Path Unit - - [Service] - ExecStart=/bin/true --Type=simple -+Type=exec - RemainAfterExit=true diff --git a/sources b/sources index 30df3d0..741f542 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-247-rc1.tar.gz) = 5c04b013ceebbf466c917d093189a60a2a77c57a844eed840c911669855d4d9d783dcaec1ba6b488c5e96e7f9a9f3d4e39cff240c46c013ec2fcce5a5b7c4aee +SHA512 (systemd-247-rc2.tar.gz) = 01fb347f3edb08efdf97b54339b381e4747377af08528f7267e6de6e85215025f81da13f822fcd9b449891b925aa163c6755dea86e6727b626ea27c19e5f391b diff --git a/systemd.spec b/systemd.spec index a593719..aec644a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 247~rc1 +Version: 247~rc2 Release: 1%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ @@ -71,9 +71,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 Patch0001: use-bfq-scheduler.patch -# While we don't have https://github.com/SELinuxProject/refpolicy/pull/308 -Patch0002: 0001-selinux-fall-back-to-the-netlink-based-API.patch - Patch0009: https://github.com/systemd/systemd/pull/17050/commits/f58b96d3e8d1cb0dd3666bc74fa673918b586612.patch %ifarch %{ix86} x86_64 aarch64 @@ -889,7 +886,7 @@ getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-net %files standalone-sysusers -f .file-list-standalone-sysusers %changelog -* Tue Oct 20 2020 Zbigniew Jędrzejewski-Szmek - 247~rc1 +* Tue Oct 20 2020 Zbigniew Jędrzejewski-Szmek - 247~rc2 - New upstream pre-release. See https://github.com/systemd/systemd/blob/v247-rc1/NEWS. Many smaller and bigger improvements and features are introduced.