[Fedora-livecd-list] Branch 'f15-branch' - 2 commits - imgcreate/creator.py Makefile

[Brian C. Lane]

 Makefile             |    2 +-
 imgcreate/creator.py |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit c1863998f95f00006c0f68d8020441b01cdcf131
Author: Brian C. Lane <bcl at redhat.com>
Date:   Tue May 3 13:27:03 2011 -0700

    Version 15.7

diff --git a/Makefile b/Makefile
index 1751834..9832301 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-VERSION = 15.6
+VERSION = 15.7
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}


commit 9e56f012ea1049871ddce1134163863f68c7de74
Author: Brian C. Lane <bcl at redhat.com>
Date:   Mon Mar 21 16:11:05 2011 -0700

    symlink /etc/mtab to /proc/self/mounts (#688277)
    
    systemd expects the installed system to have this setup.

diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index ec4c1ba..675dcf6 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -536,7 +536,7 @@ class ImageCreator(object):
 
         self.__create_minimal_dev()
 
-        os.symlink("../proc/mounts", self._instroot + "/etc/mtab")
+        os.symlink("/proc/self/mounts", self._instroot + "/etc/mtab")
 
         self.__write_fstab()
 
@@ -548,11 +548,6 @@ class ImageCreator(object):
         from the install root.
 
         """
-        try:
-            os.unlink(self._instroot + "/etc/mtab")
-        except OSError:
-            pass
-
         self.__destroy_selinuxfs()
 
         self._undo_bindmounts()