From d04b6a9a3e0940ea01ac12a5e6ff2da84c2d95a9 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Wed, 12 May 2021 16:23:58 -0600 Subject: [PATCH] dryrun: use the simple machine config (#952) `make dryrun` will now use the simple sample machine config instead of probing local hardware. That local probe only seems to be viable anyhow if we're running as root, and that's vulnerable to real problems if dryrun is less than 100% insulated from making real machine changes. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 16cd0917..5980c3e7 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ PYTHONSRC=$(NAME) PYTHONPATH=$(shell pwd):$(shell pwd)/probert PROBERTDIR=./probert PROBERT_REPO=https://github.com/canonical/probert +DRYRUN_ARGS:=--dry-run --bootloader uefi --machine-config examples/simple.json +CONSOLE_CONF_DRYRUN_ARGS:=--dry-run export PYTHONPATH CWD := $(shell pwd) @@ -32,10 +34,10 @@ i18n: cd po; intltool-update -r -g subiquity dryrun: probert i18n - $(MAKE) ui-view DRYRUN="--dry-run --bootloader uefi" + $(MAKE) ui-view DRYRUN="$(DRYRUN_ARGS)" dryrun-console-conf: - $(MAKE) ui-view-console-conf DRYRUN="--dry-run" + $(MAKE) ui-view-console-conf DRYRUN="$(CONSOLE_CONF_DRYRUN_ARGS)" ui-view-console-conf: $(PYTHON) -m console_conf.cmd.tui $(DRYRUN) $(MACHARGS)