3 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 03f54c283..6c9985e86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-08  Chris Lumens  <clumens@redhat.com>
+
+	* anaconda:  Don't need to remove things in /tmp.
+
+	* kickstart.py (Kickstart.postAction):  Remove LIBUSER_CONF from the
+	environment before running %post scripts (#218213).
+
 2006-12-07  Jeremy Katz  <katzj@redhat.com>
 
 	* textw/partition_text.py (PartitionTypeWindow.addDriveDialog):
diff --git a/anaconda b/anaconda
index 725e08c83..6f4925b02 100755
--- a/anaconda
+++ b/anaconda
@@ -1005,12 +1005,6 @@ if __name__ == "__main__":
     except:
         handleException(anaconda, sys.exc_info())
 
-    # remove our libuser.conf
-    try:
-        os.unlink(os.environ["LIBUSER_CONF"])
-    except:
-        pass
-    
     if anaconda.isKickstart and instClass.ksdata.reboot["eject"]:
         isys.flushDriveDict()
         for drive in isys.cdromList():
diff --git a/kickstart.py b/kickstart.py
index 0c02e3f4c..1e590438e 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -755,6 +755,11 @@ class Kickstart(cobject):
         if len(postScripts) == 0:
             return
 
+        # Remove environment variables that cause problems for %post scripts.
+        for var in ["LIBUSER_CONF"]:
+            if os.environ.has_key(var):
+                del(os.environ[var])
+
 	log.info("Running kickstart %%post script(s)")
         if anaconda.intf is not None:
             w = anaconda.intf.waitWindow(_("Running..."),