View | Details | Raw Unified | Return to bug 18583
Collapse All | Expand All

(-)/etc/rc.network (-2 / +7 lines)
Lines 16-23 Link Here
16
	# Set the host name if it is not already set
16
	# Set the host name if it is not already set
17
	#
17
	#
18
	if [ -z "`hostname -s`" ]; then
18
	if [ -z "`hostname -s`" ]; then
19
		hostname ${hostname}
19
		if [ -n "${hostname}" ]; then
20
		echo -n ' hostname'
20
			hostname ${hostname}
21
			echo -n ' hostname'
22
		elif [ -n "${default_hostname}" ]; then
23
			hostname ${default_hostname}
24
			echo -n ' default_hostname'
25
		fi
21
	fi
26
	fi
22
27
23
	# Set the domainname if we're using NIS
28
	# Set the domainname if we're using NIS
(-)/etc/defaults/rc.conf (+1 lines)
Lines 39-44 Link Here
39
39
40
### Basic network options: ###
40
### Basic network options: ###
41
hostname=""			# Set this!
41
hostname=""			# Set this!
42
default_hostname=""		# Set this if you get your hostname elseware.
42
nisdomainname="NO"		# Set to NIS domain if using NIS (or NO).
43
nisdomainname="NO"		# Set to NIS domain if using NIS (or NO).
43
dhcp_program="/sbin/dhclient"	# Path to dhcp client program.
44
dhcp_program="/sbin/dhclient"	# Path to dhcp client program.
44
dhcp_flags=""			# Additional flags to pass to dhcp client.
45
dhcp_flags=""			# Additional flags to pass to dhcp client.
(-)/sbin/dhclient-script (-1 / +1 lines)
Lines 76-82 Link Here
76
if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
76
if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
77
   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
77
   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
78
  current_hostname=`/bin/hostname`
78
  current_hostname=`/bin/hostname`
79
  if [ x$current_hostname = x ] || \
79
  if [ x$current_hostname = x`rc_conf_var default_hostname` ] || \
80
     [ x$current_hostname = x$old_host_name ]; then
80
     [ x$current_hostname = x$old_host_name ]; then
81
    if [ x$new_host_name != x$old_host_name ]; then
81
    if [ x$new_host_name != x$old_host_name ]; then
82
      $LOGGER "New Hostname: $new_host_name"
82
      $LOGGER "New Hostname: $new_host_name"
(-)/sbin/rc_conf_var (+13 lines)
Line 0 Link Here
1
#!/bin/sh
2
# $FreeBSD$
3
4
# If there is a global system configuration file, suck it in.
5
#
6
if [ -r /etc/defaults/rc.conf ]; then
7
	. /etc/defaults/rc.conf
8
	source_rc_confs
9
elif [ -r /etc/rc.conf ]; then
10
	. /etc/rc.conf
11
fi
12
13
eval echo \$${1}

Return to bug 18583