Detect debian-installer-based autoinstalls.

[invirt/packages/invirt-remote.git] / host / usr / sbin / invirt-janitor

diff --git a/host/usr/sbin/invirt-janitor b/host/usr/sbin/invirt-janitor
index e631972..5d8f4ed 100755 (executable)
--- a/host/usr/sbin/invirt-janitor
+++ b/host/usr/sbin/invirt-janitor
@@ -40,6 +40,14 @@ def cleanup():
         lv_path = '/dev/xenvg/%s' % lv
 
         try:
         lv_path = '/dev/xenvg/%s' % lv
 
         try:

+            # If the LV name doesn't start with old_, we probably
+            # don't actually want to be deleting it.
+            #
+            # Put it in the try block because we still want to delete
+            # the state file.
+            if not lv.startswith('old_'):
+                continue
+

             syslog.syslog(syslog.LOG_INFO, "Cleaning up LV '%s'" % lv_path)
 
             # In a perfect world, this should be erroring out with
             syslog.syslog(syslog.LOG_INFO, "Cleaning up LV '%s'" % lv_path)
 
             # In a perfect world, this should be erroring out with

@@ -47,6 +55,7 @@ def cleanup():
             subprocess.call(['/usr/bin/ionice',
                              '-c', '2',
                              '-n', '7',
             subprocess.call(['/usr/bin/ionice',
                              '-c', '2',
                              '-n', '7',

+                             '/usr/bin/nice',

                              '/bin/dd',
                              'if=/dev/zero',
                              'of=%s' % lv_path,
                              '/bin/dd',
                              'if=/dev/zero',
                              'of=%s' % lv_path,