release openrc-0.10.5

Mount can't be used in vservers, but /run is still needed. So we create
the directory and clear it out instead of mounting a tmpfs in that
situation.

reported-by: <patrick@gentoo.org>
X-Gentoo-Bug: 423739
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=423739

Makefile.inc

@@ -1,3 +1,3 @@
 NAME=		openrc
-VERSION=	0.10
+VERSION=	0.10.5
 PKG=		${NAME}-${VERSION}

doc/net.example.Linux.in

@@ -1111,13 +1111,6 @@
 # Hypothetical network card that requires a change-eeprom toggle to enable flashing
 #ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple"
 
-#-----------------------------------------------------------------------------
-# Firewalld support
-# If you are using the firewalld daemon to configure your firewall
-# settings and you have specific zones you want to apply to your
-# interfaces, you can do this here.
-#firewalld_zone_eth0="myzone"
-
 ##############################################################################
 # ADVANCED CONFIGURATION
 #

init.d/hostname.in

@@ -5,38 +5,12 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	need root
+	keyword -lxc
 }
 
 start()
 {
 	hostname=${hostname-${HOSTNAME-localhost}}
-	out=$hostname
-	short=${hostname%%.*}
-	if [ "$short" != "$hostname" ]; then
-		out="$out $short"
-	fi
-	if [ "$nisdomainname" != "" ]; then
-		ebegin "Setting NIS domain name to $nisdomainname"
-		nisdomainname $nisdomainname
-		eend $? "Failed to set the NIS domain name"
-	fi
-	if [ "$short" != "localhost" ]; then
-		out="$out localhost"
-	fi
-	if [ "$hostname" != "localhost.localdomain" ]; then
-		out="$out localhost.localdomain"
-	fi
-	[ -n "$aliases" ] && out="$out $aliases"
-	ebegin "Configuring /etc/hosts"
-	[ -e /etc/hosts ] && sed -i -e '/[[:space:]]*127.0.0.1[[:space:]]/d' -e '/[[:space:]]*::1[[:space:]]/d' /etc/hosts
-	cat <<END >> /etc/hosts
-127.0.0.1	$out
-::1		$out
-END
-	chmod 0644 /etc/hosts
-	eend $?
-	[ "$RC_SYS" = "LXC" ] && return 0
 	ebegin "Setting hostname to $hostname"
 	hostname "$hostname"
 	eend $? "Failed to set the hostname"

init.d/localmount.in

@@ -9,7 +9,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -vserver -lxc
+	keyword -jail -openvz -vserver -lxc
 }
 
 start()

init.d/sysctl.Linux.in

@@ -15,14 +15,6 @@ start()
 	ebegin "Configuring kernel parameters"
 	eindent
 
-	# default sysctl System V max shared memory to 1/4 of RAM:
-	mem_bytes=`awk '/MemTotal:/ { printf "%0.f",$2 * 1024}' /proc/meminfo`
-	mem_max=`expr $mem_bytes / 4` 
-	page_size=`getconf PAGE_SIZE`
-	shmall=`expr $mem_bytes / $page_size`
-	sysctl kernel.shmmax=$mem_max > /dev/null
-	sysctl kernel.shmall=$shmall > /dev/null
-
 	for conf in @SYSCONFDIR@/sysctl.conf @SYSCONFDIR@/sysctl.d/*.conf; do
 		if [ -r "$conf" ]; then
 			vebegin "applying $conf"

mk/termcap.mk

@@ -1,10 +1,5 @@
 ifeq (${MKTERMCAP},ncurses)
-	LTERMCAP:=	$(shell pkg-config ncurses --libs 2> /dev/null)
-ifeq ($(LTERMCAP),)
 LIBTERMCAP?=	-lncurses
-else
-LIBTERMCAP?= $(LTERMCAP)
-endif
 CPPFLAGS+=	-DHAVE_TERMCAP
 LDADD+=		${LIBTERMCAP}
 else ifeq (${MKTERMCAP},termcap)

net/Makefile

@@ -13,7 +13,7 @@ SRCS-Linux=	iwconfig.sh.in
 INC-Linux=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
 		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
 		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
-		vlan.sh macvlan.sh ip6rd.sh firewalld.sh
+		vlan.sh macvlan.sh ip6rd.sh
 
 SRCS-NetBSD=
 INC-NetBSD=	ifwatchd.sh

net/firewalld.sh

@@ -1,38 +0,0 @@
-# Copyright (c) 2012 Doug Goldstein <cardoe@cardoe.com>
-# Released under the 2-clause BSD license.
-
-firewalld_depend()
-{
-	after interface
-	before dhcp
-	program firewall-cmd
-	[ "$IFACE" != "lo" ] && need firewalld
-}
-
-_config_vars="$_config_vars firewalld_zone"
-
-firewalld_post_start()
-{
-	local firewalld_zone=
-	eval firewalld_zone=\$firewalld_zone_${IFVAR}
-
-	_exists || return 0
-
-	if [ "${IFACE}" != "lo" ]; then
-		firewall-cmd --zone="${firewalld_zone}" \
-			--change-interface="${IFACE}" > /dev/null 2>&1
-	fi
-
-	return 0
-}
-
-firewalld_pre_stop()
-{
-	_exists || return 0
-
-	if [ "${IFACE}" != "lo" ]; then
-		firewall-cmd --remove-interface="${IFACE}" > /dev/null 2>&1
-	fi
-
-	return 0
-}

net/udhcpc.sh

@@ -61,7 +61,7 @@ udhcpc_start()
 	esac
 
 	case " ${args} " in
-		*" --hosname="*|*" -h "*|*" -H "*);;
+		*" --hostname="*|*" -h "*|*" -H "*);;
 		*)
 			if ${sendhost}; then
 				local hname="$(hostname)"

sh/init.sh.Linux.in

@@ -37,14 +37,23 @@ fi
 
 # /run is a new directory for storing volatile runtime data.
 # Read more about /run at https://lwn.net/Articles/436012
+sys="$(rc --sys)"
+
 if [ ! -d /run ]; then
-	eerror "The /run directory does not exist. Unable to continue."
-	return 1
+	if [ "$sys" = VSERVER ]; then
+		if [ -e /run ]; then
+		rm -rf /run
+		fi
+		mkdir /run
+	else
+		eerror "The /run directory does not exist. Unable to continue."
+		return 1
+	fi
 fi
 
-if mountinfo -q /run; then
-	einfo "/run is already mounted, skipping"
-else
+if [ "$sys" = VSERVER ]; then
+	rm -rf /run/*
+elif ! mountinfo -q /run; then
 	ebegin "Mounting /run"
 	rc=0
 	if ! fstabinfo --mount /run; then