From cb45a4b7df191215b1502575d5ba2762f9b71e3b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 13 Mar 2018 20:19:37 +1300 Subject: [PATCH] prevent creation of a swapfile when / is btrfs https://bugs.launchpad.net/subiquity/+bug/1750657 --- subiquity/models/filesystem.py | 4 ++++ subiquity/models/subiquity.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/subiquity/models/filesystem.py b/subiquity/models/filesystem.py index 86957496..b31655c3 100644 --- a/subiquity/models/filesystem.py +++ b/subiquity/models/filesystem.py @@ -401,6 +401,10 @@ class FilesystemModel(object): return True return False + def swapfile_ok(self): + for m in self._mounts: + if m.path == '/': + return m.device.fstype != 'btrfs' ## class AttrDict(dict): ## __getattr__ = dict.__getitem__ diff --git a/subiquity/models/subiquity.py b/subiquity/models/subiquity.py index 853a2276..ac57863c 100644 --- a/subiquity/models/subiquity.py +++ b/subiquity/models/subiquity.py @@ -134,6 +134,9 @@ class SubiquityModel: }, } + if not self.filesystem.swapfile_ok(): + config['swap'] = {'size': 0} + config.update(self.network.render()) config.update(self.installpath.render())