From 46a2911bf2780f616396df5671dd901cc7cb54fd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Jan 2013 18:37:49 +0100 Subject: core: drop support for old per-distro configuration files for console, hostname, locale, timezone This simplifies the upstream system code quite a bit. If downstream distributions want to maintain compatibility with their old configuration files, they are welcome to do so, but need to maintain this as patches downstream. The burden needs to be on the distributions to maintain differences here. Our suggestion however is to just convert the old configuration files on upgrade, as multiple distributions already do. --- src/timedate/timedated.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/timedate') diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c index 784dadc631..fdb4335464 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -199,19 +199,10 @@ static int write_data_timezone(void) { int r = 0; _cleanup_free_ char *p = NULL; -#ifdef TARGET_DEBIAN - struct stat st; -#endif - if (!tz.zone) { if (unlink("/etc/localtime") < 0 && errno != ENOENT) r = -errno; -#ifdef TARGET_DEBIAN - if (unlink("/etc/timezone") < 0 && errno != ENOENT) - r = -errno; -#endif - return r; } @@ -223,14 +214,6 @@ static int write_data_timezone(void) { if (r < 0) return r; -#ifdef TARGET_DEBIAN - if (stat("/etc/timezone", &st) == 0 && S_ISREG(st.st_mode)) { - r = write_one_line_file_atomic("/etc/timezone", tz.zone); - if (r < 0) - return r; - } -#endif - return 0; } -- cgit v1.2.3-54-g00ecf