Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: init.d/
Date: Thu, 14 Dec 2017 23:11:08
Message-Id: 1513292851.50b69d564a8f89b8137bb6d9d53aac1e44f6c23c.williamh@OpenRC
1 commit: 50b69d564a8f89b8137bb6d9d53aac1e44f6c23c
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Thu Dec 14 23:07:31 2017 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 14 23:07:31 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=50b69d56
7
8 hostname: replace @SYSCONFDIR@ references with /etc
9
10 I do not know of any situation where /etc/hostname is at any other
11 location. Also, this does not run on prefix.
12
13 init.d/hostname.in | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/init.d/hostname.in b/init.d/hostname.in
17 index d7913bed..823008fd 100644
18 --- a/init.d/hostname.in
19 +++ b/init.d/hostname.in
20 @@ -20,9 +20,9 @@ depend()
21 start()
22 {
23 local h source x
24 - if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then
25 - read h x <@SYSCONFDIR@/hostname
26 - source="from @SYSCONFDIR@/hostname"
27 + if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then
28 + read h x </etc/hostname
29 + source="from /etc/hostname"
30 else
31 # HOSTNAME variable used to be defined in caps in conf.d/hostname.
32 # It is also a magic variable in bash.