diff --git a/README.md b/README.md index d1dd860..b0d8ccc 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,8 @@ ZFS installer is a shell script program that fully prepares ZFS on a system, and The program currently supports: -- Ubuntu Desktop/Server 18.04.x Live +- Ubuntu Desktop 18.04.x Live +- Ubuntu Server 18.04.4 Live - Linux Mint 19.x - Debian 10.x Live (desktop environment required) - ElementaryOS 5.1 diff --git a/install-zfs.sh b/install-zfs.sh index b672d1e..d8c0cb7 100755 --- a/install-zfs.sh +++ b/install-zfs.sh @@ -846,13 +846,17 @@ DIFF patch -p1 "$c_unpacked_subiquity_dir/lib/python3.6/site-packages/subiquity/ui/views/installprogress.py" << 'DIFF' diff lib/python3.6/site-packages/subiquity/ui/views/installprogress.py{.bak,} -122,125c122 -< if include_exit: -< btns = [self.view_log_btn, self.exit_btn, self.reboot_btn] -< else: -< btns = [self.view_log_btn, self.reboot_btn] +47a48,49 +> self.exit_btn = cancel_btn( +> _("Exit To Shell"), on_press=self.quit) +121c123 +< btns = [self.view_log_btn, self.reboot_btn] --- > btns = [self.view_log_btn, self.exit_btn, self.reboot_btn] +133a136,138 +> def quit(self, btn): +> self.controller.quit() +> DIFF snap stop subiquity