From 12cabc94c885f1a306758d425bc1b0156da92bba Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Mar 2009 08:31:12 +0100 Subject: [PATCH] initscripts: use $hostname from rc.conf, to mimic NetBSD. --HG-- extra : convert_revision : 61b6484648b15667e10a7259a46f09253a5b6e3b --- templates/initscripts/files/rc.conf | 4 +--- templates/initscripts/files/rc.sysinit | 5 ----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/templates/initscripts/files/rc.conf b/templates/initscripts/files/rc.conf index e8458a9432a..0c3ffe51c39 100755 --- a/templates/initscripts/files/rc.conf +++ b/templates/initscripts/files/rc.conf @@ -23,12 +23,10 @@ KEYMAP="es" CONSOLEFONT= CONSOLEMAP= -USELVM="no" -HOSTNAME="xbps" - # # Services and daemons. # +hostname="xbps" syslogd=yes klogd=yes diff --git a/templates/initscripts/files/rc.sysinit b/templates/initscripts/files/rc.sysinit index 40cebbf2787..e74d1b47492 100755 --- a/templates/initscripts/files/rc.sysinit +++ b/templates/initscripts/files/rc.sysinit @@ -50,8 +50,3 @@ fi if [ -f /etc/localtime ]; then hwclock $HWCLOCK_PARAMS --noadjfile fi - -# Set hostname -if [ -n "$HOSTNAME" ]; then - hostname "$HOSTNAME" -fi