diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-12-20 20:03:22 +0100 |
| commit | 09353da6e91a0968ae24d4b4d97ed434520e6217 (patch) | |
| tree | 016694d12e9dfebc773cef629eb56556d0024b22 /Mount | |
| parent | 247070cc7e5ae117fd0d1b551fafdf5c13f0dd6b (diff) | |
| parent | 18454dc8be12827a84c2ebc58aa5d31bb44e1e6a (diff) | |
| download | Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.tar.gz Melon-09353da6e91a0968ae24d4b4d97ed434520e6217.zip | |
Merge branch 'framework'
Conflicts:
.gitignore
Diffstat (limited to 'Mount')
| -rwxr-xr-x | Mount/boot/menu.cfg | 27 | ||||
| -rwxr-xr-x | Mount/boot/stage1 | bin | 0 -> 512 bytes | |||
| -rwxr-xr-x | Mount/boot/stage2 | bin | 0 -> 99882 bytes |
3 files changed, 27 insertions, 0 deletions
diff --git a/Mount/boot/menu.cfg b/Mount/boot/menu.cfg new file mode 100755 index 0000000..37bcfb0 --- /dev/null +++ b/Mount/boot/menu.cfg @@ -0,0 +1,27 @@ +default 2 + +title The Melon Operating System +root (fd0) +kernel /System/Melon.ke root:block.floppy:0:0 +module /System/Init.rfs + +title Melon without VESA +root (fd0) +kernel /System/Melon.ke vesa:disabled root:block.floppy:0:0 +module /System/Init.rfs + +title Melon without init +root (fd0) +kernel /System/Melon.ke init: root:block.floppy:0:0 +module /System/Init.rfs + +title Melon without init, boot on initramfs +root (fd0) +kernel /System/Melon.ke init: root:ramfs:0 +module /System/Init.rfs + +title Game of life simulator +root (fd0) +kernel /System/Melon.ke init:/Applications/Demos/GOL.app root:block.floppy:0:0 +module /System/Init.rfs + diff --git a/Mount/boot/stage1 b/Mount/boot/stage1 Binary files differnew file mode 100755 index 0000000..c10df80 --- /dev/null +++ b/Mount/boot/stage1 diff --git a/Mount/boot/stage2 b/Mount/boot/stage2 Binary files differnew file mode 100755 index 0000000..8b578cf --- /dev/null +++ b/Mount/boot/stage2 |