Nicolas Thill
15 years ago
parent
6fa03d63d4
commit
91750d01a7
@ -1,20 +1,15 @@
|
||||
--- a/init/init.c
|
||||
+++ b/init/init.c
|
||||
@@ -497,12 +497,11 @@ static void run_actions(int action_type)
|
||||
for (a = init_action_list; a; a = tmp) {
|
||||
tmp = a->next;
|
||||
if (a->action_type & action_type) {
|
||||
- // Pointless: run() will error out if open of device fails.
|
||||
- ///* a->terminal of "" means "init's console" */
|
||||
- //if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
|
||||
- // //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
|
||||
- // delete_init_action(a);
|
||||
- //} else
|
||||
+ /* a->terminal of "" means "init's console" */
|
||||
+ if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
|
||||
+ //message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
|
||||
+ delete_init_action(a);
|
||||
+ } else
|
||||
if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
|
||||
waitfor(run(a));
|
||||
delete_init_action(a);
|
||||
@@ -451,8 +451,11 @@ static void run_actions(int action_type)
|
||||
/* Only run stuff with pid == 0. If pid != 0,
|
||||
* it is already running
|
||||
*/
|
||||
- if (a->pid == 0)
|
||||
+ if (a->pid == 0) {
|
||||
+ if (a->terminal && access(a->terminal, R_OK | W_OK))
|
||||
+ continue;
|
||||
a->pid = run(a);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- a/miscutils/watchdog.c
|
||||
+++ b/miscutils/watchdog.c
|
||||
@@ -10,7 +10,8 @@
|
||||
*/
|
||||
|
||||
#include "libbb.h"
|
||||
-#include "linux/watchdog.h"
|
||||
+#include <linux/types.h>
|
||||
+#include <linux/watchdog.h>
|
||||
|
||||
#define OPT_FOREGROUND (1 << 0)
|
||||
#define OPT_STIMER (1 << 1)
|
||||
@ -1,13 +0,0 @@
|
||||
--- a/coreutils/df.c
|
||||
+++ b/coreutils/df.c
|
||||
@@ -53,8 +53,8 @@ int df_main(int argc, char **argv)
|
||||
OPT_ALL = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
|
||||
OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
|
||||
OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
|
||||
- OPT_HUMAN = (1 << 5) * ENABLE_FEATURE_HUMAN_READABLE,
|
||||
- OPT_MEGA = (1 << 6) * ENABLE_FEATURE_HUMAN_READABLE,
|
||||
+ OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
|
||||
+ OPT_MEGA = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
|
||||
};
|
||||
const char *disp_units_hdr = NULL;
|
||||
char *chp;
|
||||
Loading…
Reference in New Issue