Makefile | 4 ++--
imgcreate/creator.py | 7 +------
2 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 0c848789c596f940cad4a77f37fbc0c63efc5b97
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Mar 21 16:38:14 2011 -0700
Fix image-creator symlink so that it is relative
diff --git a/Makefile b/Makefile
index 04a6c65..98d73f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 16.2
+VERSION = 16.3
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
@@ -22,7 +22,7 @@ man:
install: man
$(INSTALL_PROGRAM) -D tools/livecd-creator $(DESTDIR)/usr/bin/livecd-creator
- ln -s $(DESTDIR)/usr/bin/livecd-creator $(DESTDIR)/usr/bin/image-creator
+ ln -s ./livecd-creator $(DESTDIR)/usr/bin/image-creator
$(INSTALL_PROGRAM) -D tools/liveimage-mount $(DESTDIR)/usr/bin/liveimage-mount
$(INSTALL_PROGRAM) -D tools/livecd-iso-to-disk.sh $(DESTDIR)/usr/bin/livecd-iso-to-disk
$(INSTALL_PROGRAM) -D tools/livecd-iso-to-pxeboot.sh
$(DESTDIR)/usr/bin/livecd-iso-to-pxeboot
commit 9e431a9c86398705ec7b30328dc0981539e15a40
Author: Brian C. Lane <bcl(a)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()
Show replies by thread