picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use .conf for new config files: locale, vconsole, modules.d

This commit is contained in:
Kay Sievers 2010-09-28 11:51:24 +02:00
parent 915d22e4f0
commit fd5bf055ac
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixme
View File

@ -99,8 +99,6 @@
* s/tempfiles/volatile-files/
* use .conf suffix for locale/vconsole/...
External:
* place /etc/inittab with explaining blurb.

6
src/locale-setup.c
View File

@ -93,9 +93,9 @@ int locale_setup(void) {
}
/* Hmm, nothing set on the kernel cmd line? Then let's
* try /etc/locale */
* try /etc/locale.conf */
if (r <= 0 &&
(r = parse_env_file("/etc/locale", NEWLINE,
(r = parse_env_file("/etc/locale.conf", NEWLINE,
"LANG", &variables[VARIABLE_LANG],
"LC_CTYPE", &variables[VARIABLE_LC_CTYPE],
"LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC],
@ -112,7 +112,7 @@ int locale_setup(void) {
NULL)) < 0) {
if (r != -ENOENT)
log_warning("Failed to read /etc/locale: %s", strerror(-r));
log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
}
#ifdef TARGET_FEDORA

4
src/modules-load.c
View File

@ -31,7 +31,7 @@
#include "util.h"
#include "strv.h"
/* This reads all module names listed in /etc/modules.d/?*.modules and
/* This reads all module names listed in /etc/modules.d/?*.conf and
* loads them into the kernel. This follows roughly Debian's way to
* handle modules, but uses a directory of fragments instead of a
* single /etc/modules file. */
@ -46,7 +46,7 @@ static int scandir_filter(const struct dirent *d) {
d->d_type != DT_LNK)
return 0;
return endswith(d->d_name, ".modules");
return endswith(d->d_name, ".conf");
}
int main(int argc, char *argv[]) {

6
src/vconsole-setup.c
View File

@ -186,9 +186,9 @@ int main(int argc, char **argv) {
}
/* Hmm, nothing set on the kernel cmd line? Then let's
* try /etc/vconsole */
* try /etc/vconsole.conf */
if (r <= 0 &&
(r = parse_env_file("/etc/vconsole", NEWLINE,
(r = parse_env_file("/etc/vconsole.conf", NEWLINE,
"KEYMAP", &vc_keymap,
"FONT", &vc_font,
"FONT_MAP", &vc_font_map,
@ -196,7 +196,7 @@ int main(int argc, char **argv) {
NULL)) < 0) {
if (r != -ENOENT)
log_warning("Failed to read /etc/vconsole: %s", strerror(-r));
log_warning("Failed to read /etc/vconsole.conf: %s", strerror(-r));
}
if (r <= 0) {