aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2018-12-07 14:41:59 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-12-07 14:44:18 +0000
commitb6b6dcd2e868031216140f6f75906eed1e9cbd40 (patch)
treeb5edd8d9822e063576660c743274b73b25682c1a
parent57818935b7a5a1bec426721e935238ff89b54684 (diff)
downloadaports-b6b6dcd2e868031216140f6f75906eed1e9cbd40.tar.gz
aports-b6b6dcd2e868031216140f6f75906eed1e9cbd40.tar.bz2
aports-b6b6dcd2e868031216140f6f75906eed1e9cbd40.tar.xz
main/openrc: fix hostname script
we should not override hostname set in /etc/conf.d/hostname ref #9737
-rw-r--r--main/openrc/APKBUILD4
-rw-r--r--main/openrc/hostname.initd2
2 files changed, 3 insertions, 3 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index d2af400a7c..62c804979e 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
pkgname=openrc
pkgver=0.39.2
_ver=${pkgver/_git*/}
-pkgrel=1
+pkgrel=2
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="https://gitweb.gentoo.org/proj/openrc.git"
arch="all"
@@ -93,7 +93,7 @@ dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a
e56ea82dbf8bf6b4cff4fa48db8e4f06589094ba99aad930fc498e2fe235db6ce2afe96e2bc047dd9066a4057d4e3691f8d0148ad5fed5d8191c0e2415a48f69 0008-fix-undeclared-UT_LINESIZE.patch
25a32c87a7e95e3c891156855b3c501cd529bb39810b362204cf187c2a4230b51cc9b6d96d0750ca4ef454fd7ef0bb01533e059ef35ab27939aafc4da551a6f5 do-not-complain-if-interrupted-by-a-signal.patch
12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate
-99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd hostname.initd
+259552165ee5e9ca973bbe18d1d9ec5cc67526cb26a9e0ac717076ef4913bb7ff4055d6ccb9f77996ed9c00b67f46edba552e1a21b836068a112dda2428502b3 hostname.initd
c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd
b04058ec630e19de0bafefe06198dc1bff8c8d5d2c89e4660dd83dda8bb82a76cdb1d8661cce88e4a406aa6b4152e17efff52d3eb18ffaec0751d0b6cdbcc48a modules.initd
27c036a2c07f658f7fb1e066c59dc494674ba0d81bcb85fea9caffec28ee537eb11e863e20aa4b1c88607f12496ac66d5b092c787c86ff8b8a80e423a8d99440 modloop.initd
diff --git a/main/openrc/hostname.initd b/main/openrc/hostname.initd
index c1580db084..4ad7877d90 100644
--- a/main/openrc/hostname.initd
+++ b/main/openrc/hostname.initd
@@ -10,7 +10,7 @@ start() {
if [ -s /etc/hostname ] ; then
opts="-F /etc/hostname"
else
- opts="localhost"
+ opts="${hostname:-localhost}"
fi
ebegin "Setting hostname"
hostname $opts