Skip to content

Commit ef050bc

Browse files
Mic92flokli
Mic92
authored and
flokli
committed
systemd: 246.6 -> 247-rc2
1 parent b83ed81 commit ef050bc

21 files changed

Lines changed: 104 additions & 425 deletions

‎pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 46c8ccfeb61253cd3dff5f34013670c7e3366ef5 Mon Sep 17 00:00:00 2001
1+
From dd2ec741aaa7c587eb7719bbf4b305fe28168b77 Mon Sep 17 00:00:00 2001
22
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
33
Date: Tue, 8 Jan 2013 15:46:30 +0100
44
Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices
@@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...)
1313
1 file changed, 4 deletions(-)
1414

1515
diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
16-
index 1c60eec587..b2486da130 100644
16+
index d2f595d18e..941a7c1ba3 100644
1717
--- a/rules.d/99-systemd.rules.in
1818
+++ b/rules.d/99-systemd.rules.in
1919
@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd"
@@ -28,5 +28,5 @@ index 1c60eec587..b2486da130 100644
2828
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
2929
SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
3030
--
31-
2.28.0
31+
2.29.2
3232

‎pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 139c420de62e078182eaf48b541c4b912d445fd9 Mon Sep 17 00:00:00 2001
1+
From ab3dab997695db5346f8efbf8566ac96612f0c6e Mon Sep 17 00:00:00 2001
22
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
33
Date: Fri, 12 Apr 2013 13:16:57 +0200
44
Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store
@@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126
1212
2 files changed, 4 insertions(+)
1313

