diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-10-12 04:29:11 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-10-12 04:29:11 +0200 |
| commit | 689b9a22f7fa89686b2b5240b7ee9f449dea5630 (patch) | |
| tree | 47d44e0bdb73c40808a5150e081a286df38a055e /src/localed.c | |
| parent | cec736d21ff86c4ac81b4d306ddba2120333818c (diff) | |
| parent | 64685e0cea62b4937f0804e47ce2cb7929f58223 (diff) | |
Merge branch 'master' into journal
Diffstat (limited to 'src/localed.c')
| -rw-r--r-- | src/localed.c | 8 |
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; |