7143024 Problem with install/gui
authorMatt Keenan <matt.keenan@oracle.com>
Fri, 17 Feb 2012 18:45:59 +0000
changeset 1589 c955e387c229
parent 1588 2827007a1c52
child 1590 24c8762affa9
7143024 Problem with install/gui
usr/src/lib/install_ict/cleanup_cpio_install.py
usr/src/lib/install_ict/test/test_cleanup_cpio_install.py
--- a/usr/src/lib/install_ict/cleanup_cpio_install.py	Thu Feb 16 14:55:14 2012 -0700
+++ b/usr/src/lib/install_ict/cleanup_cpio_install.py	Fri Feb 17 18:45:59 2012 +0000
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 import os
@@ -67,7 +67,8 @@
 
         self.cleanup_list = ['.livecd', '.volsetid', '.textinstall',
                              'etc/sysconfig/language', '.liveusb',
-                             'a', 'bootcd_microroot']
+                             'a', 'bootcd_microroot', 'var/user/jack',
+                             'var/cache/gdm/jack/dmrc', 'var/cache/gdm/jack/']
 
     def execute(self, dry_run=False):
         '''
--- a/usr/src/lib/install_ict/test/test_cleanup_cpio_install.py	Thu Feb 16 14:55:14 2012 -0700
+++ b/usr/src/lib/install_ict/test/test_cleanup_cpio_install.py	Fri Feb 17 18:45:59 2012 +0000
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 '''
    test_cleanup_live_cd
@@ -100,7 +100,8 @@
             '/save/usr/share/dbus-1/services/gnome-power-manager.service',
             '/save/usr/share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop',
             '.livecd', '.volsetid', '.textinstall', 'etc/sysconfig/language',
-            '.liveusb', 'a', 'bootcd_microroot', '/save/bogus']
+            '.liveusb', 'a', 'bootcd_microroot', 'var/user/jack',
+            'var/cache/gdm/jack/dmrc', 'var/cache/gdm/jack/', '/save/bogus']
 
         self.test_target = create_filesystem(*self.filesys_files)
 
@@ -134,8 +135,9 @@
 
         cleanup_list = ['.livecd', '.volsetid', '.textinstall',
                         'etc/sysconfig/language', '.liveusb', 'a',
-                        'bootcd_microroot', 'file1', 'file2',
-                        'file3']
+                        'bootcd_microroot', 'var/user/jack',
+                        'var/cache/gdm/jack/dmrc', 'var/cache/gdm/jack/',
+                        'file1', 'file2', 'file3']
 
         # Instantiate the checkpoint
         self.clean_lcd = CleanupCPIOInstall("cleanup_cpio_install")