1414
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
15-
index 806dda8475..0220741c91 100644
15+
index 292b97cd69..791b8e6b7e 100644
1616
--- a/src/shared/fstab-util.c
1717
+++ b/src/shared/fstab-util.c
1818
@@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -25,10 +25,10 @@ index 806dda8475..0220741c91 100644
2525
"/etc"))
2626
return true;
2727
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
28-
index 8a5e80eeaa..fab35ed6f3 100644
28+
index 3a72a13e1a..541320dc9d 100644
2929
--- a/src/shutdown/umount.c
3030
+++ b/src/shutdown/umount.c
31-
@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) {
31+
@@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) {
3232

3333
static bool nonunmountable_path(const char *path) {
3434
return path_equal(path, "/")
@@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644
3838
|| path_equal(path, "/usr")
3939
#endif
4040
--
41-
2.28.0
41+
2.29.2
4242

‎pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a889dbe796cd72425f38dec3d2aaab44a914ac60 Mon Sep 17 00:00:00 2001
1+
From 3581f8f30270e6340c671a640fe551e954715f8e Mon Sep 17 00:00:00 2001
22
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
33
Date: Wed, 16 Apr 2014 10:59:28 +0200
44
Subject: [PATCH 03/18] Fix NixOS containers
@@ -10,18 +10,18 @@ container, so checking early whether it exists will fail.
1010
1 file changed, 2 insertions(+)
1111

1212
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
13-
index 43712565c2..07f294c78a 100644
13+
index 0842731c18..f790853104 100644
1414
--- a/src/nspawn/nspawn.c
1515
+++ b/src/nspawn/nspawn.c
16-
@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) {
16+
@@ -5319,6 +5319,7 @@ static int run(int argc, char *argv[]) {
1717
goto finish;
1818
}
1919
} else {
2020
+#if 0
2121
const char *p, *q;
2222

2323
if (arg_pivot_root_new)
24-
@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) {
24+
@@ -5333,6 +5334,7 @@ static int run(int argc, char *argv[]) {
2525
r = -EINVAL;
2626
goto finish;
2727
}
@@ -30,5 +30,5 @@ index 43712565c2..07f294c78a 100644
3030

3131
} else {
3232
--
33-
2.28.0
33+
2.29.2
3434

‎pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5098b1aad07356e04fcd12f2c77ea4fd17460411 Mon Sep 17 00:00:00 2001
1+
From 12b63d8c1d2ca85d9bb7ea07e8eb5e623e1b58e9 Mon Sep 17 00:00:00 2001
22
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
33
Date: Thu, 1 May 2014 14:10:10 +0200
44
Subject: [PATCH 04/18] Look for fsck in the right place
@@ -8,10 +8,10 @@ Subject: [PATCH 04/18] Look for fsck in the right place
88
1 file changed, 1 insertion(+), 1 deletion(-)
99

1010
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
11-
index 80f7107b9d..74e48a385f 100644
11+
index 04752fe9dc..ad0ccf91c0 100644
1212
--- a/src/fsck/fsck.c
1313
+++ b/src/fsck/fsck.c
14-
@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) {
14+
@@ -369,7 +369,7 @@ static int run(int argc, char *argv[]) {
1515
} else
1616
dash_c[0] = 0;
1717

@@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644
2121
cmdline[i++] = "-T";
2222

2323
--
24-
2.28.0
24+
2.29.2
2525

‎pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b46f1b20e990f01af4bdf3dd6fef45f5b4a5993e Mon Sep 17 00:00:00 2001
1+
From 6ede8baac88aba769030f5bc5f5b2070098c7428 Mon Sep 17 00:00:00 2001
22
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
33
Date: Fri, 19 Dec 2014 14:46:17 +0100
44
Subject: [PATCH 05/18] Add some NixOS-specific unit directories
@@ -15,7 +15,7 @@ Also, remove /usr and /lib as these don't exist on NixOS.
1515
2 files changed, 8 insertions(+), 17 deletions(-)
1616

1717
diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
18-
index 52968dee34..bba2eb09b8 100644
18+
index 96b82170d0..b9fbed5c61 100644
1919
--- a/src/basic/path-lookup.c
2020
+++ b/src/basic/path-lookup.c
2121
@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
@@ -102,7 +102,7 @@ index 52968dee34..bba2eb09b8 100644
102102

103103
if (!add)
104104
diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
105-
index 8424837824..b1c541bc52 100644
105+
index f2c045511d..ccb382e421 100644
106106
--- a/src/core/systemd.pc.in
107107
+++ b/src/core/systemd.pc.in
108108
@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir}
@@ -120,5 +120,5 @@ index 8424837824..b1c541bc52 100644
120120

121121
systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators
122122
--
123-
2.28.0
123+
2.29.2
124124

‎pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 4c9f9d192182f1051dba1c547e182e7c8f549b0f Mon Sep 17 00:00:00 2001
1+
From 3aeb3a10c4a7ad387b004bf41efbd171913bcca9 Mon Sep 17 00:00:00 2001
22
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
33
Date: Mon, 11 May 2015 15:39:38 +0200
44
Subject: [PATCH 06/18] Get rid of a useless message in user sessions
@@ -13,10 +13,10 @@ in containers.
1313
1 file changed, 2 insertions(+), 1 deletion(-)
1414

1515
diff --git a/src/core/unit.c b/src/core/unit.c
16-
index 1bda568560..5b44970763 100644
16+
index 45a417a090..8af3cb08d6 100644
1717
--- a/src/core/unit.c
1818
+++ b/src/core/unit.c
19-
@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) {
19+
@@ -2163,7 +2163,8 @@ static void unit_check_binds_to(Unit *u) {
2020
}
2121

2222
assert(other);
@@ -27,5 +27,5 @@ index 1bda568560..5b44970763 100644
2727
/* A unit we need to run is gone. Sniff. Let's stop this. */
2828
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL);
2929
--
30-
2.28.0
30+
2.29.2
3131

‎pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 539f3af04963a6826d2b2d0ba2095af99a7a6294 Mon Sep 17 00:00:00 2001
1+
From a1454e8edb7a1a87093808dc7db540232147df3d Mon Sep 17 00:00:00 2001
22
From: Gabriel Ebner <gebner@gebner.org>
33
Date: Sun, 6 Dec 2015 14:26:36 +0100
44
Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
@@ -11,10 +11,10 @@ Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that
1111
3 files changed, 25 insertions(+)
1212

