dbld/rules: fix login and root-login targets

No command was passed to /dbld/shell in these cases, causing these shells to exit. Signed-off-by: Balazs Scheidler <[email protected]>
axoflow · Oct 6, 2024 · 00a201e · 00a201e
1 parent 05a519c
commit 00a201e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/dbld/rules b/dbld/rules
@@ -262,12 +262,12 @@ exec-%: setup
 	$(DOCKER) exec $(DOCKER_INTERACTIVE)  $$container $(EXEC_COMMAND)
 
 login: login-$(DEFAULT_IMAGE)
-login-%: EXEC_COMMAND=sudo -u $(shell whoami) /dbld/shell
+login-%: EXEC_COMMAND=sudo -E -u $(shell whoami) /dbld/shell $(if $(SHELL_COMMAND),"$(SHELL_COMMAND)",bash)
 login-%: exec-%
 	@true
 
 root-login: root-login-$(DEFAULT_IMAGE)
-root-login-%: EXEC_COMMAND=bash
+root-login-%: EXEC_COMMAND=/dbld/shell $(if $(SHELL_COMMAND),"$(SHELL_COMMAND)",bash)
 root-login-%: exec-%
 	@true