← Commit list

d00c26284

Eric Andersen
Eric Andersen
1999-12-07
SUCCESS Duration: 4s

Subject

Stuf

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Debian 14.2.0-19) 14.2.0

—

Build Log

(log yok)

Commit Diff GitHub →

Changelog +6 -5Makefile +2 -2applets/install.sh +1 -2busybox.def.h +2 -0init.c +51 -23init/init.c +51 -23install.sh +1 -2umount.c +6 -0util-linux/umount.c +6 -0
Changelog+6 -5
@@ -1,7 +1,7 @@
0.38
* Fixed a segfault in 'umount -a' when a badly formed /etc/fstab
file existed.
- * df will not exit on error, but will try to stat all mounted filesystems.
+ * df will not exit on error, but will stat all mounted filesystems.
* Fixed tar so uid/gid/permissions on extracted tarballs will be correct.
* Fixed find -name so it properly uses shell wildcard patterns
(i.e. `*', `?', and `[]') instead of regular expressions, which
@@ -10,11 +10,12 @@
kernel messages.
* syslogd now creates the /dev/log socket to make sure it is there, and
is actually a socket with the right permissions.
- * I've taken a first step to making busybox not need the /proc filesystem.
- Most apps don't need it. Those that _require_ it, will complain
- if you enable them when you disable BB_FEATURE_USE_PROCFS.
+ * I've taken a first step to making busybox not need the /proc
+ filesystem. Most apps don't need it. Those that _require_ it,
+ will complain if you enable them when you disable
+ BB_FEATURE_USE_PROCFS.
- -Erik Andrsen
+ -Erik Andrsen, Dec 5, 1999
0.37
* Wrote a micro syslogd, and a logger util (to log things to the syslog
Makefile+2 -2
@@ -73,7 +73,7 @@ else
endif
ifndef $(PREFIX)
- PREFIX=`pwd`/busybox_install
+ PREFIX=`pwd`/_install
endif
LIBRARIES=
@@ -95,7 +95,7 @@ busybox.links:
clean:
- rm -f $(PROG) busybox.links *~ *.o core
- - rm -rf busybox_install
+ - rm -rf _install
distclean: clean
- rm -f $(PROG)
applets/install.sh+1 -2
@@ -12,8 +12,7 @@ h=`sort busybox.links | uniq`
for i in $h ; do
echo " $1$i -> /bin/busybox"
mkdir -p $1/`echo $i | sed -e 's/\/[^\/]*$//' `
- rm -f $1$i
- ln -s /bin/busybox $1$i
+ ln -fs /bin/busybox $1$i
done
rm -f $1/bin/busybox
install -m 755 busybox $1/bin/busybox
busybox.def.h+2 -0
@@ -74,6 +74,8 @@
// pretty/useful).
//
//
+// enable a second console on VT2 in init
+#define BB_FEATURE_INIT_SECOND_CONSOLE
// enable features that use the /proc filesystem
#define BB_FEATURE_USE_PROCFS
//Enable init being called as /linuxrc
init.c+51 -23
@@ -55,6 +55,7 @@
#define VT_LOG "/dev/tty3" /* Virtual console */
#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */
#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */
+#define GETTY "/sbin/getty" /* Default location of getty */
#define SHELL "/bin/sh" /* Default shell */
#define INITSCRIPT "/etc/init.d/rcS" /* Initscript. */
@@ -446,15 +447,19 @@ static void reboot_signal(int sig)
extern int init_main(int argc, char **argv)
{
- int run_rc = TRUE;
- int wait_for_enter = TRUE;
+ int run_rc = FALSE;
+ int single = FALSE;
+ int wait_for_enter_tty1 = TRUE;
+ int wait_for_enter_tty2 = TRUE;
pid_t pid1 = 0;
pid_t pid2 = 0;
struct stat statbuf;
const char* const rc_script_command[] = { INITSCRIPT, INITSCRIPT, 0};
+ const char* const getty1_command[] = { GETTY, GETTY, VT_PRIMARY, 0};
+ const char* const getty2_command[] = { GETTY, GETTY, VT_SECONDARY, 0};
const char* const shell_command[] = { SHELL, "-" SHELL, 0};
- const char* const* tty0_command = shell_command;
const char* const* tty1_command = shell_command;
+ const char* const* tty2_command = shell_command;
#ifdef BB_INIT_CMD_IF_RC_SCRIPT_EXITS
const char* const rc_exit_command[] = { "BB_INIT_CMD_IF_RC_SCRIPT_EXITS",
"BB_INIT_CMD_IF_RC_SCRIPT_EXITS", 0 };
@@ -477,13 +482,6 @@ extern int init_main(int argc, char **argv)
}
#endif
- /* Check if we are supposed to be in single user mode */
- if ( argc > 1 && (!strcmp(argv[1], "single") ||
- !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
- run_rc = FALSE;
- }
-
-
/* Set up sig handlers -- be sure to
* clear all of these in run() */
signal(SIGUSR1, halt_signal);
@@ -529,27 +527,55 @@ extern int init_main(int argc, char **argv)
/* Make sure there is enough memory to do something useful. */
check_memory();
+ /* Check if we are supposed to be in single user mode */
+ if ( argc > 1 && (!strcmp(argv[1], "single") ||
+ !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
+ single = TRUE;
+ tty1_command = shell_command;
+ tty2_command = shell_command;
+ }
/* Make sure an init script exists before trying to run it */
- if (run_rc == TRUE && stat(INITSCRIPT, &statbuf)==0) {
- wait_for_enter = FALSE;
- tty0_command = rc_script_command;
+ if (single==FALSE && stat(INITSCRIPT, &statbuf)==0) {
+ run_rc = TRUE;
+ wait_for_enter_tty1 = FALSE;
+ tty1_command = rc_script_command;
}
+
+ /* Make sure /sbin/getty exists before trying to run it */
+ if (stat(GETTY, &statbuf)==0) {
+ char* where;
+ wait_for_enter_tty2 = FALSE;
+ where = strrchr( console, '/');
+ if ( where != NULL) {
+ strcpy( (char*)getty2_command[2], where);
+ }
+ tty2_command = getty2_command;
+ /* Check on hooking a getty onto tty1 */
+ if (run_rc == FALSE && single==FALSE) {
+ wait_for_enter_tty1 = FALSE;
+ where = strrchr( second_console, '/');
+ if ( where != NULL) {
+ strcpy( (char*)getty1_command[2], where);
+ }
+ tty1_command = getty1_command;
+ }
+ }
+
-
- /* Ok, now launch the rc script and/or prepare to
- * start up some VTs if somebody hits enter...
- */
+ /* Ok, now launch the tty1_command and tty2_command */
for (;;) {
pid_t wpid;
int status;
- if (pid1 == 0 && tty0_command) {
- pid1 = run(tty0_command, console, wait_for_enter);
+ if (pid1 == 0 && tty1_command) {
+ pid1 = run(tty1_command, console, wait_for_enter_tty1);
}
- if (pid2 == 0 && tty1_command && second_console) {
- pid2 = run(tty1_command, second_console, TRUE);
+#ifdef BB_FEATURE_INIT_SECOND_CONSOLE
+ if (pid2 == 0 && tty2_command && second_console) {
+ pid2 = run(tty2_command, second_console, wait_for_enter_tty2);
}
+#endif
wpid = wait(&status);
if (wpid > 0 ) {
message(LOG, "pid %d exited, status=%x.\n", wpid, status);
@@ -563,14 +589,16 @@ extern int init_main(int argc, char **argv)
else {
pid1 = 0;
run_rc=FALSE;
- wait_for_enter=TRUE;
- tty0_command=rc_exit_command;
+ wait_for_enter_tty1=TRUE;
+ tty1_command=rc_exit_command;
}
#endif
}
+#ifdef BB_FEATURE_INIT_SECOND_CONSOLE
if (wpid == pid2) {
pid2 = 0;
}
+#endif
sleep(1);
}
}
init/init.c+51 -23
@@ -55,6 +55,7 @@
#define VT_LOG "/dev/tty3" /* Virtual console */
#define SERIAL_CON0 "/dev/ttyS0" /* Primary serial console */
#define SERIAL_CON1 "/dev/ttyS1" /* Serial console */
+#define GETTY "/sbin/getty" /* Default location of getty */
#define SHELL "/bin/sh" /* Default shell */
#define INITSCRIPT "/etc/init.d/rcS" /* Initscript. */
@@ -446,15 +447,19 @@ static void reboot_signal(int sig)
extern int init_main(int argc, char **argv)
{
- int run_rc = TRUE;
- int wait_for_enter = TRUE;
+ int run_rc = FALSE;
+ int single = FALSE;
+ int wait_for_enter_tty1 = TRUE;
+ int wait_for_enter_tty2 = TRUE;
pid_t pid1 = 0;
pid_t pid2 = 0;
struct stat statbuf;
const char* const rc_script_command[] = { INITSCRIPT, INITSCRIPT, 0};
+ const char* const getty1_command[] = { GETTY, GETTY, VT_PRIMARY, 0};
+ const char* const getty2_command[] = { GETTY, GETTY, VT_SECONDARY, 0};
const char* const shell_command[] = { SHELL, "-" SHELL, 0};
- const char* const* tty0_command = shell_command;
const char* const* tty1_command = shell_command;
+ const char* const* tty2_command = shell_command;
#ifdef BB_INIT_CMD_IF_RC_SCRIPT_EXITS
const char* const rc_exit_command[] = { "BB_INIT_CMD_IF_RC_SCRIPT_EXITS",
"BB_INIT_CMD_IF_RC_SCRIPT_EXITS", 0 };
@@ -477,13 +482,6 @@ extern int init_main(int argc, char **argv)
}
#endif
- /* Check if we are supposed to be in single user mode */
- if ( argc > 1 && (!strcmp(argv[1], "single") ||
- !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
- run_rc = FALSE;
- }
-
-
/* Set up sig handlers -- be sure to
* clear all of these in run() */
signal(SIGUSR1, halt_signal);
@@ -529,27 +527,55 @@ extern int init_main(int argc, char **argv)
/* Make sure there is enough memory to do something useful. */
check_memory();
+ /* Check if we are supposed to be in single user mode */
+ if ( argc > 1 && (!strcmp(argv[1], "single") ||
+ !strcmp(argv[1], "-s") || !strcmp(argv[1], "1"))) {
+ single = TRUE;
+ tty1_command = shell_command;
+ tty2_command = shell_command;
+ }
/* Make sure an init script exists before trying to run it */
- if (run_rc == TRUE && stat(INITSCRIPT, &statbuf)==0) {
- wait_for_enter = FALSE;
- tty0_command = rc_script_command;
+ if (single==FALSE && stat(INITSCRIPT, &statbuf)==0) {
+ run_rc = TRUE;
+ wait_for_enter_tty1 = FALSE;
+ tty1_command = rc_script_command;
}
+
+ /* Make sure /sbin/getty exists before trying to run it */
+ if (stat(GETTY, &statbuf)==0) {
+ char* where;
+ wait_for_enter_tty2 = FALSE;
+ where = strrchr( console, '/');
+ if ( where != NULL) {
+ strcpy( (char*)getty2_command[2], where);
+ }
+ tty2_command = getty2_command;
+ /* Check on hooking a getty onto tty1 */
+ if (run_rc == FALSE && single==FALSE) {
+ wait_for_enter_tty1 = FALSE;
+ where = strrchr( second_console, '/');
+ if ( where != NULL) {
+ strcpy( (char*)getty1_command[2], where);
+ }
+ tty1_command = getty1_command;
+ }
+ }
+
-
- /* Ok, now launch the rc script and/or prepare to
- * start up some VTs if somebody hits enter...
- */
+ /* Ok, now launch the tty1_command and tty2_command */
for (;;) {
pid_t wpid;
int status;
- if (pid1 == 0 && tty0_command) {
- pid1 = run(tty0_command, console, wait_for_enter);
+ if (pid1 == 0 && tty1_command) {
+ pid1 = run(tty1_command, console, wait_for_enter_tty1);
}
- if (pid2 == 0 && tty1_command && second_console) {
- pid2 = run(tty1_command, second_console, TRUE);
+#ifdef BB_FEATURE_INIT_SECOND_CONSOLE
+ if (pid2 == 0 && tty2_command && second_console) {
+ pid2 = run(tty2_command, second_console, wait_for_enter_tty2);
}
+#endif
wpid = wait(&status);
if (wpid > 0 ) {
message(LOG, "pid %d exited, status=%x.\n", wpid, status);
@@ -563,14 +589,16 @@ extern int init_main(int argc, char **argv)
else {
pid1 = 0;
run_rc=FALSE;
- wait_for_enter=TRUE;
- tty0_command=rc_exit_command;
+ wait_for_enter_tty1=TRUE;
+ tty1_command=rc_exit_command;
}
#endif
}
+#ifdef BB_FEATURE_INIT_SECOND_CONSOLE
if (wpid == pid2) {
pid2 = 0;
}
+#endif
sleep(1);
}
}
install.sh+1 -2
@@ -12,8 +12,7 @@ h=`sort busybox.links | uniq`
for i in $h ; do
echo " $1$i -> /bin/busybox"
mkdir -p $1/`echo $i | sed -e 's/\/[^\/]*$//' `
- rm -f $1$i
- ln -s /bin/busybox $1$i
+ ln -fs /bin/busybox $1$i
done
rm -f $1/bin/busybox
install -m 755 busybox $1/bin/busybox
umount.c+6 -0
@@ -107,6 +107,12 @@ umount_all(int useMtab)
extern int
umount_main(int argc, char** argv)
{
+ int i=0;
+ char **foo=argv;
+ while(*foo) {
+ fprintf(stderr, "argv[%d]='%s'\n", i++, *foo);
+ foo++;
+ }
if (argc < 2) {
usage( umount_usage);
util-linux/umount.c+6 -0
@@ -107,6 +107,12 @@ umount_all(int useMtab)
extern int
umount_main(int argc, char** argv)
{
+ int i=0;
+ char **foo=argv;
+ while(*foo) {
+ fprintf(stderr, "argv[%d]='%s'\n", i++, *foo);
+ foo++;
+ }
if (argc < 2) {
usage( umount_usage);