Merge branch 'misc_changes' into 'master'

Misc changes

See merge request redox-os/installer!73
This commit is contained in:
Jeremy Soller
2026-03-11 14:00:12 -06:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ Using redox_installer as an installer:
redox_installer <diskpath.img> [--config=file.toml] [--write-bootloader=file.img] [--live] [--no-mount] [--skip-partition]
<diskpath.img> Disk file to write
--config Path to filesystem config TOML
--write-bootloader Path to write separate EFI partition
--write-bootloader Path to write UEFI bootloader to in addition to the embedded ESP
--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
+2 -2
View File
@@ -275,7 +275,7 @@ fn main() {
let instant = std::time::Instant::now();
let bootloader_bios = {
let path = root_path.join("boot").join("bootloader.bios");
let path = root_path.join("usr/lib/boot/bootloader.bios");
if path.exists() {
match fs::read(&path) {
Ok(ok) => ok,
@@ -294,7 +294,7 @@ fn main() {
};
let bootloader_efi = {
let path = root_path.join("boot").join("bootloader.efi");
let path = root_path.join("usr/lib/boot/bootloader.efi");
if path.exists() {
match fs::read(&path) {
Ok(ok) => ok,
+1 -1
View File
@@ -200,7 +200,7 @@ pub fn install_dir(
println!("\tShell: {shell}");
FileConfig::new_directory(home.clone())
.with_recursive_mod(0o777, uid, gid)
.with_recursive_mod(0o700, uid, gid)
.create(&output_dir)?;
if uid >= 1000 {