[Fedora-livecd-list] [patch 09/20] Consolidate bindmounts creation
No reason why the /var/cache/yum bindmount shouldn't be
created in the same loop as the rest of the bindmounts
Signed-off-by: Mark McLoughlin <markmc(a)redhat.com>
Index: livecd/creator/livecd-creator
===================================================================
--- livecd.orig/creator/livecd-creator
+++ livecd/creator/livecd-creator
@@ -388,8 +388,10 @@ class InstallationTarget:
return False
# bind mount system directories into install_root/
- for f in ["/sys", "/proc", "/dev",
"/dev/pts", "/selinux"]:
- b = BindChrootMount(f, "%s/install_root" %(self.build_dir,))
+ for (f, dest) in [("/sys", None), ("/proc", None),
("/dev", None),
+ ("/dev/pts", None), ("/selinux", None),
+ (self.build_dir + "/yum-cache",
"/var/cache/yum")]:
+ b = BindChrootMount(f, self.build_dir + "/install_root", dest)
if b.mount():
self.bindmounts.append(b)
else:
@@ -414,16 +416,6 @@ class InstallationTarget:
fstab.write("sysfs /sys sysfs
defaults 0 0\n")
fstab.close()
- b = BindChrootMount("%s/yum-cache" %(self.build_dir,),
- "%s/install_root" %(self.build_dir,),
- "/var/cache/yum")
- if b.mount():
- self.bindmounts.append(b)
- else:
- print "Cannot bind mount /var/cache/yum"
- self.teardown()
- return False
-
self.ayum.setup("%s/install_root" %(self.build_dir,))
return True
--