1313
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
14-
index 7f6607a527..b5a9388916 100644
14+
index a1794bdab1..77134731e1 100644
1515
--- a/src/hostname/hostnamed.c
1616
+++ b/src/hostname/hostnamed.c
17-
@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
17+
@@ -643,6 +643,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
1818
if (r < 0)
1919
return r;
2020

@@ -24,7 +24,7 @@ index 7f6607a527..b5a9388916 100644
2424
name = empty_to_null(name);
2525

2626
context_read_etc_hostname(c);
27-
@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
27+
@@ -702,6 +705,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
2828
if (r < 0)
2929
return r;
3030

@@ -35,7 +35,7 @@ index 7f6607a527..b5a9388916 100644
3535

3636
context_read_machine_info(c);
3737
diff --git a/src/locale/localed.c b/src/locale/localed.c
38-
index 715ce5cac7..014f7dcf6c 100644
38+
index 736dacdee9..53e0ee935e 100644
3939
--- a/src/locale/localed.c
4040
+++ b/src/locale/localed.c
4141
@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
@@ -69,7 +69,7 @@ index 715ce5cac7..014f7dcf6c 100644
6969
model = empty_to_null(model);
7070
variant = empty_to_null(variant);
7171
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
72-
index c467b85477..3e78b2f575 100644
72+
index 8bfcfd5cdc..a0ee03f134 100644
7373
--- a/src/timedate/timedated.c
7474
+++ b/src/timedate/timedated.c
7575
@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
@@ -93,7 +93,7 @@ index c467b85477..3e78b2f575 100644
9393
if (lrtc == c->local_rtc)
9494
return sd_bus_reply_method_return(m, NULL);
9595

96-
@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
96+
@@ -905,6 +912,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
9797
if (r < 0)
9898
return r;
9999

@@ -104,5 +104,5 @@ index c467b85477..3e78b2f575 100644
104104
if (r < 0)
105105
return r;
106106
--
107-
2.28.0
107+
2.29.2
108108

‎pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5c2a1a6d33f7cdbcb8ddcc70b91ba4c7f3c383b3 Mon Sep 17 00:00:00 2001
1+
From 27680c555713e36d16198fc5f60b0f85e0777d30 Mon Sep 17 00:00:00 2001
22
From: Nikolay Amiantov <ab@fmap.me>
33
Date: Thu, 7 Jul 2016 02:47:13 +0300
44
Subject: [PATCH 08/18] Fix hwdb paths
@@ -9,7 +9,7 @@ Patch by vcunat.
99
1 file changed, 1 insertion(+), 6 deletions(-)
1010

