diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-02-14 11:52:12 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-04 13:17:06 +0000 |
commit | 70faeb029b105fb2a15aac51b7d0cdcd9c5fc659 (patch) | |
tree | ee7a330f5e4b04929a8cbb4fcc69f262fa6e69a3 /morphlib/builder2.py | |
parent | 04cda36673767c37f2fc9bbe310c0f4cb6cf2b37 (diff) | |
download | morph-70faeb029b105fb2a15aac51b7d0cdcd9c5fc659.tar.gz |
Don't create a blank /etc/fstab
This messes up the baserock-system-config-sync tool. Systemd does not
require /etc/fstab to exist in any case.
I have bumped the 'system-compatibility-version' field in this commit
to trigger rebuilding all system artifacts.
Diffstat (limited to 'morphlib/builder2.py')
-rw-r--r-- | morphlib/builder2.py | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py index 2dca738c..2c99c6f6 100644 --- a/morphlib/builder2.py +++ b/morphlib/builder2.py @@ -549,7 +549,6 @@ class SystemBuilder(BuilderBase): # pragma: no cover fs_root = self.staging_area.destdir(self.artifact.source) self.unpack_strata(fs_root) self.write_metadata(fs_root, rootfs_name) - self.create_fstab(fs_root) self.copy_kernel_into_artifact_cache(fs_root) unslashy_root = fs_root[1:] def uproot_info(info): @@ -649,30 +648,6 @@ class SystemBuilder(BuilderBase): # pragma: no cover os.chmod(os_release_file, 0644) - def create_fstab(self, path): - '''Create an /etc/fstab inside a system tree. - - The fstab is created using assumptions of the disk layout. - If the assumptions are wrong, extend this code so it can deal - with other cases. - - ''' - - self.app.status(msg='Creating fstab in %(path)s', - path=path, chatty=True) - with self.build_watch('create-fstab'): - fstab = os.path.join(path, 'etc', 'fstab') - if not os.path.exists(fstab): - # FIXME: should exist - if not os.path.exists(os.path.dirname(fstab)): - os.makedirs(os.path.dirname(fstab)) - # We create an empty fstab: systemd does not require - # /sys and /proc entries, and we can't know what the - # right entry for / is. The fstab gets built during - # deployment instead, when that information is available. - with open(fstab, 'w'): - pass - def copy_kernel_into_artifact_cache(self, path): '''Copy the installed kernel image into the local artifact cache. |