diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | hostname-setup.c | 124 | ||||
| -rw-r--r-- | hostname-setup.h | 27 | ||||
| -rw-r--r-- | main.c | 6 |
4 files changed, 160 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f63b3e4f8f..9d8bd9df30 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,9 @@ COMMON_SOURCES= \ cgroup.c \ cgroup.h \ mount-setup.c \ - mount-setup.h + mount-setup.h \ + hostname-setup.c \ + hostname-setup.h systemd_SOURCES = \ $(COMMON_SOURCES) \ diff --git a/hostname-setup.c b/hostname-setup.c new file mode 100644 index 0000000000..eca33a9853 --- /dev/null +++ b/hostname-setup.c @@ -0,0 +1,124 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include <unistd.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> +#include <stdlib.h> + +#include "hostname-setup.h" +#include "macro.h" +#include "util.h" +#include "log.h" + +#define LINE_MAX 4096 + +static int read_hostname(char **hn) { + +#if defined(TARGET_FEDORA) + int r; + FILE *f; + + assert(hn); + + if (!(f = fopen("/etc/sysconfig/network", "re"))) + return -errno; + + for (;;) { + char line[LINE_MAX]; + char *s, *k; + + if (!fgets(line, sizeof(line), f)) { + if (feof(f)) + break; + + r = -errno; + goto finish; + } + + s = strstrip(line); + + if (!startswith(s, "HOSTNAME=")) + continue; + + if (!(k = strdup(s+9))) { + r = -ENOMEM; + goto finish; + } + + *hn = k; + break; + } + + r = 0; + +finish: + fclose(f); + return r; + +#elif defined(TARGET_DEBIAN) + int r; + char *s, *k; + + assert(hn); + + if ((r = read_one_line_file("/etc/hostname", &s)) < 0) + return r; + + k = strdup(strstrip(s)); + free(s); + + if (!k) + return -ENOMEM; + + *hn = k; +#else +#warn "Don't know how to read the hostname" + + return -ENOENT; +#endif + + return 0; +} + +int hostname_setup(void) { + int r; + char *hn; + + if ((r = read_hostname(&hn)) < 0) { + if (r != -ENOENT) + log_warning("Failed to read configured hostname: %s", strerror(-r)); + + return r; + } + + r = sethostname(hn, strlen(hn)) < 0 ? -errno : 0; + + if (r < 0) + log_warning("Failed to set hostname to <%s>: %s", hn, strerror(-r)); + else + log_info("Set hostname to <%s>.", hn); + + free(hn); + + return r; +} diff --git a/hostname-setup.h b/hostname-setup.h new file mode 100644 index 0000000000..18a406a1f5 --- /dev/null +++ b/hostname-setup.h @@ -0,0 +1,27 @@ +/*-*- Mode: C; c-basic-offset: 8 -*-*/ + +#ifndef foohostnamesetuphfoo +#define foohostnamesetuphfoo + +/*** + This file is part of systemd. + + Copyright 2010 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +int hostname_setup(void); + +#endif @@ -32,6 +32,8 @@ #include "manager.h" #include "log.h" #include "mount-setup.h" +#include "hostname-setup.h" +#include "load-fragment.h" static enum { ACTION_RUN, @@ -293,6 +295,10 @@ int main(int argc, char *argv[]) { log_debug("systemd running in %s mode.", manager_running_as_to_string(running_as)); + if (running_as == MANAGER_INIT) + if (hostname_setup() < 0) + goto finish; + if ((r = manager_new(running_as, &m)) < 0) { log_error("Failed to allocate manager object: %s", strerror(-r)); goto finish; |