summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-10-11 20:20:01 +0200
committerLennart Poettering <lennart@poettering.net>2011-10-11 20:20:01 +0200
commitc70ac211b486c70271e265d142f3b73e323faf6e (patch)
treec48b713bb2694a80f310882b3fb5ebe12916d30c
parent30fa6468353443318500c1783f5b1b164a32de0b (diff)
localed: make sure s-s-k doesn't create any X11 config files anymore
-rw-r--r--src/localed.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/localed.c b/src/localed.c
index e627c3a716..c6b48de5f9 100644
--- a/src/localed.c
+++ b/src/localed.c
@@ -574,6 +574,10 @@ static int write_data_x11(void) {
#ifdef TARGET_FEDORA
unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
+
+ /* Symlink this to /dev/null, so that s-s-k (if it is
+ * still running) doesn't recreate this. */
+ symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
#endif
if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
@@ -619,6 +623,10 @@ static int write_data_x11(void) {
#ifdef TARGET_FEDORA
unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
+
+ /* Symlink this to /dev/null, so that s-s-k (if it is
+ * still running) doesn't recreate this. */
+ symlink("/dev/null", "/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf");
#endif
r = 0;