chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
30fa646
)
localed: make sure s-s-k doesn't create any X11 config files anymore
author
Lennart Poettering
<lennart@poettering.net>
Tue, 11 Oct 2011 18:20:01 +0000
(20:20 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 11 Oct 2011 18:20:01 +0000
(20:20 +0200)
src/localed.c
patch
|
blob
|
history
diff --git
a/src/localed.c
b/src/localed.c
index e627c3a716e4bd7baac16898cc1d7f536d0d0bc2..c6b48de5f9c0c3e68136d5121062c976e3aa85c1 100644
(file)
--- 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");
#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)
#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");
#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;
#endif
r = 0;