diff --git a/.gitignore b/.gitignore index 4e1afa5..e6f5c3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /build/ /prefix/ .config +**/my_* diff --git a/installer b/installer index c91bea9..b23b2f6 160000 --- a/installer +++ b/installer @@ -1 +1 @@ -Subproject commit c91bea94524996d82c9268a085a4116c5856b765 +Subproject commit b23b2f6e5db1a463769ff864aac994ff0eb83119 diff --git a/mk/config.mk b/mk/config.mk index d0eff35..6a7a70d 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -61,6 +61,9 @@ INSTALLER=installer/target/release/redox_installer ifeq ($(REPO_BINARY),0) INSTALLER+=--cookbook=cookbook REPO_TAG=$(BUILD)/repo.tag +else +INSTALLER+=--cookbook=cookbook --cooking +REPO_TAG=$(BUILD)/repo.tag endif FSTOOLS_TAG=build/fstools.tag diff --git a/mk/disk.mk b/mk/disk.mk index f73858f..f00ca65 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -3,7 +3,7 @@ $(BUILD)/harddrive.img: $(FSTOOLS_TAG) $(REPO_TAG) rm -rf $@ $@.partial -$(FUMOUNT) /tmp/redox_installer || true fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial - $(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial + umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial mv $@.partial $@ $(BUILD)/livedisk.iso: $(FSTOOLS_TAG) $(REPO_TAG) @@ -11,7 +11,7 @@ $(BUILD)/livedisk.iso: $(FSTOOLS_TAG) $(REPO_TAG) rm -rf $@ $@.partial -$(FUMOUNT) /tmp/redox_installer || true fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial - $(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial + umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial mv $@.partial $@ $(BUILD)/filesystem.img: $(FSTOOLS_TAG) $(REPO_TAG) @@ -25,7 +25,7 @@ $(BUILD)/filesystem.img: $(FSTOOLS_TAG) $(REPO_TAG) redoxfs/target/release/redoxfs $@.partial $(BUILD)/filesystem/ sleep 1 pgrep redoxfs - $(INSTALLER) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/ + umask 002 && $(INSTALLER) -c $(FILESYSTEM_CONFIG) $(BUILD)/filesystem/ sync -$(FUMOUNT) $(BUILD)/filesystem/ || true rm -rf $(BUILD)/filesystem/