Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only mount hard disk if requested

Browse Source
This commit is contained in:
Kevin Lange 2011-12-14 22:30:46 -06:00
parent 8c548c0db0
commit 67343548a7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -36,7 +36,7 @@ ERRORSS = >>/tmp/.build-errors || util/mk-error
BEGRM = util/mk-beg-rm
ENDRM = util/mk-end-rm
EMUARGS = -kernel toaruos-kernel -initrd toaruos-initrd -append "vid=qemu wallpaper=/usr/share/wallpaper.bmp" -serial stdio -vga std -hda toaruos-disk.img
EMUARGS = -kernel toaruos-kernel -initrd toaruos-initrd -append "vid=qemu hdd wallpaper=/usr/share/wallpaper.bmp" -serial stdio -vga std -hda toaruos-disk.img
EMUKVM = -enable-kvm
.PHONY: all check-toolchain system clean clean-once clean-hard clean-soft clean-docs clean-bin clean-aux clean-core clean-boot install run docs utils

3
kernel/main.c
View File

@ -142,9 +142,6 @@ int main(struct multiboot *mboot, uint32_t mboot_mag, uintptr_t esp)
mouse_install(); /* Mouse driver */
extern void ext2_disk_mount(void);
ext2_disk_mount();
if (boot_mode == multiboot) {
/* Parse the command-line arguments */
parse_args((char *)mboot_ptr->cmdline);

3
kernel/misc/args.c
View File

@ -65,6 +65,9 @@ parse_args(
} else if (!strcmp(argp[0],"wallpaper")) {
if (argc < 2) { kprintf("wallpaper=?\n"); continue; }
bochs_install_wallpaper(argp[1]);
} else if (!strcmp(argp[0],"hdd")) {
extern void ext2_disk_mount(void);
ext2_disk_mount();
}
}
}