- merge fixes from head

- shutdown instead of remounting /vservers after fixing

diff --git a/pl_mom.spec b/pl_mom.spec
index 917b2d2..94d41b4 100644 (file)
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
 %define version 0.3
-%define release 12.planetlab%{?date:.%{date}}
+%define release 13%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab mom -- Cleans up your mess
 Name: %{name}

diff --git a/pl_mop.sh b/pl_mop.sh
index a6b5752..028bcd0 100755 (executable)
--- a/pl_mop.sh
+++ b/pl_mop.sh
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: pl_mop.sh,v 1.3 2005/12/01 23:38:58 mlhuang Exp $
+# $Id: pl_mop.sh,v 1.4 2006/01/26 19:26:20 mlhuang Exp $
 #
 
 PATH=/sbin:/usr/sbin:$PATH
@@ -128,8 +128,11 @@ fix_vservers() {
         # blow away the vserver cache
        rm -rf /vservers/.vcache/*
 
-        # re-mount /vservers
-       mount /vservers
+        # XXX re-mount /vservers
+       # mount /vservers
+
+       # shutdown instead to avoid clearing disk quotas
+       shutdown -r now "/vservers filesystem repaired, rebooting"
     else
        echo "Unable to unmount /vservers!" >&2
     fi