- up to pre2921

Changed files:
    util-vserver-pivot-root-ugly-hack.patch -> 1.3
    util-vserver-vsysvwrapper.patch -> 1.6
    util-vserver.spec -> 1.267

diff --git a/util-vserver-pivot-root-ugly-hack.patch b/util-vserver-pivot-root-ugly-hack.patch
index 0ee936f4ed02720686875ec8a1f03d239bc449bb..f623104f8becb7eb0a4f18055d54e3f229208074 100644 (file)
--- a/util-vserver-pivot-root-ugly-hack.patch
+++ b/util-vserver-pivot-root-ugly-hack.patch
@@ -41,18 +41,19 @@ diff -ur util-vserver-0.30.216-pre2833/lib/issupported.c util-vserver-0.30.216-p
    switch (feature) {
      case vcFEATURE_COMPAT     :  return true;
      case vcFEATURE_VSHELPER0  :  return ver >= 0x00010000 && ver < 0x00010010;
-@@ -49,7 +71,13 @@
-     case vcFEATURE_VSTAT      :  return ver >= 0x00020103;
+@@ -71,7 +71,13 @@
+     case vcFEATURE_VSTAT      :  return ver >= 0x00020103 && ver < 0x00020306;
      case vcFEATURE_PPTAG      :  return conf & VC_VCI_PPTAG;
      case vcFEATURE_SPACES     :  return conf & VC_VCI_SPACES;
 -    case vcFEATURE_PIVOT_ROOT :  return ver >= 0x00020304;
-+   // Now THIS is really ugly hack, only vs2.3 patches for kernels below
-+   // have pivot_root working for vservers, so we assume people use recent
-+   // patches with recent kernels
++    // Now THIS is really ugly hack, only vs2.3 patches for kernels below
++    // have pivot_root working for vservers, so we assume people use recent
++    // patches with recent kernels
 +    case vcFEATURE_PIVOT_ROOT :  return (ver >= 0x00020304) &&
-+                                ((kver >= 0x02062723 && kver < 0x02062800) ||
-+                                 (kver >= 0x02062811 && kver < 0x02062900) ||
-+                                 (kver >= 0x02062901));
-     case vcFEATURE_PIDSPACE   :  return ver >= 0x00020305;
-     default                   :  assert(false); 
-   }
++                                 ((kver >= 0x02062723 && kver < 0x02062800) ||
++                                  (kver >= 0x02062811 && kver < 0x02062900) ||
++                                  (kver >= 0x02062901));
+     case vcFEATURE_PIDSPACE   :  return false;
+     case vcFEATURE_MEMCG      :  return ver >= 0x00020306 && conf & VC_VCI_MEMCG;
+     case vcFEATURE_DYNAMIC    :  return ver <  0x00020300 || !(conf & VC_VCI_NO_DYNAMIC);
+

diff --git a/util-vserver-vsysvwrapper.patch b/util-vserver-vsysvwrapper.patch
index 045cf2c5f8967fcd6b17b898c2a0426d9da98364..b75af205e9e47d68caf3a26498c4906be631e84c 100644 (file)
--- a/util-vserver-vsysvwrapper.patch
+++ b/util-vserver-vsysvwrapper.patch
@@ -18,11 +18,13 @@
  . "$UTIL_VSERVER_VARS"
  
  if [ $# = 0 ] ; then
-@@ -40,6 +41,5 @@
+@@ -46,6 +46,6 @@
        do
                IPOPT="$IPOPT --ip $oneip"
        done
--      echo exec $_CHBIND $IPOPT /etc/init.d/$SERVICE "$@"
--      exec $_CHBIND $IPOPT /etc/init.d/$SERVICE "$@"
-+      exec $_CHBIND $IPOPT /etc/rc.d/init.d/$SERVICE "$@"
+-      echo exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/init.d/$SERVICE "$@"
+-      exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/init.d/$SERVICE "$@"
++      echo exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/rc.d/init.d/$SERVICE "$@"
++      exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/rc.d/init.d/$SERVICE "$@"
  fi
+

diff --git a/util-vserver.spec b/util-vserver.spec
index f192d1e6aae81ebb21cfb378a73f37e3dab19409..35193abfc48745bcf3227b0c861fda493e0e2faa 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -18,7 +18,7 @@
 %undefine      with_doc
 %endif
 
-%define                snap    pre2904
+%define                snap    pre2921
 %define                rel     1
 Summary:       Linux virtual server utilities
 Summary(pl.UTF-8):     Narzędzia dla linuksowych serwerów wirtualnych
@@ -28,7 +28,7 @@ Release:      1.%{snap}.%{rel}
 License:       GPL
 Group:         Applications/System
 Source0:       http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5: 45ad60fb043d1f9fefaddfafb3b3b867
+# Source0-md5: 21b9cbdcd4943b469d8e720826337edd
 Source1:       vprocunhide.init
 Source2:       vservers.init
 Source3:       vservers-legacy.init
@@ -875,6 +875,8 @@ exit 0
 %{_libdir}/%{name}/distributions/f9
 %{_libdir}/%{name}/distributions/f10
 %{_libdir}/%{name}/distributions/f11
+%{_libdir}/%{name}/distributions/f12
+%{_libdir}/%{name}/distributions/f13
 %{_libdir}/%{name}/distributions/fc1
 %{_libdir}/%{name}/distributions/fc2
 %{_libdir}/%{name}/distributions/fc3