Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
steam
systemd
Commits
f687b273
Commit
f687b273
authored
Sep 05, 2012
by
Lennart Poettering
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
localed: system-setup-keyboard is no more on fedora
parent
a2927192
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
40 deletions
+3
-40
TODO
TODO
+0
-3
src/locale/localed.c
src/locale/localed.c
+3
-37
No files found.
TODO
View file @
f687b273
...
...
@@ -128,9 +128,6 @@ Features:
* add _SYSTEMD_USER_UNIT= field to journal entries
* remove Fedora /dev/null logic from localed.c, now that system-config-keyboard is gone
delete /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf from spec file
* journal: expose current disk usage
* dracut-shutdown needs to be ordered before unmounting /boot
...
...
src/locale/localed.c
View file @
f687b273
...
...
@@ -271,24 +271,8 @@ static int read_data_x11(void) {
free_data_x11
();
f
=
fopen
(
"/etc/X11/xorg.conf.d/00-keyboard.conf"
,
"re"
);
if
(
!
f
)
{
if
(
errno
==
ENOENT
)
{
#ifdef TARGET_FEDORA
f
=
fopen
(
"/etc/X11/xorg.conf.d/00-system-setup-keyboard.conf"
,
"re"
);
if
(
!
f
)
{
if
(
errno
==
ENOENT
)
return
0
;
else
return
-
errno
;
}
#else
return
0
;
#endif
}
else
return
-
errno
;
}
if
(
!
f
)
return
errno
==
ENOENT
?
0
:
-
errno
;
while
(
fgets
(
line
,
sizeof
(
line
),
f
))
{
char
*
l
;
...
...
@@ -577,14 +561,6 @@ static int write_data_x11(void) {
isempty
(
state
.
x11_variant
)
&&
isempty
(
state
.
x11_options
))
{
#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
)
return
errno
==
ENOENT
?
0
:
-
errno
;
...
...
@@ -624,18 +600,8 @@ static int write_data_x11(void) {
r
=
-
errno
;
unlink
(
"/etc/X11/xorg.conf.d/00-keyboard.conf"
);
unlink
(
temp_path
);
}
else
{
#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
}
else
r
=
0
;
}
fclose
(
f
);
free
(
temp_path
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment