summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-05-16 09:50:24 +0000
committerDaniel Silverstone <daniel.silverstone@codethink.co.uk>2014-05-16 09:50:24 +0000
commit20d6402959869913cb3cd9b78348325e7098bf53 (patch)
treeb03cff0b4c420a33a5724171bf84c2d0424e2212
parentf7b4039973398400e355c5ea2a068dac4bbc994b (diff)
downloaddefinitions-20d6402959869913cb3cd9b78348325e7098bf53.tar.gz
Fix state subvolume generator to preserve permissions
shutil.move() does not preserve permissions, file modes, ownerships etc, resulting in much confusion when prepopulating a non-root user during deployment. This change to `mv` fixes that.
-rw-r--r--writeexts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/writeexts.py b/writeexts.py
index 3f9c33d5..b4912db1 100644
--- a/writeexts.py
+++ b/writeexts.py
@@ -281,7 +281,7 @@ class WriteExtension(cliapp.Application):
self.status(msg='Moving existing data to %s subvolume' % subvolume)
for filename in files:
filepath = os.path.join(existing_state_dir, filename)
- shutil.move(filepath, subvolume)
+ cliapp.runcmd(['mv', filepath, subvolume])
def complete_fstab_for_btrfs_layout(self, system_dir):
'''Fill in /etc/fstab entries for the default Btrfs disk layout.