<font><font style="background-color:rgb(0,0,0)" face="courier new, monospace"><div>commit 840ca52675c0626699e9f487f625fc9bd28e9580</div><div>Author: Frederick Grose &lt;<a href="mailto:fgrose@sugarlabs.org">fgrose@sugarlabs.org</a>&gt;</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(&quot;../proc/mounts&quot;, self._instroot + &quot;/etc/mtab&quot;)</div><div>+        mtab = os.path.join(self._instroot, &#39;etc&#39;, &#39;mtab&#39;)</div>

<div>+        os.remove(mtab)</div><div>+        os.symlink(&#39;/proc/self/mounts&#39;, 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 &lt;kickstart-file&gt;]</div><div>                       [-s &lt;script.sh&gt;]</div><div>                       [-t &lt;tmpdir&gt;]</div><div>+                      [-T, --leave-tmpfiles]</div>

<div>                       [-e &lt;excludes&gt;]</div><div>                       [-f &lt;exclude-file&gt;]</div><div>                       [-i &lt;includes&gt;]</div><div>@@ -576,6 +579,11 @@ def parse_options(args):</div>

<div>                       dest=&quot;tmpdir&quot;, default=&quot;/var/tmp&quot;,</div><div>                       help=&quot;Temporary directory to use (default: /var/tmp)&quot;)</div><div> </div><div>+    parser.add_option(&quot;-T&quot;, &quot;--leave-tmpfiles&quot;, action=&quot;store_false&quot;,</div>

<div>+                      dest=&quot;docleanup&quot;, default=True,</div><div>+                      help=&#39;Skip deletion of temporary files and directories &#39;</div><div>+                           &#39;and unmounting of the edited image.&#39;)</div>

<div>+</div><div>     parser.add_option(&quot;-e&quot;, &quot;--exclude&quot;, type=&quot;string&quot;, dest=&quot;exclude&quot;,</div><div>                       help=&quot;Specify directory or file patterns to be excluded &quot;</div>

<div>                            &quot;from the rsync copy of the filesystem.&quot;)</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>