From 2f08c1a5a475f80094c9e924cfe94c925de7e36d Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:25:45 -0500 Subject: [PATCH] mute output --- Makefile | 4 ++-- xorriso/gen_input.sh.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9fa7355..4cd35b5 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,9 @@ _IMAGE_REPO_ESCAPED = $(subst /,\/,$(IMAGE_REPO)) _IMAGE_REPO_DOUBLE_ESCAPED = $(subst \,\\\,$(_IMAGE_REPO_ESCAPED)) _VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG) _REPO_FILES = $(notdir $(REPOS)) -_LORAX_TEMPLATES = configure_upgrades.tmpl set_installer.tmpl disable_localization.tmpl +_LORAX_TEMPLATES = $(shell ls lorax_templates) -ifeq ($(VARIANT),'Server') +ifeq ($(VARIANT),Server) _LORAX_ARGS = --macboot --noupgrade else _LORAX_ARGS = --nomacboot diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in index 5d5dfcd..c4914d5 100644 --- a/xorriso/gen_input.sh.in +++ b/xorriso/gen_input.sh.in @@ -5,11 +5,11 @@ echo "-outdev $(pwd)/build/deploy.iso" echo "-boot_image any replay" echo "-joliet on" echo "-compliance joliet_long_names" -pushd container +pushd container > /dev/null for file in $(find ${IMAGE_NAME}-${IMAGE_TAG}) do echo "-map $(pwd)/${file} ${file}" echo "-chmod 0444 ${file}" done -popd +popd > /dev/null echo "-end" \ No newline at end of file