infinity is greater than anything.

diff --git a/python/vserver.py b/python/vserver.py
index 6e5c709..c5464c5 100644 (file)
--- a/python/vserver.py
+++ b/python/vserver.py
@@ -136,15 +136,15 @@ def adjust_lim(goal, curr):
     soft = curr[0]
     hard = curr[1]
     if gm != VC_LIM_KEEP:
-        if gm > soft:
+        if gm > soft or gm == resource.RLIM_INFINITY:
             soft = gm
-        if gm > hard:
+        if gm > hard or gs == resource.RLIM_INFINITY:
             hard = gm
     if gs != VC_LIM_KEEP:
-        if gs > soft:
+        if gs > soft or gs == resource.RLIM_INFINITY:
             soft = gs
     if gh != VC_LIM_KEEP:
-        if gh > hard:
+        if gh > hard or gh == resource.RLIM_INFINITY:
             hard = gh
     return (soft, hard)