Skip to content

Commit 92cedeb

Browse files
committed
only disable SquashFS if it's not needed
Ubuntu Snaps need SquashFS so we cannot disable it easily. Instead we check for running Snap Service. Signed-off-by: Martin Schurz <Martin.Schurz@t-systems.com>
1 parent 81ce2ab commit 92cedeb

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

controls/os_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,10 @@
254254
its(:content) { should match 'install jffs2 /bin/true' }
255255
its(:content) { should match 'install hfs /bin/true' }
256256
its(:content) { should match 'install hfsplus /bin/true' }
257-
its(:content) { should match 'install squashfs /bin/true' }
257+
# Ubuntu Snaps need SquashFS to function
258+
unless service('snapd').running?
259+
its(:content) { should match 'install squashfs /bin/true' }
260+
end
258261
its(:content) { should match 'install udf /bin/true' }
259262
# if efi is active, do not disable vfat. otherwise the system
260263
# won't boot anymore

0 commit comments

Comments
 (0)