Changeset 80791a7 in mainline

Timestamp:

2008-08-22T11:07:32Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2e4bd1f

Parents:

ab00d5a

Message:

Enable bdsh in most of the architectures, remove cli and simplify init.

Files:

• boot/arch/amd64/Makefile.inc (modified) (1 diff)
• boot/arch/arm32/loader/Makefile (modified) (1 diff)
• boot/arch/ia32/Makefile.inc (modified) (1 diff)
• boot/arch/mips32/loader/Makefile (modified) (1 diff)
• boot/arch/ppc32/loader/Makefile (modified) (1 diff)
• boot/arch/sparc64/loader/Makefile (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/cli/Makefile (deleted)
• uspace/app/cli/cli.c (deleted)
• uspace/app/init/init.c (modified) (2 diffs)

boot/arch/amd64/Makefile.inc

@@ -49 +49 @@
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/cli/cli \
+        $(USPACEDIR)/app/bdsh/bdsh \
         $(USPACEDIR)/srv/fs/tmpfs/tmpfs \
         $(USPACEDIR)/srv/fs/fat/fat

boot/arch/arm32/loader/Makefile

@@ -102 +102 @@
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/cli/cli
+        $(USPACEDIR)/app/bdsh/bdsh
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

boot/arch/ia32/Makefile.inc

@@ -49 +49 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/cli/cli \
         $(USPACEDIR)/app/klog/klog \
         $(USPACEDIR)/app/bdsh/bdsh

boot/arch/mips32/loader/Makefile

@@ -101 +101 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/cli/cli \
+        $(USPACEDIR)/app/bdsh/bdsh \
         $(USPACEDIR)/app/klog/klog
 

boot/arch/ppc32/loader/Makefile

@@ -97 +97 @@
         $(USPACEDIR)/app/tester/tester \
         $(USPACEDIR)/app/klog/klog \
-        $(USPACEDIR)/app/cli/cli
+        $(USPACEDIR)/app/bdsh/bdsh
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))

boot/arch/sparc64/loader/Makefile

@@ -99 +99 @@
         $(USPACEDIR)/app/tetris/tetris \
         $(USPACEDIR)/app/tester/tester \
-        $(USPACEDIR)/app/cli/cli \
+        $(USPACEDIR)/app/bdsh/bdsh \
         $(USPACEDIR)/app/klog/klog
 

uspace/Makefile

@@ -49 +49 @@
         app/tetris \
         app/tester \
-        app/cli \
         app/klog \
         app/init \

uspace/app/init/init.c

@@ -99 +99 @@
         info_print();
         sleep(5);       // FIXME
-        bool has_tmpfs = false;
-        bool has_fat = false;
         
-        if (!(has_tmpfs = mount_fs("tmpfs")) && !(has_fat = mount_fs("fat"))) {
+        if (!mount_fs("tmpfs") && !mount_fs("fat")) {
                 printf(NAME ": Exiting\n");
                 return -1;
@@ -115 +113 @@
         version_print();
         
-        /*
-         * Spawn file system servers that were not loaded as init tasks.
-         */
-        if (!has_fat)
-                spawn("/sbin/fat");
-        if (!has_tmpfs)
-                spawn("/sbin/tmpfs");
-                
-        spawn("/sbin/tetris");
-        spawn("/sbin/cli");
-        // FIXME: spawn("/sbin/tester");
-        spawn("/sbin/klog");
         spawn("/sbin/bdsh");