[gentoo-commits] gentoo-alt r1686 - in trunk/baselayout-prefix: etc etc/env.d sbin

[Fabian Groffen (grobian)]

Author: grobian
Date: 2011-03-31 14:12:12 +0000 (Thu, 31 Mar 2011)
New Revision: 1686

Modified:
   trunk/baselayout-prefix/etc/env.d/00basic
   trunk/baselayout-prefix/etc/profile
   trunk/baselayout-prefix/sbin/env-update.sh
   trunk/baselayout-prefix/sbin/functions.sh
   trunk/baselayout-prefix/sbin/runscript.sh
Log:
applied baselayout-1.12.5-prefix.patch

Modified: trunk/baselayout-prefix/etc/env.d/00basic
===================================================================
--- trunk/baselayout-prefix/etc/env.d/00basic	2011-03-31 14:11:59 UTC (rev 1685)
+++ trunk/baselayout-prefix/etc/env.d/00basic	2011-03-31 14:12:12 UTC (rev 1686)
@@ -1,10 +1,11 @@
-# /etc/env.d/00basic
+# @GENTOO_PORTAGE_EPREFIX@/etc/env.d/00basic
 
-PATH="/opt/bin"
-ROOTPATH="/opt/bin"
-LDPATH="/usr/local/lib"
-MANPATH="/usr/local/share/man:/usr/share/man"
-INFOPATH="/usr/share/info"
+# in prefix we have sbin variants in user path!
+PATH="@GENTOO_PORTAGE_EPREFIX@/opt/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/sbin"
+ROOTPATH="@GENTOO_PORTAGE_EPREFIX@/opt/bin"
+LDPATH="@GENTOO_PORTAGE_EPREFIX@/usr/local/lib"
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/man"
+INFOPATH="@GENTOO_PORTAGE_EPREFIX@/usr/share/info"
 CVS_RSH="ssh"
-PAGER="/usr/bin/less"
+PAGER="@GENTOO_PORTAGE_EPREFIX@/usr/bin/less"
 LESSOPEN="|lesspipe.sh %s"

Modified: trunk/baselayout-prefix/etc/profile
===================================================================
--- trunk/baselayout-prefix/etc/profile	2011-03-31 14:11:59 UTC (rev 1685)
+++ trunk/baselayout-prefix/etc/profile	2011-03-31 14:12:12 UTC (rev 1686)
@@ -1,4 +1,4 @@
-# /etc/profile: login shell setup
+# @GENTOO_PORTAGE_EPREFIX@/etc/profile: login shell setup
 #
 # That this file is used by any Bourne-shell derivative to setup the
 # environment for login shells.
@@ -6,8 +6,8 @@
 
 # Load environment settings from profile.env, which is created by
 # env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
-	. /etc/profile.env
+if [ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env ] ; then
+	. "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.env
 fi
 
 # 077 would be more secure, but 022 is generally quite realistic
@@ -22,23 +22,23 @@
 # This way the evaluation can be short-circuited and calling whoami is
 # avoided.
 if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
-	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin"
 else
-	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+	PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin"
 fi
 export PATH
 unset ROOTPATH
 
 # Extract the value of EDITOR
