vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update installer patch with GRUB help text and fix fstools build

Browse Source 
Adds --bootloader and --filesystem to installer help text. Fixes
fstools host build by symlinking local/ directory alongside recipes/
so the ext4-blockdev path dependency resolves correctly.

Ultraworked with [Sisyphus](https://github.com/code-yeongyu/oh-my-openagent)

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
This commit is contained in:
Vasilito
2026-04-17 21:24:01 +01:00
parent e66bb91b2b
commit 7e7647c4b8
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/installer/redox.patch
+12 -3
View File
@@ -90,10 +90,19 @@ index e3c6700..b1d5d72 100644
"termion", "termion",
"uuid", "uuid",
diff --git a/src/bin/installer.rs b/src/bin/installer.rs diff --git a/src/bin/installer.rs b/src/bin/installer.rs
index c3ce487..973b85c 100644 index c3ce487..7b8ee66 100644
--- a/src/bin/installer.rs --- a/src/bin/installer.rs
+++ b/src/bin/installer.rs +++ b/src/bin/installer.rs
@@ -39,6 +39,8 @@ fn main() { @@ -20,6 +20,8 @@ Using redox_installer as an installer:
<diskpath.img> Disk file to write
--config Path to filesystem config TOML
--write-bootloader Path to write UEFI bootloader to in addition to the embedded ESP
+ --bootloader Boot manager: "redox" (default) or "grub"
+ --filesystem Filesystem type: "redoxfs" (default) or "ext4"
--skip-partition Skip writing GPT partition tables
Use this only if you plan to use other partition tool
--live Use bootloader configured for live disk
@@ -39,6 +41,8 @@ fn main() {
.add_opt("c", "config") .add_opt("c", "config")
.add_opt("o", "output-config") .add_opt("o", "output-config")
.add_opt("", "write-bootloader") .add_opt("", "write-bootloader")
@@ -102,7 +111,7 @@ index c3ce487..973b85c 100644
.add_flag(&["skip-partition"]) .add_flag(&["skip-partition"])
.add_flag(&["filesystem-size"]) .add_flag(&["filesystem-size"])
.add_flag(&["r", "repo-binary"]) // TODO: Remove .add_flag(&["r", "repo-binary"]) // TODO: Remove
@@ -116,6 +118,12 @@ fn main() { @@ -116,6 +120,12 @@ fn main() {
if parser.found("no-mount") { if parser.found("no-mount") {
config.general.no_mount = Some(true); config.general.no_mount = Some(true);
} }
mk/fstools.mk
+1
View File
@@ -16,6 +16,7 @@ else
rm -rf $@ $@.partial rm -rf $@ $@.partial
mkdir -p $@.partial mkdir -p $@.partial
ln -s ../../recipes $@.partial/recipes ln -s ../../recipes $@.partial/recipes
ln -s ../../local $@.partial/local
$(MAKE) fstools_fetch PODMAN_BUILD=$(GOING_TO_PODMAN_AGAIN) $(MAKE) fstools_fetch PODMAN_BUILD=$(GOING_TO_PODMAN_AGAIN)
# Compile installer and redoxfs for host (may be outside of podman container) # Compile installer and redoxfs for host (may be outside of podman container)