From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F008139083 for ; Thu, 14 Dec 2017 23:11:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 864ACE0F40; Thu, 14 Dec 2017 23:11:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63EBBE0F40 for ; Thu, 14 Dec 2017 23:11:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2100433BEBE for ; Thu, 14 Dec 2017 23:11:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A81BEAE75 for ; Thu, 14 Dec 2017 23:11:04 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1513292851.50b69d564a8f89b8137bb6d9d53aac1e44f6c23c.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/hostname.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 50b69d564a8f89b8137bb6d9d53aac1e44f6c23c X-VCS-Branch: master Date: Thu, 14 Dec 2017 23:11:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4e173079-1a6b-429b-90b2-20b019c076d4 X-Archives-Hash: c405d01c1e366bb007733f17013e9cc6 commit: 50b69d564a8f89b8137bb6d9d53aac1e44f6c23c Author: William Hubbs gmail com> AuthorDate: Thu Dec 14 23:07:31 2017 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Dec 14 23:07:31 2017 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=50b69d56 hostname: replace @SYSCONFDIR@ references with /etc I do not know of any situation where /etc/hostname is at any other location. Also, this does not run on prefix. init.d/hostname.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/init.d/hostname.in b/init.d/hostname.in index d7913bed..823008fd 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -20,9 +20,9 @@ depend() start() { local h source x - if [ -s @SYSCONFDIR@/hostname ] && [ -r @SYSCONFDIR@/hostname ]; then - read h x <@SYSCONFDIR@/hostname - source="from @SYSCONFDIR@/hostname" + if [ -s /etc/hostname ] && [ -r /etc/hostname ]; then + read h x