From 18fdbb86ea51c8a0f96eb8beb4db621176b16a32 Mon Sep 17 00:00:00 2001 From: Albert Hopkins Date: Thu, 8 Dec 2016 11:57:41 +0000 Subject: [PATCH] Makefile: perform the change-password step in the stage4 phase This should really happen as late as possibly and possibly not at all. If we change (lock) the password too soon, then some build steps can fail. For example, adduser will fail if root needs to change its password first. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 52e1965..25ad8b4 100644 --- a/Makefile +++ b/Makefile @@ -227,7 +227,6 @@ $(SOFTWARE): $(STAGE3) $(SYSTOOLS) configs/eth.network configs/issue $(WORLD) ifeq ($(ENABLE_SSHD),YES) $(inroot) systemctl enable sshd.service endif - $(change_password) ifeq ($(DASH),YES) $(inroot) $(EMERGE) --depclean app-shells/bash endif @@ -296,6 +295,7 @@ $(STAGE4_TARBALL): $(PORTAGE_DIR) stage3-$(ARCH).tar.bz2 appliances/$(APPLIANCE) $(MAKE) $(KERNEL) $(MAKE) $(GRUB) @scripts/echo Creating stage4 tarball: `basename $(STAGE4_TARBALL)` + $(change_password) mkdir -p $(IMAGES) tar -acf "$(STAGE4_TARBALL).tmp.xz" --numeric-owner $(COPY_ARGS) -C $(CHROOT) --one-file-system . mv "$(STAGE4_TARBALL).tmp.xz" "$(STAGE4_TARBALL)"