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/hostname-setup.c | |
| parent | cec736d21ff86c4ac81b4d306ddba2120333818c (diff) | |
| parent | 64685e0cea62b4937f0804e47ce2cb7929f58223 (diff) | |
Merge branch 'master' into journal
Diffstat (limited to 'src/hostname-setup.c')
| -rw-r--r-- | src/hostname-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hostname-setup.c b/src/hostname-setup.c index 57db9fbf7c..7216b75c8a 100644 --- a/src/hostname-setup.c +++ b/src/hostname-setup.c @@ -32,7 +32,7 @@ #if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MANDRIVA) || defined(TARGET_MEEGO) #define FILENAME "/etc/sysconfig/network" -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE) +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) #define FILENAME "/etc/HOSTNAME" #elif defined(TARGET_ARCH) #define FILENAME "/etc/rc.conf" @@ -114,7 +114,7 @@ finish: fclose(f); return r; -#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) || defined(TARGET_FRUGALWARE) +#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE) return read_and_strip_hostname(FILENAME, hn); #else return -ENOENT; |