localed: make sure s-s-k doesn't create any X11 config files anymore

This commit is contained in:
Lennart Poettering 2011-10-11 20:20:01 +02:00
parent 30fa646835
commit c70ac211b4

View File

@ -574,6 +574,10 @@ static int write_data_x11(void) {
#ifdef TARGET_FEDORA #ifdef TARGET_FEDORA
unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); 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 #endif
if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0) if (unlink("/etc/X11/xorg.conf.d/00-keyboard.conf") < 0)
@ -619,6 +623,10 @@ static int write_data_x11(void) {
#ifdef TARGET_FEDORA #ifdef TARGET_FEDORA
unlink("/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"); 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 #endif
r = 0; r = 0;