Add an 'install' mode; firstboot will be the default to avoid trashing installs

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
This commit is contained in:
Mathieu Trudel-Lapierre 2016-06-28 11:30:40 -04:00
parent 1dddd0399e
commit a721eba5c1
2 changed files with 5 additions and 1 deletions

View File

@ -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 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 dryrun: probert
$(MAKE) ui-view DRYRUN="--dry-run --uefi" $(MAKE) ui-view DRYRUN="--dry-run --uefi --install"
ui-view: ui-view:
(PYTHONPATH=$(PYTHONPATH) bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS)) (PYTHONPATH=$(PYTHONPATH) bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS))

View File

@ -33,6 +33,10 @@ def parse_options(argv):
parser.add_argument('--dry-run', action='store_true', parser.add_argument('--dry-run', action='store_true',
dest='dry_run', dest='dry_run',
help='menu-only, do not call installer function') 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', parser.add_argument('--serial', action='store_true',
dest='run_on_serial', dest='run_on_serial',
help='Run the installer over serial console.') help='Run the installer over serial console.')