From a721eba5c1f7d71fd906b0bacc0c0eaa05b8f526 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 28 Jun 2016 11:30:40 -0400 Subject: [PATCH] Add an 'install' mode; firstboot will be the default to avoid trashing installs Signed-off-by: Mathieu Trudel-Lapierre --- Makefile | 2 +- bin/subiquity-tui | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b4aa0662..7d4c77c2 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ install_deps: install_deps_$(ARCH) sudo apt-get install python3-urwid python3-pyudev python3-netifaces python3-nose python3-flake8 python3-yaml python3-tornado git bzr ubuntu-cloudimage-keyring python3-coverage ovmf shim shim-signed grub-pc-bin dryrun: probert - $(MAKE) ui-view DRYRUN="--dry-run --uefi" + $(MAKE) ui-view DRYRUN="--dry-run --uefi --install" ui-view: (PYTHONPATH=$(PYTHONPATH) bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS)) diff --git a/bin/subiquity-tui b/bin/subiquity-tui index 1f0e4a79..b20b38db 100755 --- a/bin/subiquity-tui +++ b/bin/subiquity-tui @@ -33,6 +33,10 @@ def parse_options(argv): parser.add_argument('--dry-run', action='store_true', dest='dry_run', help='menu-only, do not call installer function') + # XXX Defaults to firstboot mode unless one runs subiquity --install. + parser.add_argument('--install', action='store_false', + dest='firstboot', default=True, + help='run installer in firstboot mode') parser.add_argument('--serial', action='store_true', dest='run_on_serial', help='Run the installer over serial console.')