diff options
author | Tom Gundersen <teg@jklm.no> | 2012-09-27 19:51:51 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2012-09-27 19:51:51 +0200 |
commit | a9ffc483b60f481bf4a8ba858f1c18f7b64bd5ad (patch) | |
tree | 4d926b2211f223bcd850cb809efc8cdd08b2d31a /rc.sysinit | |
parent | c67d598d1cb2c346c83b72449bf20ee5dfea9ae7 (diff) | |
download | initscripts-a9ffc483b60f481bf4a8ba858f1c18f7b64bd5ad.tar.xz |
hostname: set very early2012.09.1
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 <teg@jklm.no>
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-x | rc.sysinit | 23 |
1 files changed, 12 insertions, 11 deletions
@@ -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 |