=== build/default.cfg ================================================================== --- build/default.cfg (revision 1469) +++ build/default.cfg (local) @@ -1,13 +1,9 @@ title LOST kernel /boot/lost debug=s module /modules/init -module /modules/vterm -module /modules/console vterm:/vterm0/out vterm:/vterm0/in module /modules/dma +module /modules/cmos module /modules/floppy module /modules/fat -module /modules/kbc -module /modules/cmos -module /modules/pci -module /apps/sh +module /modules/servmgr floppy:/devices/fd0|fat:/ floppy fat boot === build/root/config/servmgr/cmos/cmd ================================================================== --- build/root/config/servmgr/cmos/cmd (revision 1469) +++ build/root/config/servmgr/cmos/cmd (local) @@ -0,0 +1 @@ +/modules/cmos === build/root/config/servmgr/console/cmd ================================================================== --- build/root/config/servmgr/console/cmd (revision 1469) +++ build/root/config/servmgr/console/cmd (local) @@ -0,0 +1 @@ +/modules/console vterm:/vterm0/out vterm:/vterm0/in === build/root/config/servmgr/console/deps ================================================================== --- build/root/config/servmgr/console/deps (revision 1469) +++ build/root/config/servmgr/console/deps (local) @@ -0,0 +1 @@ +vterm === build/root/config/servmgr/default/deps ================================================================== --- build/root/config/servmgr/default/deps (revision 1469) +++ build/root/config/servmgr/default/deps (local) @@ -0,0 +1 @@ +getterm1 === build/root/config/servmgr/file/cmd ================================================================== --- build/root/config/servmgr/file/cmd (revision 1469) +++ build/root/config/servmgr/file/cmd (local) @@ -0,0 +1 @@ +/modules/file === build/root/config/servmgr/getterm1/cmd ================================================================== --- build/root/config/servmgr/getterm1/cmd (revision 1469) +++ build/root/config/servmgr/getterm1/cmd (local) @@ -0,0 +1 @@ +/apps/getterm vterm:/vterm0/in vterm:/vterm0/out vterm:/vterm0/out /apps/sh === build/root/config/servmgr/getterm1/conf ================================================================== --- build/root/config/servmgr/getterm1/conf (revision 1469) +++ build/root/config/servmgr/getterm1/conf (local) @@ -0,0 +1 @@ +nowait === build/root/config/servmgr/getterm1/deps ================================================================== --- build/root/config/servmgr/getterm1/deps (revision 1469) +++ build/root/config/servmgr/getterm1/deps (local) @@ -0,0 +1,4 @@ +console +cmos +mount + === build/root/config/servmgr/getterm1/workdir ================================================================== --- build/root/config/servmgr/getterm1/workdir (revision 1469) +++ build/root/config/servmgr/getterm1/workdir (local) @@ -0,0 +1 @@ +file:/ === build/root/config/servmgr/kbc/cmd ================================================================== --- build/root/config/servmgr/kbc/cmd (revision 1469) +++ build/root/config/servmgr/kbc/cmd (local) @@ -0,0 +1 @@ +/modules/kbc === build/root/config/servmgr/mount/cmd ================================================================== --- build/root/config/servmgr/mount/cmd (revision 1469) +++ build/root/config/servmgr/mount/cmd (local) @@ -0,0 +1 @@ +/modules/file mount file:/ floppy:/devices/fd0|fat:/ === build/root/config/servmgr/mount/conf ================================================================== --- build/root/config/servmgr/mount/conf (revision 1469) +++ build/root/config/servmgr/mount/conf (local) @@ -0,0 +1 @@ +nowait === build/root/config/servmgr/mount/deps ================================================================== --- build/root/config/servmgr/mount/deps (revision 1469) +++ build/root/config/servmgr/mount/deps (local) @@ -0,0 +1 @@ +file === build/root/config/servmgr/pci/cmd ================================================================== --- build/root/config/servmgr/pci/cmd (revision 1469) +++ build/root/config/servmgr/pci/cmd (local) @@ -0,0 +1 @@ +/modules/pci === build/root/config/servmgr/rtl8139/cmd ================================================================== --- build/root/config/servmgr/rtl8139/cmd (revision 1469) +++ build/root/config/servmgr/rtl8139/cmd (local) @@ -0,0 +1 @@ +/modules/rtl8139 === build/root/config/servmgr/rtl8139/deps ================================================================== --- build/root/config/servmgr/rtl8139/deps (revision 1469) +++ build/root/config/servmgr/rtl8139/deps (local) @@ -0,0 +1,2 @@ +pci +tcpip === build/root/config/servmgr/tcpip/cmd ================================================================== --- build/root/config/servmgr/tcpip/cmd (revision 1469) +++ build/root/config/servmgr/tcpip/cmd (local) @@ -0,0 +1 @@ +/modules/tcpip ns=192.168.1.1 === build/root/config/servmgr/vterm/cmd ================================================================== --- build/root/config/servmgr/vterm/cmd (revision 1469) +++ build/root/config/servmgr/vterm/cmd (local) @@ -0,0 +1 @@ +/modules/vterm === build/root/config/servmgr/vterm/deps ================================================================== --- build/root/config/servmgr/vterm/deps (revision 1469) +++ build/root/config/servmgr/vterm/deps (local) @@ -0,0 +1 @@ +kbc === buildmk.sh ================================================================== --- buildmk.sh (revision 1469) +++ buildmk.sh (local) @@ -256,7 +256,7 @@ mcopy -D o -i build/lost.img build/output/gz/kernel/* ::/boot/ mcopy -D o -i build/lost.img build/output/gz/modules/* ::/modules/ mcopy -D o -i build/lost.img build/output/gz/apps/* ::/apps/ - mcopy -D o -i build/lost.img build/root/* ::/ + mcopy -D o -i build/lost.img -s build/root/* ::/ image: make --no-print-directory -s all === src/modules/c/getterm/main.c ================================================================== --- src/modules/c/getterm/main.c (revision 1469) +++ src/modules/c/getterm/main.c (local) @@ -92,9 +92,6 @@ } program = argv[4]; - // FIXME: Ein bisschen warten, bis vterm und co bereit sind - msleep(2000); - // Pfade bei console aendern console_set_handle(STDIN, argv[1]); console_set_handle(STDOUT, argv[2]); === src/modules/rtl8139/main.c ================================================================== --- src/modules/rtl8139/main.c (revision 1469) +++ src/modules/rtl8139/main.c (local) @@ -113,7 +113,7 @@ } register_netcard(0, options.ip); - + init_service_register("rtl8139"); return 0; }