From: Alan Jenkins <alan.christopher.jenkins@gmail.com>
Date: Thu, 17 Aug 2017 16:21:34 +0000 (+0100)
Subject: localed: don't remove xorg.conf.d/00-keyboard.conf on failures
X-Git-Tag: v235~222^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dce892acef1c5316fb98f7f5ea287bc74f935ca3;p=thirdparty%2Fsystemd.git

localed: don't remove xorg.conf.d/00-keyboard.conf on failures

One of the benefits of updating a file "atomically", is to avoid losing the
old version.  For example, if we run out of disk space half-way through.

Fix localed to enjoy this benefit.
---

diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
index ec48e8ba6d5..5cefeb6135d 100644
--- a/src/locale/keymap-util.c
+++ b/src/locale/keymap-util.c
@@ -394,8 +394,6 @@ int x11_write_data(Context *c) {
         return 0;
 
 fail:
-        (void) unlink("/etc/X11/xorg.conf.d/00-keyboard.conf");
-
         if (temp_path)
                 (void) unlink(temp_path);