Fix push and improve mount messages

mk/config.mk

@@ -120,6 +120,19 @@ endif
 # Automatic variables
 ROOT=$(CURDIR)
 export RUST_COMPILER_RT_ROOT=$(ROOT)/rust/src/llvm-project/compiler-rt
+RUNNING_IN_PODMAN=$(shell [ -f /run/.containerenv ] && echo 1 || echo 0)
+ifeq ($(PODMAN_BUILD),1)
+ifeq ($(RUNNING_IN_PODMAN),1)
+$(info Please unset PODMAN_BUILD=1 in .config!)
+endif
+endif
+
+ALLOW_FSTOOLS?=0
+ifeq ($(FSTOOLS_IN_PODMAN),0)
+ifeq ($(RUNNING_IN_PODMAN),0)
+ALLOW_FSTOOLS=1
+endif
+endif
 
 ## Userspace variables
 ifeq ($(ARCH),riscv64gc)

mk/disk.mk

@@ -62,38 +62,38 @@ mount: $(FSTOOLS) FORCE
 ifeq ($(FSTOOLS_IN_PODMAN),1)
 	$(PODMAN_RUN) make $@
 else
-	mkdir -p $(MOUNT_DIR)
+	@mkdir -p $(MOUNT_DIR)
 	$(REDOXFS) $(BUILD)/harddrive.img $(MOUNT_DIR)
-	sleep 2
+	@sleep 2
-	pgrep redoxfs
+	@pgrep redoxfs
 endif
 
 mount_extra: $(FSTOOLS) FORCE
 ifeq ($(FSTOOLS_IN_PODMAN),1)
 	$(PODMAN_RUN) make $@
 else
-	mkdir -p $(MOUNT_DIR)
+	@mkdir -p $(MOUNT_DIR)
 	$(REDOXFS) $(BUILD)/extra.img $(MOUNT_DIR)
-	sleep 2
+	@sleep 2
-	pgrep redoxfs
+	@pgrep redoxfs
 endif
 
 mount_live: $(FSTOOLS) FORCE
 ifeq ($(FSTOOLS_IN_PODMAN),1)
 	$(PODMAN_RUN) make $@
 else
-	mkdir -p $(MOUNT_DIR)
+	@mkdir -p $(MOUNT_DIR)
 	$(REDOXFS) $(BUILD)/redox-live.iso $(MOUNT_DIR)
-	sleep 2
+	@sleep 2
-	pgrep redoxfs
+	@pgrep redoxfs
 endif
 
 unmount: FORCE
 ifeq ($(FSTOOLS_IN_PODMAN),1)
 	$(PODMAN_RUN) make $@
 else
-	sync
+	@sync
-	-$(FUMOUNT) $(MOUNT_DIR) || true
+	-$(FUMOUNT) $(MOUNT_DIR)
-	rm -rf $(MOUNT_DIR)
+	@rm -rf $(MOUNT_DIR)
-	-$(FUMOUNT) /tmp/redox_installer || true
+	@-$(FUMOUNT) /tmp/redox_installer 2>/dev/null || true
 endif

mk/repo.mk

@@ -62,17 +62,21 @@ MOUNTED_TAG=$(MOUNT_DIR)~
 # Push compiled package into existing image
 # DO NOT RUN THIS WHILE QEMU ALIVE, THE DISK MIGHT CORRUPT IN DOING SO
 p.%: $(FSTOOLS_TAG) FORCE
-ifeq ($(PODMAN_BUILD),1)
+ifeq ($(ALLOW_FSTOOLS),1)
-	$(PODMAN_RUN) make $@
-else
 	@rm -f $(MOUNTED_TAG)
 	@if [ ! -d "$(MOUNT_DIR)" ]; then \
 		$(MAKE) mount; \
 		touch $(MOUNTED_TAG); \
 	fi
+endif
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) make $@ ALLOW_FSTOOLS=$(FSTOOLS_IN_PODMAN)
+else
 	./target/release/repo push $(foreach f,$(subst $(comma), ,$*),$(f)) "--sysroot=$(MOUNT_DIR)"
+endif
+ifeq ($(ALLOW_FSTOOLS),1)
 	@if [ -f $(MOUNTED_TAG) ]; then \
-		$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
+		$(MAKE) unmount && rm -f $(MOUNTED_TAG) && echo "Filesystem unmounted"; \
 	else echo "Not unmounting by ourself, don't forget to do it"; \
 	fi
 endif
@@ -83,17 +87,21 @@ pp.%: $(FSTOOLS_TAG) FORCE
 
 # Push all recipes specified by the filesystem config
 push: $(FSTOOLS_TAG) FORCE
-ifeq ($(PODMAN_BUILD),1)
+ifeq ($(ALLOW_FSTOOLS),1)
-	$(PODMAN_RUN) make $@
-else
 	@rm -f $(MOUNTED_TAG)
 	@if [ ! -d "$(MOUNT_DIR)" ]; then \
 		$(MAKE) mount; \
 		touch $(MOUNTED_TAG); \
 	fi
+endif
+ifeq ($(PODMAN_BUILD),1)
+	$(PODMAN_RUN) make $@ ALLOW_FSTOOLS=$(FSTOOLS_IN_PODMAN)
+else
 	./target/release/repo push $(COOKBOOK_OPTS) --with-package-deps "--sysroot=$(MOUNT_DIR)"
+endif
+ifeq ($(ALLOW_FSTOOLS),1)
 	@if [ -f $(MOUNTED_TAG) ]; then \
-		$(MAKE) unmount && rm -f $(MOUNTED_TAG); \
+		$(MAKE) unmount && rm -f $(MOUNTED_TAG) && echo "Filesystem unmounted"; \
 	else echo "Not unmounting by ourself, don't forget to do it"; \
 	fi
 endif