diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:43 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-03 21:00:43 +0000 |
| commit | 8f8f268cfdecb4cabeb2e649a73afc7a485aeff5 (patch) | |
| tree | 8c555cc94aca9fabd177526e554d93bed4886642 /init | |
| parent | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (diff) | |
| download | busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.gz busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.tar.bz2 busybox-w32-8f8f268cfdecb4cabeb2e649a73afc7a485aeff5.zip | |
bb_applet_name -> applet_name
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 2 | ||||
| -rw-r--r-- | init/init.c | 4 | ||||
| -rw-r--r-- | init/init_shared.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/init/halt.c b/init/halt.c index d796a4aea..2ac210e59 100644 --- a/init/halt.c +++ b/init/halt.c | |||
| @@ -31,7 +31,7 @@ RB_AUTOBOOT | |||
| 31 | int which, flags, rc = 1; | 31 | int which, flags, rc = 1; |
| 32 | 32 | ||
| 33 | /* Figure out which applet we're running */ | 33 | /* Figure out which applet we're running */ |
| 34 | for(which=0;delay[which]!=*bb_applet_name;which++); | 34 | for(which=0;delay[which]!=*applet_name;which++); |
| 35 | 35 | ||
| 36 | /* Parse and handle arguments */ | 36 | /* Parse and handle arguments */ |
| 37 | flags = getopt32(argc, argv, "d:nf", &delay); | 37 | flags = getopt32(argc, argv, "d:nf", &delay); |
diff --git a/init/init.c b/init/init.c index d7d14a2d5..8257b7fb0 100644 --- a/init/init.c +++ b/init/init.c | |||
| @@ -195,7 +195,7 @@ static void message(int device, const char *fmt, ...) | |||
| 195 | /* Log the message to syslogd */ | 195 | /* Log the message to syslogd */ |
| 196 | if (device & LOG) { | 196 | if (device & LOG) { |
| 197 | /* don`t out "\r\n" */ | 197 | /* don`t out "\r\n" */ |
| 198 | openlog(bb_applet_name, 0, LOG_DAEMON); | 198 | openlog(applet_name, 0, LOG_DAEMON); |
| 199 | syslog(LOG_INFO, "%s", msg + 1); | 199 | syslog(LOG_INFO, "%s", msg + 1); |
| 200 | closelog(); | 200 | closelog(); |
| 201 | } | 201 | } |
| @@ -982,7 +982,7 @@ int init_main(int argc, char **argv) | |||
| 982 | #if !ENABLE_DEBUG_INIT | 982 | #if !ENABLE_DEBUG_INIT |
| 983 | /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ | 983 | /* Expect to be invoked as init with PID=1 or be invoked as linuxrc */ |
| 984 | if (getpid() != 1 && | 984 | if (getpid() != 1 && |
| 985 | (!ENABLE_FEATURE_INITRD || !strstr(bb_applet_name, "linuxrc"))) | 985 | (!ENABLE_FEATURE_INITRD || !strstr(applet_name, "linuxrc"))) |
| 986 | { | 986 | { |
| 987 | bb_show_usage(); | 987 | bb_show_usage(); |
| 988 | } | 988 | } |
diff --git a/init/init_shared.c b/init/init_shared.c index 5e46abf09..47480fc21 100644 --- a/init/init_shared.c +++ b/init/init_shared.c | |||
| @@ -31,7 +31,7 @@ int bb_shutdown_system(unsigned long magic) | |||
| 31 | #endif | 31 | #endif |
| 32 | reboot(RB_ENABLE_CAD); | 32 | reboot(RB_ENABLE_CAD); |
| 33 | 33 | ||
| 34 | openlog(bb_applet_name, 0, pri); | 34 | openlog(applet_name, 0, pri); |
| 35 | 35 | ||
| 36 | message = "\nThe system is going down NOW !!"; | 36 | message = "\nThe system is going down NOW !!"; |
| 37 | syslog(pri, "%s", message); | 37 | syslog(pri, "%s", message); |