diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-06-20 15:12:20 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-06-20 15:12:20 +0000 |
commit | 89e85029898ae80749dd4c52780e75a270087788 (patch) | |
tree | d9c0a323cefadcf8a3d0d60c74148f3cf61026d6 /morphlib/builder2.py | |
parent | cff6eb03a0aeb449c349f44d8b0de34219aabd7b (diff) | |
download | morph-89e85029898ae80749dd4c52780e75a270087788.tar.gz |
Fix permissions of /etc/os-release
Also clarify how the directory containing it gets created
to avoid a bit of code duplication.
Diffstat (limited to 'morphlib/builder2.py')
-rw-r--r-- | morphlib/builder2.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 452bbe36..69ca9e1c 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -631,13 +631,15 @@ class SystemBuilder(BuilderBase): # pragma: no cover BuilderBase.write_metadata(self, instdir, artifact_name) os_release_file = os.path.join(instdir, 'etc', 'os-release') - if not os.path.exists(os.path.dirname(os_release_file)): - os.makedirs(os.path.dirname(os_release_file)) + dirname = os.path.dirname(os_release_file) + if not os.path.exists(dirname): + os.makedirs(dirname) with morphlib.savefile.SaveFile(os_release_file, 'w') as f: f.write('Baserock %s, built from ref %s on %s\n' % (self.artifact.source.morphology['name'], self.artifact.source.original_ref, datetime.date.today())) + os.chmod(os_release_file, 0644) def create_fstab(self, path): '''Create an /etc/fstab inside a system tree. |