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

systemd: 245.7 -> 246

Browse Source
This commit is contained in:
Florian Klink
2020-08-13 20:51:39 +02:00
parent b68bddfbda
commit 2865490dc2
19 changed files with 180 additions and 162 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
+14 -14
View File
@@ -1,4 +1,4 @@
From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001
From 5e235e1f720f37fc5581b40c9a13d365368e74a8 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
@@ -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 105584e2e7..5238f69931 100644
index 15cc1b8851..d0abde5933 100644
--- a/src/basic/time-util.c
+++ b/src/basic/time-util.c
@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) {
@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) {
n_allocated = 2;
n_zones = 1;
@@ -47,7 +47,7 @@ index 105584e2e7..5238f69931 100644
if (f) {
for (;;) {
_cleanup_free_ char *line = NULL;
@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) {
@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) {
if (p - name >= PATH_MAX)
return false;
@@ -56,7 +56,7 @@ index 105584e2e7..5238f69931 100644
fd = open(t, O_RDONLY|O_CLOEXEC);
if (fd < 0) {
@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) {
@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) {
if (r < 0)
return r; /* returns EINVAL if not a symlink */
@@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644
return -EINVAL;
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 901fbf0815..b57bdd8fbe 100644
index a3f442518e..feff49e280 100644
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -431,7 +431,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 901fbf0815..b57bdd8fbe 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 4d3451ff3b..1adb91335c 100644
index 0117a9939d..d86445b40f 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u
@@ -1699,8 +1699,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,10 +94,10 @@ index 4d3451ff3b..1adb91335c 100644
static bool etc_writable(void) {
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 63865f557c..8021a8b753 100644
index 3e78b2f575..de5477a08f 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -264,7 +264,7 @@ static int context_read_data(Context *c) {
@@ -269,7 +269,7 @@ static int context_read_data(Context *c) {
r = get_timezone(&t);
if (r == -EINVAL)
@@ -106,7 +106,7 @@ index 63865f557c..8021a8b753 100644
else if (r < 0)
log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) {
@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) {
if (isempty(c->zone) || streq(c->zone, "UTC")) {
@@ -115,7 +115,7 @@ index 63865f557c..8021a8b753 100644
if (unlink("/etc/localtime") < 0 && errno != ENOENT)
return -errno;
@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) {
@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) {
return 0;
}
@@ -128,5 +128,5 @@ index 63865f557c..8021a8b753 100644
return -ENOMEM;
--
2.26.2
2.27.0