summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2007-11-18 10:23:55 +0000
committerBenedikt Boehm <hollow@gentoo.org>2007-11-18 10:23:55 +0000
commitd5a16188b8cbb2bdfd023fbf483c38139bf7eded (patch)
treebe86dfec6ea6d5ec26fa5c08326797aef79cab6f /sys-cluster/util-vserver
parentstable x86, bug 199261 (diff)
downloadgentoo-2-d5a16188b8cbb2bdfd023fbf483c38139bf7eded.tar.gz
gentoo-2-d5a16188b8cbb2bdfd023fbf483c38139bf7eded.tar.bz2
gentoo-2-d5a16188b8cbb2bdfd023fbf483c38139bf7eded.zip
fix broken patch (LF instead of CRLF, blame trac)
(Portage version: 2.1.3.19)
Diffstat (limited to 'sys-cluster/util-vserver')
-rw-r--r--sys-cluster/util-vserver/ChangeLog6
-rw-r--r--sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch30
2 files changed, 21 insertions, 15 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index df38bb197f23..fa04f7913f23 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/util-vserver
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.85 2007/11/17 21:50:34 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.86 2007/11/18 10:23:54 hollow Exp $
+
+ 18 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
+ files/util-vserver-0.30.214-baselayout2_path.patch:
+ fix broken patch (LF instead of CRLF, blame trac)
17 Nov 2007; Benedikt Böhm <hollow@gentoo.org>
+files/util-vserver-0.30.214-baselayout2_path.patch,
diff --git a/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch b/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch
index 2898d6bc85f1..0aa8a5b5f0c0 100644
--- a/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch
+++ b/sys-cluster/util-vserver/files/util-vserver-0.30.214-baselayout2_path.patch
@@ -1,14 +1,16 @@
-Index: /trunk/scripts/vserver.functions
-===================================================================
---- /trunk/scripts/vserver.functions (revision 2626)
-+++ /trunk/scripts/vserver.functions (revision 2634)
-@@ -316,7 +316,8 @@
- (xgentoo)
- test -n "$RUNLEVEL_START" || RUNLEVEL_START="default"
-+ RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
- INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" )
-- INITCMD_STOP=( env -i TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
-+ INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
- INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
- ;;
+Index: scripts/vserver.functions
+===================================================================
+--- scripts/vserver.functions (revision 2626)
++++ scripts/vserver.functions (revision 2634)
+@@ -315,9 +315,10 @@
+
+ (xgentoo)
+ test -n "$RUNLEVEL_START" || RUNLEVEL_START="default"
++ RC_PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+ INITCMD_START=( env TERM=$TERM /lib/rcscripts/sh/init-vserver.sh "$RUNLEVEL_START" )
+- INITCMD_STOP=( env -i TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
++ INITCMD_STOP=( env -i PATH=$RC_PATH TERM=$TERM RUNLEVEL=0 /sbin/rc shutdown )
+ INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
+ ;;
+