Skip to content

Commit 5912800

Browse files
committed
Makefile.inc: put UROOT_ADDITIONAL_CMDS before UROOT_BASE_CMDS
Frequently, users may want to extend the uroot build with files as well as u-root commands, by using the -files switch. The way the Makefile.inc ordered the two variables made this impossible, since UROOT_ADDITIONAL_CMDS was placed after UROOT_BASE_CMDS, and hence it could not include switches. Switch the order, and now users can add files as well as commands, e.g., set UROOT_ADDITIONAL_CMDS="-files /etc -files /bin/bash boot" and get these extra commands. Signed-off-by: Ronald G. Minnich <rminnich@google.com>
1 parent 6b290d7 commit 5912800

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

Makefile.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,8 @@ $(INITRAMFS_OUT): $(INITRAMFS_DEPS_FLAG) $(INITRAMFS_PATCH_FLAG)
249249
GOPATH=$(INITRAMFS_BUILD_DIR)/gopath:$(UROOT_ADDITIONAL_GOPATH) \
250250
$(INITRAMFS_BUILD_DIR)/go/bin/go run github.com/u-root/u-root \
251251
-build=bb -o $@ -uinitcmd=$(UINIT_CMD) \
252-
$(UROOT_BASE_CMDS) \
253252
$(UROOT_ADDITIONAL_CMDS) \
253+
$(UROOT_BASE_CMDS) \
254254
|| { rm -f $@; exit 1; }
255255

256256
ifeq "$(ALWAYS_BUILD_INITRAMFS)" "1"

0 commit comments

Comments
 (0)