<font><font style="background-color:rgb(0,0,0)" face="courier new, monospace"><div>commit 840ca52675c0626699e9f487f625fc9bd28e9580</div><div>Author: Frederick Grose <<a href="mailto:fgrose@sugarlabs.org">fgrose@sugarlabs.org</a>></div>
<div>Date: Mon Oct 22 17:22:30 2012 -0400</div><div><br></div><div> Catch up with creator.py changes.</div><div> </div><div> Remove and symlink /etc/mtab.</div><div> Support new docleanup attribute.</div><div>
<br></div><div>diff --git a/tools/edit-livecd b/tools/edit-livecd</div><div>index 1670228..a033f59 100755</div><div>--- a/tools/edit-livecd</div><div>+++ b/tools/edit-livecd</div><div>@@ -248,7 +248,9 @@ class LiveImageEditor(LiveImageCreator):</div>
<div> </div><div> self._do_bindmounts()</div><div> </div><div>- os.symlink("../proc/mounts", self._instroot + "/etc/mtab")</div><div>+ mtab = os.path.join(self._instroot, 'etc', 'mtab')</div>
<div>+ os.remove(mtab)</div><div>+ os.symlink('/proc/self/mounts', mtab)</div><div> </div><div> self.__copy_img_root(base_on)</div><div> self._brand(self._builder)</div><div>@@ -547,6 +549,7 @@ def parse_options(args):</div>
<div> [-k <kickstart-file>]</div><div> [-s <script.sh>]</div><div> [-t <tmpdir>]</div><div>+ [-T, --leave-tmpfiles]</div>
<div> [-e <excludes>]</div><div> [-f <exclude-file>]</div><div> [-i <includes>]</div><div>@@ -576,6 +579,11 @@ def parse_options(args):</div>
<div> dest="tmpdir", default="/var/tmp",</div><div> help="Temporary directory to use (default: /var/tmp)")</div><div> </div><div>+ parser.add_option("-T", "--leave-tmpfiles", action="store_false",</div>
<div>+ dest="docleanup", default=True,</div><div>+ help='Skip deletion of temporary files and directories '</div><div>+ 'and unmounting of the edited image.')</div>
<div>+</div><div> parser.add_option("-e", "--exclude", type="string", dest="exclude",</div><div> help="Specify directory or file patterns to be excluded "</div>
<div> "from the rsync copy of the filesystem.")</div><div>@@ -679,6 +687,7 @@ def main():</div><div> editor._include = options.include</div><div> editor.clone = options.clone</div>
<div> editor.tmpdir = options.tmpdir</div><div>+ editor.docleanup = options.docleanup</div><div> editor._builder = options.builder</div><div> editor._releasefile = options.releasefile</div><div> editor.compress_type = options.compress_type</div>
</font></font>