mirror of
https://github.com/troglobit/finit.git
synced 2026-10-10 16:52:39 +07:00
Merge pull request #128 from liuming50/dont-hard-code-etc-hostname
Dont hard code etc hostname
This commit is contained in:
@@ -32,7 +32,9 @@
|
||||
#include "service.h"
|
||||
#include "conf.h"
|
||||
|
||||
#ifndef MODULES_LOAD_PATH
|
||||
#define MODULES_LOAD_PATH "/etc/modules-load.d"
|
||||
#endif
|
||||
#define SERVICE_LINE \
|
||||
":%d name:modprobe.%s [2345] /sbin/modprobe %s %s -- Kernel module: %s"
|
||||
|
||||
|
||||
+5
-1
@@ -41,6 +41,10 @@
|
||||
|
||||
static int progress_style = PROGRESS_STYLE;
|
||||
|
||||
#ifndef HOSTNAME_PATH
|
||||
#define HOSTNAME_PATH "/etc/hostname"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Note: the pending status (⋯) must be last item. Also, ⋯ is not
|
||||
* off-by-one, it's a multi-byte character.
|
||||
@@ -287,7 +291,7 @@ void set_hostname(char **hostname)
|
||||
if (rescue)
|
||||
goto done;
|
||||
|
||||
fp = fopen("/etc/hostname", "r");
|
||||
fp = fopen(HOSTNAME_PATH, "r");
|
||||
if (fp) {
|
||||
struct stat st;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user