diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2010-11-29 14:42:10 +0100 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-11-29 17:07:41 +0100 |
| commit | f5c88ec1330b61787441156de7d764a140774bd2 (patch) | |
| tree | 4e066f0bbaf3a7431706aa20ee5b164819105703 /src | |
| parent | 3d428115cf27d22e93faa988109f765dfcd600b9 (diff) | |
build-sys: frugalware linux support
Diffstat (limited to 'src')
| -rw-r--r-- | src/hostname-setup.c | 4 | ||||
| -rw-r--r-- | src/service.c | 2 | ||||
| -rw-r--r-- | src/vconsole-setup.c | 13 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/hostname-setup.c b/src/hostname-setup.c index ce7d2a1c11..0428a64fea 100644 --- a/src/hostname-setup.c +++ b/src/hostname-setup.c @@ -32,7 +32,7 @@ #if defined(TARGET_FEDORA) #define FILENAME "/etc/sysconfig/network" -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE) #define FILENAME "/etc/HOSTNAME" #elif defined(TARGET_ARCH) #define FILENAME "/etc/rc.conf" @@ -137,7 +137,7 @@ finish: fclose(f); return r; -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE) return read_and_strip_hostname(FILENAME, hn); #else return -ENOENT; diff --git a/src/service.c b/src/service.c index 429b53d4f8..6b6ce30855 100644 --- a/src/service.c +++ b/src/service.c @@ -65,7 +65,7 @@ static const struct { { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, #endif -#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) +#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_FRUGALWARE) /* Debian style rcS.d */ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, #endif diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c index 27e417886c..d05c277ad9 100644 --- a/src/vconsole-setup.c +++ b/src/vconsole-setup.c @@ -267,6 +267,19 @@ int main(int argc, char **argv) { log_warning("Failed to read /etc/rc.conf: %s", strerror(-r)); } +#elif defined(TARGET_FRUGALWARE) + if ((r = parse_env_file("/etc/sysconfig/keymap", NEWLINE, + "keymap", &vc_keymap, + NULL)) < 0) { + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/keymap: %s", strerror(-r)); + } + if ((r = parse_env_file("/etc/sysconfig/font", NEWLINE, + "font", &vc_font, + NULL)) < 0) { + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/font: %s", strerror(-r)); + } #elif defined(TARGET_GENTOO) if ((r = parse_env_file("/etc/rc.conf", NEWLINE, "unicode", &vc_unicode, |