Merge branch 'master' of https://projects.archlinux.org/git/initscripts

3 files changed, 7 insertions, 2 deletions

diff --git a/network b/network
index b8c900d..c2ad9ba 100755
--- a/network
+++ b/network
@@ -32,7 +32,7 @@ network_up() {
 				return 1
 			fi
 		done
-		ip addr add $address/$netmask dev $interface || return 1
+		ip addr add $address/$netmask broadcast ${broadcast:-+} dev $interface || return 1
 		ip route add default via $gateway || return 1
 	else
 		dhcpcd $DHCPCD_ARGS $interface || return 1
diff --git a/rc.conf b/rc.conf
index a322c2d..cd95d9c 100644
--- a/rc.conf
+++ b/rc.conf
@@ -65,12 +65,14 @@ HOSTNAME="myhost"
 #   - interface: name of device (required)
 #   - address: IP address (leave blank for DHCP)
 #   - netmask: subnet mask (ignored for DHCP)
+#   - broadcast: broadcast address (ignored for DHCP) (optional)
 #   - gateway: default route (ignored for DHCP)
 # 
 # Static IP example
 # interface=eth0
 # address=192.168.0.2
 # netmask=255.255.255.0
+# broadcast=192.168.0.255
 # gateway=192.168.0.1
 #
 # DHCP example
@@ -82,6 +84,7 @@ HOSTNAME="myhost"
 interface=
 address=
 netmask=
+broadcast=
 gateway=
 
 # Setting this to "yes" will skip network shutdown.
diff --git a/rc.sysinit b/rc.sysinit
index 39afdb6..011c649 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -317,7 +317,9 @@ stat_busy "Removing Leftover Files"
 stat_done
 
 if [[ $HOSTNAME ]]; then
-	status "Setting Hostname: $HOSTNAME" hostname "$HOSTNAME"
+	stat_busy "Setting Hostname: $HOSTNAME"
+		echo $HOSTNAME > /proc/sys/kernel/hostname
+	stat_done
 fi
 
 stat_busy "Setting Locale: ${LOCALE:=en_US}"