1111
diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
12-
index b3febdbb31..eba00a5bc7 100644
12+
index cb3c77ce96..7b8c80071f 100644
1313
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
1414
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
1515
@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
@@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644
2828
_public_ int sd_hwdb_new(sd_hwdb **ret) {
2929
_cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL;
3030
--
31-
2.28.0
31+
2.29.2
3232

‎pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From a8ccba372d865429b578e72fd104a693b96101b3 Mon Sep 17 00:00:00 2001
1+
From b423ce2560bd380abd80796a890454d95cd8926c Mon Sep 17 00:00:00 2001
22
From: Nikolay Amiantov <ab@fmap.me>
33
Date: Tue, 11 Oct 2016 13:12:08 +0300
44
Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo
@@ -13,7 +13,7 @@ NixOS uses this path.
1313
5 files changed, 12 insertions(+), 12 deletions(-)
1414

1515
diff --git a/man/localtime.xml b/man/localtime.xml
16-
index 0f1652ee2e..71c4f95c2e 100644
16+
index 73c1b8e5a3..4ab4276283 100644
1717
--- a/man/localtime.xml
1818
+++ b/man/localtime.xml
1919
@@ -20,7 +20,7 @@
@@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644
3535
<literal>Etc/UTC</literal>. The resulting link should lead to the
3636
corresponding binary
3737
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
38-
index 15cc1b8851..d0abde5933 100644
38+
index 5318d6378d..04069dc27b 100644
3939
--- a/src/basic/time-util.c
4040
+++ b/src/basic/time-util.c
41-
@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) {
41+
@@ -1277,7 +1277,7 @@ int get_timezones(char ***ret) {
4242
n_allocated = 2;
4343
n_zones = 1;
4444

@@ -47,7 +47,7 @@ index 15cc1b8851..d0abde5933 100644
4747
if (f) {
4848
for (;;) {
4949
_cleanup_free_ char *line = NULL;
50-
@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) {
50+
@@ -1372,7 +1372,7 @@ bool timezone_is_valid(const char *name, int log_level) {
5151
if (p - name >= PATH_MAX)
5252
return false;
5353

@@ -56,7 +56,7 @@ index 15cc1b8851..d0abde5933 100644
5656

5757
fd = open(t, O_RDONLY|O_CLOEXEC);
5858
if (fd < 0) {
59-
@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) {
59+
@@ -1470,7 +1470,7 @@ int get_timezone(char **ret) {
6060
if (r < 0)
6161
return r; /* returns EINVAL if not a symlink */
6262

@@ -66,10 +66,10 @@ index 15cc1b8851..d0abde5933 100644
6666
return -EINVAL;
6767

6868
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
69-
index c9fc8dd5cd..44fc04dc88 100644
69+
index 742b43f9fc..f2cb121816 100644
7070
--- a/src/firstboot/firstboot.c
7171
+++ b/src/firstboot/firstboot.c
72-
@@ -460,7 +460,7 @@ static int process_timezone(void) {
72+
@@ -459,7 +459,7 @@ static int process_timezone(void) {
7373
if (isempty(arg_timezone))
7474
return 0;
7575

@@ -79,10 +79,10 @@ index c9fc8dd5cd..44fc04dc88 100644
7979
(void) mkdir_parents(etc_localtime, 0755);
8080
if (symlink(e, etc_localtime) < 0)
8181
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
82-
index 07f294c78a..cf86d1f494 100644
82+
index f790853104..74b51f4d28 100644
8383
--- a/src/nspawn/nspawn.c
8484
+++ b/src/nspawn/nspawn.c
85-
@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
85+
@@ -1810,8 +1810,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
8686
static const char *timezone_from_path(const char *path) {
8787
return PATH_STARTSWITH_SET(
8888
path,
@@ -94,7 +94,7 @@ index 07f294c78a..cf86d1f494 100644
9494

9595
static bool etc_writable(void) {
9696
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
97-
index 3e78b2f575..de5477a08f 100644
97+
index a0ee03f134..9ecacad25e 100644
9898
--- a/src/timedate/timedated.c
9999
+++ b/src/timedate/timedated.c
100100
@@ -269,7 +269,7 @@ static int context_read_data(Context *c) {
@@ -128,5 +128,5 @@ index 3e78b2f575..de5477a08f 100644
128128
return -ENOMEM;
129129

130130
--
131-
2.28.0
131+
2.29.2
132132

‎pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 84a2d35d4e75295edf7e190a94dfaf65db4973b6 Mon Sep 17 00:00:00 2001
1+
From aff592e0bf9a911e7f44ce07b66517c38456b627 Mon Sep 17 00:00:00 2001
22
From: Imuli <i@imu.li>
33
Date: Wed, 19 Oct 2016 08:46:47 -0400
44
Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-*
@@ -10,7 +10,7 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
1010
1 file changed, 1 insertion(+), 1 deletion(-)
1111

1212
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
13-
index e0664de826..c521f33a2a 100644
13+
index 7d2e887660..91c5139eed 100644
1414
--- a/src/locale/localectl.c
1515
+++ b/src/locale/localectl.c
1616
@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
@@ -23,5 +23,5 @@ index e0664de826..c521f33a2a 100644
2323
return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
2424

2525
--
26-
2.28.0
26+
2.29.2
2727

0 commit comments

Comments
 (0)