SOURCES: util-vserver-pld.patch, util-vserver-utmpx.patch - up to ...

[zbyniu]

Author: zbyniu                       Date: Sun Sep  2 21:35:57 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.30.214

---- Files affected:
SOURCES:
   util-vserver-pld.patch (1.18 -> 1.19) , util-vserver-utmpx.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/util-vserver-pld.patch
diff -u SOURCES/util-vserver-pld.patch:1.18 SOURCES/util-vserver-pld.patch:1.19
--- SOURCES/util-vserver-pld.patch:1.18	Mon Jul  2 20:50:56 2007
+++ SOURCES/util-vserver-pld.patch	Sun Sep  2 23:35:51 2007
@@ -1,20 +1,21 @@
 --- util-vserver-0.30.212.org/distrib/Makefile.am	2006-12-09 17:15:33.000000000 +0100
 +++ util-vserver-0.30.212/distrib/Makefile.am	2007-02-04 19:00:38.703238500 +0100
-@@ -65,7 +65,9 @@
- 			   suse91/rpm/macros \
- 			   gentoo/init-vserver.sh gentoo/net.vserver \
- 			   gentoo/reboot.sh gentoo/shutdown.sh \
--			   etch/vserver-config.sh
-+			   etch/vserver-config.sh pld-ac/pkgs/01 pld-ac/rpm/macros \
+@@ -73,7 +73,10 @@
+ 			   breezy/debootstrap.script dapper/debootstrap.script \
+ 			   edgy/debootstrap.script   feisty/debootstrap.script \
+ 			   gutsy/debootstrap.script  hoary/debootstrap.script \
+-			   warty/debootstrap.script
++			   warty/debootstrap.script \
++			   pld-ac/pkgs/01 pld-ac/rpm/macros \
 +			   pld-ac/rpmlist.d/00.lst \
 +			   pld-th/pkgs/01 pld-th/rpm/macros pld-th/rpmlist.d/00.lst
  
  nobase_confdistrib_DATA	=  rh9/apt/sources.list \
  			   fc1/apt/sources.list \
 @@ -67,7 +69,18 @@
- 			   fc4/apt/sources.list \
  			   fc5/apt/sources.list \
  			   fc6/apt/sources.list \
+ 			   f7/apt/sources.list \
 -			   suse91/apt/sources.list
 +			   suse91/apt/sources.list \
 +			   pld-ac/poldek/aliases.conf \

================================================================
Index: SOURCES/util-vserver-utmpx.patch
diff -u SOURCES/util-vserver-utmpx.patch:1.1 SOURCES/util-vserver-utmpx.patch:1.2
--- SOURCES/util-vserver-utmpx.patch:1.1	Mon Oct 24 02:15:06 2005
+++ SOURCES/util-vserver-utmpx.patch	Sun Sep  2 23:35:52 2007
@@ -1,11 +1,29 @@
---- util-vserver-0.30.208/scripts/vserver.functions~	2005-10-11 19:51:05.061289264 +0200
-+++ util-vserver-0.30.208/scripts/vserver.functions	2005-10-20 23:13:31.825830032 +0200
-@@ -266,7 +266,7 @@
+--- util-vserver-0.30.214/scripts/vserver.functions~	2007-09-02 23:06:48.000000000 +0200
++++ util-vserver-0.30.214/scripts/vserver.functions	2007-09-02 23:14:40.713357250 +0200
+@@ -284,7 +284,7 @@
  		INITCMD_START=( "$i" "$RUNLEVEL_START" )
  		INITCMD_STOP=(  "$i" "$RUNLEVEL_STOP"  )
  	    done
 -	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmp )
 +	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL "$RUNLEVEL_START" /var/run/utmpx )
+ 	    OPTS_ENV=( "${OPTS_ENV[@]}" PREVLEVEL=N RUNLEVEL="$RUNLEVEL_START" )
+ 	    if test -n "$OPTION_DEBUG_SYSV"; then
+ 		INITCMD_START=( /bin/bash -x "${INITCMD_START[@]}" )
+@@ -309,7 +309,7 @@
+ 	    _NEED_VSHELPER_SYNC=1
+ 	    test -z "$RUNLEVEL_START"         || INITCMD_START=( "${INITCMD_START[@]}" "$RUNLEVEL_START" )
+ 	    test -z "$RUNLEVEL_STOP"          || INITCMD_STOP=(  "${INITCMD_STOP[@]}"  "$RUNLEVEL_STOP"  )
+-	    ! isNumber "${RUNLEVEL_START:-3}" || INITCMD_PREPARE=( $_FAKE_RUNLEVEL "${RUNLEVEL_START:-3}" /var/run/utmp )
++	    ! isNumber "${RUNLEVEL_START:-3}" || INITCMD_PREPARE=( $_FAKE_RUNLEVEL "${RUNLEVEL_START:-3}" /var/run/utmpx )
  	    ;;
- 	    
- 	(xplain)
+ 
+ 	(xgentoo)
+@@ -317,7 +317,7 @@
+ 
+ 	    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_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmp )
++	    INITCMD_PREPARE=( $_FAKE_RUNLEVEL 3 /var/run/utmpx )
+ 	    ;;
+ 
+ 	(x) ;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/util-vserver-pld.patch?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/util-vserver-utmpx.patch?r1=1.1&r2=1.2&f=u