-[ -z "$EDITOR" ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`"
-[ -z "$EDITOR" ] && EDITOR="/bin/nano"
+[ -z "$EDITOR" ] && EDITOR="`. @GENTOO_PORTAGE_EPREFIX@/etc/rc.conf 2>/dev/null; echo $EDITOR`"
+[ -z "$EDITOR" ] && EDITOR="@GENTOO_PORTAGE_EPREFIX@/bin/nano"
 export EDITOR
 
 if [ -n "${BASH_VERSION}" ] ; then
 	# Newer bash ebuilds include /etc/bash/bashrc which will setup PS1
 	# including color.  We leave out color here because not all
 	# terminals support it.
-	if [ -f /etc/bash/bashrc ] ; then
+	if [ -f "@GENTOO_PORTAGE_EPREFIX@"/etc/bash/bashrc ] ; then
 		# Bash login shells run only /etc/profile
 		# Bash non-login shells run only /etc/bash/bashrc
 		# Since we want to run /etc/bash/bashrc regardless, we source it 
@@ -46,7 +46,7 @@
 		# this *after* the user's .bash_profile runs (without putting 
 		# it in the user's dot-files), but it shouldn't make any 
 		# difference.
-		. /etc/bash/bashrc
+		. "@GENTOO_PORTAGE_EPREFIX@"/etc/bash/bashrc
 	else
 		PS1='\u@\h \w \$ '
 	fi
@@ -57,7 +57,7 @@
 	PS1="`whoami`@`uname -n | cut -f1 -d.` \$ "
 fi
 
-for sh in /etc/profile.d/*.sh ; do
+for sh in "@GENTOO_PORTAGE_EPREFIX@"/etc/profile.d/*.sh ; do
 	if [ -r "$sh" ] ; then
 		. "$sh"
 	fi

Modified: trunk/baselayout-prefix/sbin/env-update.sh
===================================================================
--- trunk/baselayout-prefix/sbin/env-update.sh	2011-03-31 14:11:59 UTC (rev 1685)
+++ trunk/baselayout-prefix/sbin/env-update.sh	2011-03-31 14:12:12 UTC (rev 1686)
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-source /sbin/functions.sh || exit 1
+source "@GENTOO_PORTAGE_EPREFIX@"/sbin/functions.sh || exit 1
 
-if [[ ${EUID} != "0" ]] ; then
+if [[ ${EPREFIX/\//} == "" ]] && [[ ${EUID} != "0" ]] ; then
 	eerror "$0: must be root."
 	exit 1
 fi
@@ -13,8 +13,8 @@
 echo "usage: env-update.sh
 
 note:
-      This utility generates /etc/profile.env and /etc/csh.env
-      from the contents of /etc/env.d/
+      This utility generates @GENTOO_PORTAGE_EPREFIX@/etc/profile.env and @GENTOO_PORTAGE_EPREFIX@/etc/csh.env
+      from the contents of @GENTOO_PORTAGE_EPREFIX@/etc/env.d/
 "
 	exit 1
 }
@@ -30,9 +30,9 @@
 if [[ $# != "0" ]] ; then
 	usage
 else
-	/bin/gawk \
-		-f /lib/rcscripts/awk/functions.awk \
-		-f /lib/rcscripts/awk/genenviron.awk
+	"@GENTOO_PORTAGE_EPREFIX@"/bin/gawk \
+		-f "@GENTOO_PORTAGE_EPREFIX@"/lib/rcscripts/awk/functions.awk \
+		-f "@GENTOO_PORTAGE_EPREFIX@"/lib/rcscripts/awk/genenviron.awk
 fi
 
 # vim:ts=4

Modified: trunk/baselayout-prefix/sbin/functions.sh
===================================================================
--- trunk/baselayout-prefix/sbin/functions.sh	2011-03-31 14:11:59 UTC (rev 1685)
+++ trunk/baselayout-prefix/sbin/functions.sh	2011-03-31 14:12:12 UTC (rev 1686)
@@ -4,11 +4,11 @@
 RC_GOT_FUNCTIONS="yes"
 
 # Override defaults with user settings ...
-[[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc
+[[ -f @GENTOO_PORTAGE_EPREFIX@/etc/conf.d/rc ]] && source "@GENTOO_PORTAGE_EPREFIX@"/etc/conf.d/rc
 
 # Check /etc/conf.d/rc for a description of these ...
-declare -r svclib="/lib/rcscripts"
-declare -r svcdir="${svcdir:-/var/lib/init.d}"
+declare -r svclib="@GENTOO_PORTAGE_EPREFIX@/lib/rcscripts"
+declare -r svcdir="${svcdir:-@GENTOO_PORTAGE_EPREFIX@/var/lib/init.d}"
 svcmount="${svcmount:-no}"
 svcfstype="${svcfstype:-tmpfs}"
 svcsize="${svcsize:-1024}"
@@ -83,7 +83,7 @@
 }
 # This will override the splash() function...
 if ! import_addon splash-functions.sh ; then
-	[[ -f /sbin/splash-functions.sh ]] && source /sbin/splash-functions.sh
+	[[ -f @GENTOO_PORTAGE_EPREFIX@/sbin/splash-functions.sh ]] && source "@GENTOO_PORTAGE_EPREFIX@"/sbin/splash-functions.sh
 fi
 
 # void profiling(...)
@@ -114,8 +114,8 @@
 	local newbootlevel=
 	local newsoftlevel=
 
-	if [[ -r /proc/cmdline ]] ; then
-		for copt in $(</proc/cmdline) ; do
+	if [[ -r @GENTOO_PORTAGE_EPREFIX@/proc/cmdline ]] ; then
+		for copt in $(<"@GENTOO_PORTAGE_EPREFIX@"/proc/cmdline) ; do
 			case "${copt%=*}" in
 				bootlevel)
 					newbootlevel="${copt##*=}"
@@ -153,8 +153,8 @@
 	fi
 
 	if [[ ${RC_USE_CONFIG_PROFILE} == "yes" && -n ${DEFAULTLEVEL} ]] && \
-	   [[ -d "/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" || \
-	      -L "/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" ]] ; then
+	   [[ -d "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" || \
+	      -L "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}.${DEFAULTLEVEL}" ]] ; then
 		export BOOTLEVEL="${BOOTLEVEL}.${DEFAULTLEVEL}"
 	fi
 
@@ -176,8 +176,8 @@
 get_libdir() {
 	if [[ -n ${CONF_LIBDIR_OVERRIDE} ]] ; then
 		CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
-	elif [[ -x /usr/bin/portageq ]] ; then
-		CONF_LIBDIR="$(/usr/bin/portageq envvar CONF_LIBDIR)"
+	elif [[ -x @GENTOO_PORTAGE_EPREFIX@/usr/bin/portageq ]] ; then
+		CONF_LIBDIR="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar CONF_LIBDIR)"
 	fi
 	echo "${CONF_LIBDIR:=lib}"
 }
@@ -190,14 +190,14 @@
 	local pri=
 	local tag=
 
-	if [[ -x /usr/bin/logger ]] ; then
+	if [[ -x @GENTOO_PORTAGE_EPREFIX@/usr/bin/logger ]] ; then
 		pri="$1"
 		tag="$2"
 
 		shift 2
 		[[ -z "$*" ]] && return 0
 
-		/usr/bin/logger -p "${pri}" -t "${tag}" -- "$*"
+		"@GENTOO_PORTAGE_EPREFIX@"/usr/bin/logger -p "${pri}" -t "${tag}" -- "$*"
 	fi
 
 	return 0
@@ -269,7 +269,7 @@
 	fi
 
 	local name="rc-scripts"
-	[[ $0 != "/sbin/runscript.sh" ]] && name="${0##*/}"
+	[[ $0 != "@GENTOO_PORTAGE_EPREFIX@/sbin/runscript.sh" ]] && name="${0##*/}"
 	# Log warnings to system log
 	esyslog "daemon.warning" "${name}" "$*"
 
@@ -290,7 +290,7 @@
 	fi
 
 	local name="rc-scripts"
-	[[ $0 != "/sbin/runscript.sh" ]] && name="${0##*/}"
+	[[ $0 != "@GENTOO_PORTAGE_EPREFIX@/sbin/runscript.sh" ]] && name="${0##*/}"
 	# Log errors to system log
 	esyslog "daemon.err" "rc-scripts" "$*"
 
@@ -488,9 +488,9 @@
 get_bootparam() {
 	local x copt params retval=1
 
-	[[ ! -r /proc/cmdline ]] && return 1
+	[[ ! -r @GENTOO_PORTAGE_EPREFIX@/proc/cmdline ]] && return 1
 
-	for copt in $(< /proc/cmdline) ; do
+	for copt in $(< "@GENTOO_PORTAGE_EPREFIX@"/proc/cmdline) ; do
 		if [[ ${copt%=*} == "gentoo" ]] ; then
 			params=$(gawk -v PARAMS="${copt##*=}" '
 				BEGIN {
@@ -583,8 +583,8 @@
 #    get the version of baselayout that this system is running
 #
 get_base_ver() {
-	[[ ! -r /etc/gentoo-release ]] && return 0
-	local ver="$(</etc/gentoo-release)"
+	[[ ! -r @GENTOO_PORTAGE_EPREFIX@/etc/gentoo-release ]] && return 0
+	local ver="$(<"@GENTOO_PORTAGE_EPREFIX@"/etc/gentoo-release)"
 	echo "${ver##* }"
 }
 
@@ -602,8 +602,8 @@
 is_net_fs() {
 	local fstype
 	# /proc/mounts is always accurate but may not always be available
-	if [[ -e /proc/mounts ]] ; then
-		fstype="$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' /proc/mounts )"
+	if [[ -e @GENTOO_PORTAGE_EPREFIX@/proc/mounts ]] ; then
+		fstype="$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' "@GENTOO_PORTAGE_EPREFIX@"/proc/mounts )"
 	else
 		fstype="$( mount | sed -n -e 's:.* on '"$1"' type \([^ ]*\).*:\1:p' )"
 	fi
@@ -618,7 +618,7 @@
 #   EXAMPLE:  if is_union_fs / ; then ...
 #
 is_union_fs() {
-	[[ ! -x /sbin/unionctl ]] && return 1
+	[[ ! -x @GENTOO_PORTAGE_EPREFIX@/sbin/unionctl ]] && return 1
 	unionctl "$1" --list &>/dev/null
 }
 
@@ -629,7 +629,7 @@
 #   EXAMPLE:  if is_uml_sys ; then ...
 #
 is_uml_sys() {
-	grep -qs 'UML' /proc/cpuinfo
+	grep -qs 'UML' "@GENTOO_PORTAGE_EPREFIX@"/proc/cpuinfo
 }
 
 # bool is_vserver_sys()
@@ -639,7 +639,7 @@
 #   EXAMPLE:  if is_vserver_sys ; then ...
 #
 is_vserver_sys() {
-	grep -qs '^s_context:[[:space:]]*[1-9]' /proc/self/status
+	grep -qs '^s_context:[[:space:]]*[1-9]' "@GENTOO_PORTAGE_EPREFIX@"/proc/self/status
 }
 
 # bool is_xenU_sys()
@@ -649,9 +649,9 @@
 #   EXAMPLE:  if is_xenU_sys ; then ...
 #
 is_xenU_sys() {
-	[[ ! -d /proc/xen ]] && return 1
-	[[ ! -r /proc/xen/capabilities ]] && return 1
-	grep -q "control_d" /proc/xen/capabilities && return 1
+	[[ ! -d "@GENTOO_PORTAGE_EPREFIX@"/proc/xen ]] && return 1
+	[[ ! -r "@GENTOO_PORTAGE_EPREFIX@"/proc/xen/capabilities ]] && return 1
+	grep -q "control_d" "@GENTOO_PORTAGE_EPREFIX@"/proc/xen/capabilities && return 1
 	return 0
 }
 
@@ -667,7 +667,7 @@
 	gawk '$1 ~ "^#" { next }
 	     $2 == "'$*'" { stab="-t "$3" -o "$4" "$1" "$2; }
 	     END { print stab; }
-	' /etc/fstab
+	' "@GENTOO_PORTAGE_EPREFIX@"/etc/fstab
 }
 
 # char *reverse_list(list)
@@ -771,13 +771,13 @@
 	# Setup a basic $PATH.  Just add system default to existing.
 	# This should solve both /sbin and /usr/sbin not present when
 	# doing 'su -c foo', or for something like:  PATH= rcscript start
-	PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/sbin:${PATH}"
+	PATH="@GENTOO_PORTAGE_EPREFIX@/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/local/sbin:${PATH}"
 
 	# Cache the CONSOLETYPE - this is important as backgrounded shells don't
 	# have a TTY. rc unsets it at the end of running so it shouldn't hang
 	# around
 	if [[ -z ${CONSOLETYPE} ]] ; then
-		export CONSOLETYPE="$( /sbin/consoletype 2>/dev/null )"
+		export CONSOLETYPE="$( "@GENTOO_PORTAGE_EPREFIX@"/sbin/consoletype 2>/dev/null )"
 	fi
 	if [[ ${CONSOLETYPE} == "serial" ]] ; then
 		RC_NOCOLOR="yes"
@@ -797,7 +797,7 @@
 
 	# If we are not /sbin/rc then ensure that we cannot change level variables
 	if [[ -n ${BASH_SOURCE} \
-		&& ${BASH_SOURCE[${#BASH_SOURCE[@]}-1]} != "/sbin/rc" ]] ; then
+		&& ${BASH_SOURCE[${#BASH_SOURCE[@]}-1]} != "@GENTOO_PORTAGE_EPREFIX@/sbin/rc" ]] ; then
 		declare -r BOOTLEVEL DEFAULTLEVEL SOFTLEVEL
 	fi
 else

Modified: trunk/baselayout-prefix/sbin/runscript.sh
===================================================================
--- trunk/baselayout-prefix/sbin/runscript.sh	2011-03-31 14:11:59 UTC (rev 1685)
+++ trunk/baselayout-prefix/sbin/runscript.sh	2011-03-31 14:12:12 UTC (rev 1686)
@@ -1,18 +1,18 @@
-#!/bin/bash
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Common functions
-[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source /sbin/functions.sh
+[[ ${RC_GOT_FUNCTIONS} != "yes" ]] && source @GENTOO_PORTAGE_EPREFIX@/sbin/functions.sh
 
-# User must be root to run most script stuff (except status)
-if [[ ${EUID} != "0" ]] && ! [[ $2 == "status" && $# -eq 2 ]] ; then
-	eerror "$0: must be root to run init scripts"
-	exit 1
-fi
+## User must be root to run most script stuff (except status)
+#if [[ ${EUID} != "0" ]] && ! [[ $2 == "status" && $# -eq 2 ]] ; then
+#    eerror "$0: must be root to run init scripts"
+#    exit 1
+#fi
 
 myscript="$1"
-if [[ -L $1 && ! -L "/etc/init.d/${1##*/}" ]] ; then
+if [[ -L $1 && ! -L "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${1##*/}" ]] ; then
 	SVCNAME="$(readlink "$1")"
 else
 	SVCNAME="$1"
@@ -84,12 +84,12 @@
 #     configuration, if the system administrator chose to put it
 #     there (if it exists).
 if net_service "${SVCNAME}" ; then
-	conf="$(add_suffix /etc/conf.d/net)"
+	conf="$(add_suffix @GENTOO_PORTAGE_EPREFIX@/etc/conf.d/net)"
 	[[ -e ${conf} ]] && source "${conf}"
 fi
-conf="$(add_suffix "/etc/conf.d/${SVCNAME}")"
+conf="$(add_suffix "@GENTOO_PORTAGE_EPREFIX@/etc/conf.d/${SVCNAME}")"
 [[ -e ${conf} ]] && source "${conf}"
-conf="$(add_suffix /etc/rc.conf)"
+conf="$(add_suffix @GENTOO_PORTAGE_EPREFIX@/etc/rc.conf)"
 [[ -e ${conf} ]] && source "${conf}"
 
 mylevel="${SOFTLEVEL}"
@@ -146,7 +146,7 @@
 	local service="$1" start="$2"
 	[[ ! -d "${svcdir}/scheduled/${service}" ]] \
 		&& mkdir -p "${svcdir}/scheduled/${service}"
-	ln -snf "/etc/init.d/${service}" \
+	ln -snf "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${service}" \
 		"${svcdir}/scheduled/${service}/${start}"
 }
 
@@ -334,9 +334,9 @@
 	if [[ ${retval} == "0" && ${RC_NO_DEPS} != "yes" ]] ; then
 		local startupservices="$(ineed "${SVCNAME}") $(valid_iuse "${SVCNAME}")"
 		local netservices=
-		for x in $(dolisting "/etc/runlevels/${BOOTLEVEL}/net.*") \
-			$(dolisting "/etc/runlevels/${mylevel}/net.*") \
-			$(dolisting "/var/lib/init.d/coldplugged/net.*") ; do 
+		for x in $(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${BOOTLEVEL}/net.*") \
+			$(dolisting "@GENTOO_PORTAGE_EPREFIX@/etc/runlevels/${mylevel}/net.*") \
+			$(dolisting "@GENTOO_PORTAGE_EPREFIX@/var/lib/init.d/coldplugged/net.*") ; do 
 			netservices="${netservices} ${x##*/}"
 		done
 
@@ -631,9 +631,9 @@
 
 		# Simple way to try and detect if the service use svc_{start,stop}
 		# to restart if it have a custom restart() funtion.
-		if [[ -n $(egrep '^[[:space:]]*restart[[:space:]]*()' "/etc/init.d/${SVCNAME}") ]] ; then
-			if [[ -z $(egrep 'svc_stop' "/etc/init.d/${SVCNAME}") || \
-			      -z $(egrep 'svc_start' "/etc/init.d/${SVCNAME}") ]] ; then
+		if [[ -n $(egrep '^[[:space:]]*restart[[:space:]]*()' "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${SVCNAME}") ]] ; then
+			if [[ -z $(egrep 'svc_stop' "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${SVCNAME}") || \
+			      -z $(egrep 'svc_start' "@GENTOO_PORTAGE_EPREFIX@/etc/init.d/${SVCNAME}") ]] ; then
 				echo
 				ewarn "Please use 'svc_stop; svc_start' and not 'stop; start' to"
 				ewarn "restart the service in its custom 'restart()' function."