VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

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.
This commit is contained in:
Albert Hopkins 2016-12-08 11:57:41 +00:00
parent 82819040a8
commit 18fdbb86ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -227,7 +227,6 @@ $(SOFTWARE): $(STAGE3) $(SYSTOOLS) configs/eth.network configs/issue $(WORLD)
ifeq ($(ENABLE_SSHD),YES) ifeq ($(ENABLE_SSHD),YES)
$(inroot) systemctl enable sshd.service $(inroot) systemctl enable sshd.service
endif endif
$(change_password)
ifeq ($(DASH),YES) ifeq ($(DASH),YES)
$(inroot) $(EMERGE) --depclean app-shells/bash $(inroot) $(EMERGE) --depclean app-shells/bash
endif endif
@ -296,6 +295,7 @@ $(STAGE4_TARBALL): $(PORTAGE_DIR) stage3-$(ARCH).tar.bz2 appliances/$(APPLIANCE)
$(MAKE) $(KERNEL) $(MAKE) $(KERNEL)
$(MAKE) $(GRUB) $(MAKE) $(GRUB)
@scripts/echo Creating stage4 tarball: `basename $(STAGE4_TARBALL)` @scripts/echo Creating stage4 tarball: `basename $(STAGE4_TARBALL)`
$(change_password)
mkdir -p $(IMAGES) mkdir -p $(IMAGES)
tar -acf "$(STAGE4_TARBALL).tmp.xz" --numeric-owner $(COPY_ARGS) -C $(CHROOT) --one-file-system . tar -acf "$(STAGE4_TARBALL).tmp.xz" --numeric-owner $(COPY_ARGS) -C $(CHROOT) --one-file-system .
mv "$(STAGE4_TARBALL).tmp.xz" "$(STAGE4_TARBALL)" mv "$(STAGE4_TARBALL).tmp.xz" "$(STAGE4_TARBALL)"