diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:42:39 +0100 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-08-16 09:45:21 +0100 |
| commit | 517cf74f6265ec4308b790b637b3f9778cbdc6e0 (patch) | |
| tree | be9337069b60ca1bb03565d8575bacfc71181003 /init | |
| parent | ae65dc37bcc9b1d9cef0b111131c79dc4ba1bf51 (diff) | |
| parent | ac78f2ac96b3efd6551a08e7dc609efa1fb69481 (diff) | |
| download | busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.gz busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.tar.bz2 busybox-w32-517cf74f6265ec4308b790b637b3f9778cbdc6e0.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'init')
| -rw-r--r-- | init/bootchartd.c | 2 | ||||
| -rw-r--r-- | init/init.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/init/bootchartd.c b/init/bootchartd.c index 4377d90e3..750f67356 100644 --- a/init/bootchartd.c +++ b/init/bootchartd.c | |||
| @@ -208,7 +208,7 @@ static char *make_tempdir(void) | |||
| 208 | bb_perror_msg_and_die("can't %smount tmpfs", "un"); | 208 | bb_perror_msg_and_die("can't %smount tmpfs", "un"); |
| 209 | } | 209 | } |
| 210 | #else | 210 | #else |
| 211 | bb_perror_msg_and_die("can't create temporary directory"); | 211 | bb_simple_perror_msg_and_die("can't create temporary directory"); |
| 212 | #endif | 212 | #endif |
| 213 | } else { | 213 | } else { |
| 214 | xchdir(tempdir); | 214 | xchdir(tempdir); |
diff --git a/init/init.c b/init/init.c index 87086b48b..0f3c5fa4d 100644 --- a/init/init.c +++ b/init/init.c | |||
| @@ -1086,7 +1086,7 @@ int init_main(int argc UNUSED_PARAM, char **argv) | |||
| 1086 | if (getpid() != 1 | 1086 | if (getpid() != 1 |
| 1087 | && (!ENABLE_LINUXRC || applet_name[0] != 'l') /* not linuxrc? */ | 1087 | && (!ENABLE_LINUXRC || applet_name[0] != 'l') /* not linuxrc? */ |
| 1088 | ) { | 1088 | ) { |
| 1089 | bb_error_msg_and_die("must be run as PID 1"); | 1089 | bb_simple_error_msg_and_die("must be run as PID 1"); |
| 1090 | } | 1090 | } |
| 1091 | #ifdef RB_DISABLE_CAD | 1091 | #ifdef RB_DISABLE_CAD |
| 1092 | /* Turn off rebooting via CTL-ALT-DEL - we get a | 1092 | /* Turn off rebooting via CTL-ALT-DEL - we get a |