QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Filter environment exposed to template build scripts

Browse Source 
Do not expose host envionment there. This, among other things, fixes some
packages that create/modify /home/user ($HOME) in post-installation
script...
This commit is contained in:
Marek Marczykowski-Górecki 2017-06-14 10:51:03 +02:00
parent bb836e5d46
commit a97fe13c1b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -3,6 +3,7 @@ $(error "You must set DIST variable, e.g. DIST=fc14")
endif endif
export DIST export DIST
TEMPLATE_ENV_WHITELIST ?=
TEMPLATE_BUILDER = 1 TEMPLATE_BUILDER = 1
-include $(addsuffix /Makefile.builder,$(BUILDER_PLUGINS_DIRS)) -include $(addsuffix /Makefile.builder,$(BUILDER_PLUGINS_DIRS))
@ -11,6 +12,13 @@ ifdef TEMPLATE_FLAVOR
TEMPLATE_NAME := $(TEMPLATE_NAME)-$(TEMPLATE_FLAVOR) TEMPLATE_NAME := $(TEMPLATE_NAME)-$(TEMPLATE_FLAVOR)
endif endif
# expose those variables to template-building scripts
TEMPLATE_ENV_WHITELIST += \
DIST DISTRIBUTION TEMPLATE_SCRIPTS TEMPLATE_NAME TEMPLATE_FLAVOR \
TEMPLATE_FLAVOR_DIR VERBOSE DEBUG PATH BUILDER_DIR \
TEMPLATE_ROOT_WITH_PARTITIONS USE_QUBES_REPO_VERSION \
USE_QUBES_REPO_TESTING BUILDER_TURBO_MODE REPO_PROXY
# Make sure names are < 32 characters, process aliases # Make sure names are < 32 characters, process aliases
fix_up := $(shell TEMPLATE_NAME=$(TEMPLATE_NAME) ./builder_fix_filenames) fix_up := $(shell TEMPLATE_NAME=$(TEMPLATE_NAME) ./builder_fix_filenames)
TEMPLATE_NAME := $(word 1,$(fix_up)) TEMPLATE_NAME := $(word 1,$(fix_up))
@ -44,8 +52,10 @@ rootimg-build:
ifeq (,$(TEMPLATE_SCRIPTS)) ifeq (,$(TEMPLATE_SCRIPTS))
$(error Building template $(DIST) not supported by any of configured plugins) $(error Building template $(DIST) not supported by any of configured plugins)
endif endif
sudo -E ./prepare_image prepared_images/$(TEMPLATE_NAME).img sudo env -i $(foreach var,$(TEMPLATE_ENV_WHITELIST),$(var)="$($(var))") \
sudo -E ./qubeize_image prepared_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME) ./prepare_image prepared_images/$(TEMPLATE_NAME).img
sudo env -i $(foreach var,$(TEMPLATE_ENV_WHITELIST),$(var)="$($(var))") \
./qubeize_image prepared_images/$(TEMPLATE_NAME).img $(TEMPLATE_NAME)
update-repo-installer: update-repo-installer:
[ -z "$$UPDATE_REPO" ] && UPDATE_REPO=../installer/yum/qubes-dom0;\ [ -z "$$UPDATE_REPO" ] && UPDATE_REPO=../installer/yum/qubes-dom0;\