From a9ffc483b60f481bf4a8ba858f1c18f7b64bd5ad Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 27 Sep 2012 19:51:51 +0200 Subject: hostname: set very early Also properly check for the deprecated use of rc.conf for this purpose, as we were getting lots of false positives. Signed-off-by: Tom Gundersen --- rc.sysinit | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/rc.sysinit b/rc.sysinit index b285cc7..458bac6 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -3,9 +3,21 @@ # /etc/rc.sysinit # +unset HOSTNAME + . /etc/rc.conf . /etc/rc.d/functions +if [[ $HOSTNAME ]]; then + print_depr "HOSTNAME=" "rc.conf(5) and hostname(5)" +fi +if [[ -s /etc/hostname ]]; then + HOSTNAME=$(< /etc/hostname) +fi +if [[ $HOSTNAME ]]; then + echo "$HOSTNAME" >| /proc/sys/kernel/hostname +fi + # don't let all the systemd tools be too verbose export SYSTEMD_LOG_LEVEL="notice" @@ -137,17 +149,6 @@ status 'Initializing random seed' /usr/lib/systemd/systemd-random-seed load # Remove leftover files remove_leftover -if [[ $HOSTNAME ]]; then - print_depr "HOSTNAME=" "rc.conf(5) and hostname(5)" -fi -if [[ -s /etc/hostname ]]; then - HOSTNAME=$(< /etc/hostname) -fi -if [[ $HOSTNAME ]]; then - stat_busy "Setting hostname: $HOSTNAME" - echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail -fi - stat_busy "Saving dmesg log" if [[ -e /proc/sys/kernel/dmesg_restrict ]] && (( $(< /proc/sys/kernel/dmesg_restrict) == 1 )); then -- cgit v1.2.3