From 25c78ba9fd13c78d6927fbc3dc1dae5533754e63 Mon Sep 17 00:00:00 2001 From: Ryan Harper Date: Mon, 2 Nov 2015 15:16:15 -0600 Subject: [PATCH] Only display raid menu if we have enough disks If we don't have at least 2 available disks, we cannot create a raid, lvm or bcache. Signed-off-by: Ryan Harper --- subiquity/ui/views/filesystem.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/subiquity/ui/views/filesystem.py b/subiquity/ui/views/filesystem.py index 27930261..342e897b 100644 --- a/subiquity/ui/views/filesystem.py +++ b/subiquity/ui/views/filesystem.py @@ -546,6 +546,8 @@ class FilesystemView(ViewPolicy): buttons.append(Color.button(reset_btn(on_press=self.reset), focus_map='button focus')) + buttons.append(Color.button(cancel_btn(on_press=self.cancel), + focus_map='button focus')) return Pile(buttons) @@ -593,12 +595,13 @@ class FilesystemView(ViewPolicy): def _build_menu(self): log.debug('FileSystemView: building menu') opts = [] + avail_disks = self.model.get_available_disk_names() for opt, sig, _ in self.model.get_menu(): - opts.append( - Color.menu_button( - menu_btn(label=opt, - on_press=self.on_fs_menu_press), - focus_map='menu_button focus')) + if len(avail_disks) > 1: + opts.append(Color.menu_button( + menu_btn(label=opt, + on_press=self.on_fs_menu_press), + focus_map='menu_button focus')) return Pile(opts) def on_fs_menu_press(self, result):