public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

systemd: 246.6 -> 247-rc2

Browse Source
This commit is contained in:
Jörg Thalheim
2020-12-02 23:40:04 +01:00
committed by Florian Klink
parent b83ed81c33
commit ef050bc3d1
21 changed files with 104 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+12 -12
View File
@@ -1,4 +1,4 @@
From a8ccba372d865429b578e72fd104a693b96101b3 Mon Sep 17 00:00:00 2001
From b423ce2560bd380abd80796a890454d95cd8926c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 11 Oct 2016 13:12:08 +0300
Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo
@@ -13,7 +13,7 @@ NixOS uses this path.
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/man/localtime.xml b/man/localtime.xml
index 0f1652ee2e..71c4f95c2e 100644
index 73c1b8e5a3..4ab4276283 100644
--- a/man/localtime.xml
+++ b/man/localtime.xml
@@ -20,7 +20,7 @@
@@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644
<literal>Etc/UTC</literal>. The resulting link should lead to the
corresponding binary
diff --git a/src/basic/time-util.c b/src/basic/time-util.c
index 15cc1b8851..d0abde5933 100644
index 5318d6378d..04069dc27b 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) {
@@ -1277,7 +1277,7 @@ int get_timezones(char ***ret) {
n_allocated = 2;
n_zones = 1;
@@ -47,7 +47,7 @@ index 15cc1b8851..d0abde5933 100644
if (f) {
for (;;) {
_cleanup_free_ char *line = NULL;
@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) {
@@ -1372,7 +1372,7 @@ bool timezone_is_valid(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return false;
@@ -56,7 +56,7 @@ index 15cc1b8851..d0abde5933 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0) {
@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) {
@@ -1470,7 +1470,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* returns EINVAL if not a symlink */
@@ -66,10 +66,10 @@ index 15cc1b8851..d0abde5933 100644
return -EINVAL;
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index c9fc8dd5cd..44fc04dc88 100644
index 742b43f9fc..f2cb121816 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -460,7 +460,7 @@ static int process_timezone(void) {
@@ -459,7 +459,7 @@ static int process_timezone(void) {
if (isempty(arg_timezone))
return 0;
@@ -79,10 +79,10 @@ index c9fc8dd5cd..44fc04dc88 100644
(void) mkdir_parents(etc_localtime, 0755);
if (symlink(e, etc_localtime) < 0)
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 07f294c78a..cf86d1f494 100644
index f790853104..74b51f4d28 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
@@ -1810,8 +1810,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
static const char *timezone_from_path(const char *path) {
return PATH_STARTSWITH_SET(
path,
@@ -94,7 +94,7 @@ index 07f294c78a..cf86d1f494 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 3e78b2f575..de5477a08f 100644
index a0ee03f134..9ecacad25e 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -269,7 +269,7 @@ static int context_read_data(Context *c) {
@@ -128,5 +128,5 @@ index 3e78b2f575..de5477a08f 100644
return -ENOMEM;
--
2.28.0
2.29.2