vasilito
4591fbabcc
fork: rebased onto upstream 0.2.42 with Red Bear additions
...
This rebases the local installer fork onto upstream 0.2.42
(commit ed6013c295 ) and reapplies
the documented Red Bear OS additions from the local state.
* Cargo.toml: bumped version to 0.2.42-rb1 per the no-fake-version-
label policy. Also bumped dep versions (libc 0.2.70 -> with
optional, pkgar 0.2 -> 0.2.2, redox-pkg 0.3 -> 0.3.1, ring with
optional, libredox with optional) so the build matches the local
fork ecosystem.
* src/installer.rs: integrate the collision detection Red Bear
added in Phase J. The installer now aborts on init-service file
collisions (e.g. /usr/lib/init.d/ vs /etc/init.d/) and prints
a clear error pointing to the local docs.
* src/lib.rs: declare the collision module and re-export the
CollisionDetector.
* src/config/package.rs: extend PackageConfig with PartialEq so
the new package-groups feature (added in commit e45ce4d ) can
compare configs.
* src/bin/installer.rs, src/bin/installer_tui.rs: expose the
--strict-collision / REDBEAR_STRICT_COLLISION env var to
optionally make non-critical file collisions fatal.
* gui/: new redox_installer_gui binary — the TUI installer. This
is the new binary added in Red Bear OS Phase 3 and lives in
local/patches/installer/0001-redbear-os-additions.patch as a
documented Red Bear addition.
The previous redox.patch in local/patches/installer/ is removed
and replaced with this regenerated 0001-redbear-os-additions.patch
that applies cleanly with --fuzz=0 to upstream 0.2.42.
Verified by local/scripts/verify-fork-versions.sh: the local
installer-0.2.42-rb1 branch source content matches upstream 0.2.42
plus this single documented patch.
2026-07-05 05:57:10 +03:00
Jeremy Soller
ed6013c295
Merge branch 'bump-argon' into 'master'
...
Bump argon deps
See merge request redox-os/installer!76
2026-03-17 05:46:41 -06:00
Wildan M
e79c1be43e
Bump argon deps
2026-03-16 21:27:44 +07:00
Jeremy Soller
b5b9bfd825
Merge branch 'bump-ver' into 'master'
...
Bump redox_syscall and version
See merge request redox-os/installer!75
2026-03-15 13:23:48 -06:00
Wildan M
8c2b0f9de7
Bump redox_syscall and version
2026-03-15 18:44:08 +07:00
Jeremy Soller
9800eac87c
Merge branch 'misc_changes2' into 'master'
...
Make arg_parser non-optional
See merge request redox-os/installer!74
2026-03-11 14:42:10 -06:00
bjorn3
e61506c50f
Make arg_parser non-optional
...
It is used by a Debug impl in the config code.
2026-03-11 21:01:48 +01:00
Jeremy Soller
b29021c352
Merge branch 'misc_changes' into 'master'
...
Misc changes
See merge request redox-os/installer!73
2026-03-11 14:00:12 -06:00
bjorn3
474ff08431
Fix bootloader location
2026-03-11 20:53:46 +01:00
bjorn3
f691afabab
Fix usage message
2026-03-11 20:31:03 +01:00
bjorn3
f74e3fad19
Make home directories 700 instead of 777
2026-03-11 20:12:40 +01:00
Jeremy Soller
3ef2cac56d
Merge branch 'new-pkg' into 'master'
...
Update pkg to use new API
See merge request redox-os/installer!72
2026-03-08 13:25:42 -06:00
Wildan M
aa9c978f90
Resolve ring dependency
2026-03-08 21:04:32 +07:00
Wildan M
a6fd457652
Update pkg to use new API
2026-03-08 20:53:33 +07:00
Jeremy Soller
7806f87c56
Merge branch 'move_bootloader_to_user' into 'master'
...
Bootloader is now stored in /usr/lib/boot
See merge request redox-os/installer!71
2026-03-07 08:36:04 -07:00
bjorn3
70b8cb0e37
Bootloader is now stored in /usr/lib/boot
2026-03-07 16:30:35 +01:00
Jeremy Soller
397974cb68
Workaround for existing symlinks by overwriting them
2026-03-04 11:18:14 -07:00
Jeremy Soller
8765c51696
Log target of symlink
2026-03-04 10:53:22 -07:00
Jeremy Soller
2d3b2ed38a
Improve some error reporting
2026-03-04 10:49:09 -07:00
Jeremy Soller
1840ceac85
Merge branch 'fix-redox-err' into 'master'
...
Fix redox compilation error
See merge request redox-os/installer!70
2026-02-14 12:31:56 -07:00
Wildan M
59d0872197
Fix redox compilation error
2026-02-15 01:47:13 +07:00
Jeremy Soller
7f918e544e
Merge branch 'skel-copy' into 'master'
...
Copy /etc/skel to users directory
See merge request redox-os/installer!69
2026-02-14 06:41:32 -07:00
Wildan M
730eb9a606
Copy /etc/skel to users directory
2026-02-14 18:13:27 +07:00
Jeremy Soller
a790f1c228
Merge branch 'local-err-help' into 'master'
...
Make missing file clear when locally installing
See merge request redox-os/installer!68
2026-02-10 05:59:32 -07:00
Wildan M
b33f3c1a80
Make missing file clear when locally installing
2026-02-10 01:35:44 +07:00
Jeremy Soller
b0f90da7b8
Merge branch 'cli-enh' into 'master'
...
Some improvement as a standalone CLI
See merge request redox-os/installer!67
2026-01-30 20:28:01 -07:00
Wildan M
c4ed26e3d4
Don't confirm password if empty
2026-01-31 05:10:03 +07:00
Wildan M
753256cfaf
Strip fallocate from CI test
2026-01-31 05:02:08 +07:00
Wildan M
cfc7938ecc
Shorten remote packages log
2026-01-31 04:53:30 +07:00
Wildan M
15de2b4272
Add help hint, remove repo_binary
2026-01-31 04:17:54 +07:00
Wildan M
fed265252d
Unify password prompt code
2026-01-31 04:17:11 +07:00
Wildan M
d40619d66c
Implement Display for Config
2026-01-31 04:15:10 +07:00
Jeremy Soller
64f46052db
0.2.41 - update dependencies
2026-01-22 10:39:26 -07:00
Jeremy Soller
eff771e640
0.2.40: downgrade libredox to 0.1.11 for redox_syscall 0.6 compatibility
2026-01-02 20:00:13 -07:00
Jeremy Soller
397749f1f5
0.2.39: update redox_syscall and redoxfs
2026-01-02 19:42:55 -07:00
Jeremy Soller
753c8af0e5
Merge branch 'expose-fuse-opt' into 'master'
...
Make FUSE feature can be opted out
See merge request redox-os/installer!66
2026-01-01 08:15:36 -07:00
Wildan M
846e8446e0
Make FUSE feature can be opted out
2026-01-01 14:46:54 +07:00
Jeremy Soller
385696d84a
Merge branch 'update-redoxfs' into 'master'
...
Bump redoxfs
See merge request redox-os/installer!64
2025-12-16 11:08:07 -07:00
Wildan M
ca9748f1ba
Bump redoxfs
2025-12-16 22:51:05 +07:00
Jeremy Soller
7e697cfb3a
Merge branch 'bump-ver' into 'master'
...
Expose custom mount API and bump version
See merge request redox-os/installer!63
2025-12-15 15:54:52 -07:00
Wildan M
86d2af6ca0
Expose custom mount API and bump version
2025-12-16 05:27:09 +07:00
Jeremy Soller
8ba8d6e15b
Merge branch 'no-mount' into 'master'
...
Add no_mount option and tidy up flags
See merge request redox-os/installer!62
2025-12-15 12:38:41 -07:00
Wildan M
3dba5827f2
Try fix CI
2025-12-16 01:55:54 +07:00
Wildan M
433aa99660
Add no_mount option and tidy up flags
2025-12-16 01:41:55 +07:00
Jeremy Soller
990d9d343e
Merge branch 'bump-pkg' into 'master'
...
Update pkg version
See merge request redox-os/installer!61
2025-12-09 08:48:25 -07:00
Wildan M
8bc7c9d88d
Update pkg version
2025-12-09 10:22:36 -05:00
Jeremy Soller
4fcd97e8da
Merge branch 'split-cargo-features' into 'master'
...
Split installer code to cargo feature
See merge request redox-os/installer!60
2025-11-22 11:31:56 -07:00
Wildan M
7a85862733
Split installer code to cargo feature
2025-11-22 09:15:25 -08:00
Wildan M
7308cfe259
Move installer code
2025-11-22 09:15:24 -08:00
Jeremy Soller
58f161e019
Fix compilation on Redox
2025-11-20 08:58:51 -07:00