summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTails developers <tails@boum.org>2013-11-18 15:42:27 +0000
committerTails developers <tails@boum.org>2013-11-18 15:42:27 +0000
commit95b9557b42b2cadaadd330ed2defac5558d79f1f (patch)
treee660d01bf8204f51383bb78c7b14dc913c2d8a03
parent963069d3f81f60e276c126cf6bde41a35d63db62 (diff)
Add "tmp" to the liveos_toplevel_files list.bugfix/dont-fail-upgrade-if-tmp-dir-exists-on-destination
Then, get_liveos_toplevel_files will return it, and delete_liveos will delete it at "clone and upgrade" time, before the source files are copied to the destination filesystem. This is especially important once incremental updates are deployed, since "tmp" will be used by tails-iuk, and possibly not removed every time. Without this change, one gets the following stack trace (and a partially upgraded device) when a "tmp" directory exists both on the source and destination Tails system partitions: File "/usr/lib/python2.6/dist-packages/liveusb/gui.py", line 253, in run self.live.extract_iso() File "/usr/lib/python2.6/dist-packages/liveusb/creator.py", line 147, in extract_iso self.source.clone(self.dest) File "/usr/lib/python2.6/dist-packages/liveusb/source.py", line 97, in clone shutil.copytree(src, dst) File "/usr/lib/python2.6/shutil.py", line 142, in copytree os.makedirs(dst) File "/usr/lib/python2.6/os.py", line 157, in makedirs mkdir(name, mode)
-rw-r--r--liveusb/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/liveusb/config.py b/liveusb/config.py
index 2f35102..3500701 100644
--- a/liveusb/config.py
+++ b/liveusb/config.py
@@ -12,7 +12,7 @@ default_config = {
'main_liveos_dir': 'live',
'running_liveos_mountpoint': '/lib/live/mount/medium',
'liveos_toplevel_files': [ 'autorun.bat', 'autorun.inf', 'boot', '.disk',
- 'doc', 'live', 'isolinux', 'syslinux' ],
+ 'doc', 'live', 'isolinux', 'syslinux', 'tmp' ],
'download': { 'enabled': False,
},
'persistence': { 'enabled': False,