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

Fix netinit

Browse Source
This commit is contained in:
K. Lange 2018-09-04 10:17:59 +09:00
parent a92007245d
commit 1960980586
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -161,7 +161,7 @@ base/bin/init: apps/init.c base/lib/libc.a | dirs
$(CC) -static -Wl,-static $(CFLAGS) -o $@ $< $(CC) -static -Wl,-static $(CFLAGS) -o $@ $<
fatbase/netinit: util/netinit.c base/lib/libc.a | dirs fatbase/netinit: util/netinit.c base/lib/libc.a | dirs
$(CC) -s -static -Wl,-static $(CFLAGS) -o $@ $< $(CC) -static -Wl,-static $(CFLAGS) -o $@ $<
# Userspace applications # Userspace applications

2
boot/cstuff.c
View File

@ -40,7 +40,7 @@ EFI_HANDLE ImageHandleIn;
#define DEFAULT_TEXT_CMDLINE "start=--vga " #define DEFAULT_TEXT_CMDLINE "start=--vga "
#define DEFAULT_VID_CMDLINE "vid=auto,1440,900 " #define DEFAULT_VID_CMDLINE "vid=auto,1440,900 "
#define DEFAULT_PRESET_VID_CMDLINE "vid=preset " #define DEFAULT_PRESET_VID_CMDLINE "vid=preset "
#define DEFAULT_NETINIT_CMDLINE "init=/dev/ram0 _" #define DEFAULT_NETINIT_CMDLINE "init=/dev/ram0 "
#define MIGRATE_CMDLINE "migrate " #define MIGRATE_CMDLINE "migrate "
#define DEBUG_LOG_CMDLINE "logtoserial=warning " #define DEBUG_LOG_CMDLINE "logtoserial=warning "
#define DEBUG_SERIAL_CMDLINE "kdebug " #define DEBUG_SERIAL_CMDLINE "kdebug "

2
kernel/fs/ramdisk.c
View File

@ -84,7 +84,7 @@ static fs_node_t * ramdisk_device_create(int device_number, uintptr_t location,
sprintf(fnode->name, "ram%d", device_number); sprintf(fnode->name, "ram%d", device_number);
fnode->uid = 0; fnode->uid = 0;
fnode->gid = 0; fnode->gid = 0;
fnode->mask = 0660; fnode->mask = 0770;
fnode->length = size; fnode->length = size;
fnode->flags = FS_BLOCKDEVICE; fnode->flags = FS_BLOCKDEVICE;
fnode->read = read_ramdisk; fnode->read = read_ramdisk;

9
util/netinit.c
View File

@ -529,11 +529,8 @@ int main(int argc, char * argv[]) {
struct http_req my_req; struct http_req my_req;
if (argc > 1) { /* TODO: Extract URL from kcmdline */
parse_url(argv[1], &my_req); parse_url(NETBOOT_URL, &my_req);
} else {
parse_url(NETBOOT_URL, &my_req);
}
char file[100]; char file[100];
sprintf(file, "/dev/net/%s:%d", my_req.domain, my_req.port); sprintf(file, "/dev/net/%s:%d", my_req.domain, my_req.port);
@ -706,7 +703,7 @@ int main(int argc, char * argv[]) {
TRACE("Executing init...\n"); TRACE("Executing init...\n");
char * const _argv[] = { char * const _argv[] = {
"/bin/init", "/bin/init",
"--migrate", argv[1],
NULL, NULL,
}; };
execve("/bin/init",_argv,NULL); execve("/bin/init",_argv,NULL);