diff options
author | Denys Vlasenko | 2010-10-12 13:47:15 +0200 |
---|---|---|
committer | Denys Vlasenko | 2010-10-12 13:47:15 +0200 |
commit | b1db09be5a19f814ed5dc7e0ab095c3355926da6 (patch) | |
tree | 382ba65d4a9194cb1b694e4240a0cf005bf567f1 /include | |
parent | d4d289acf5eb59ebae414f9aae8a74de30dce36a (diff) | |
download | busybox-b1db09be5a19f814ed5dc7e0ab095c3355926da6.zip busybox-b1db09be5a19f814ed5dc7e0ab095c3355926da6.tar.gz |
init/*: move applet/kbuild/config/help bits into applet source files
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/applets.src.h | 7 | ||||
-rw-r--r-- | include/usage.src.h | 169 |
2 files changed, 0 insertions, 176 deletions
diff --git a/include/applets.src.h b/include/applets.src.h index 6a14a65..545d3c5 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -72,7 +72,6 @@ IF_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_DROP, ba IF_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_DROP)) IF_BEEP(APPLET(beep, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_BLKID(APPLET(blkid, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_BOOTCHARTD(APPLET(bootchartd, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_BZIP2(APPLET(bzip2, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_CAL(APPLET(cal, _BB_DIR_USR_BIN, _BB_SUID_DROP)) @@ -165,7 +164,6 @@ IF_GETSEBOOL(APPLET(getsebool, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_GETTY(APPLET(getty, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_GUNZIP(APPLET(gunzip, _BB_DIR_BIN, _BB_SUID_DROP)) IF_GZIP(APPLET(gzip, _BB_DIR_BIN, _BB_SUID_DROP)) -IF_HALT(APPLET(halt, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_HD(APPLET_NOEXEC(hd, hexdump, _BB_DIR_USR_BIN, _BB_SUID_DROP, hd)) IF_HDPARM(APPLET(hdparm, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_HEAD(APPLET_NOEXEC(head, head, _BB_DIR_USR_BIN, _BB_SUID_DROP, head)) @@ -181,7 +179,6 @@ IF_IFENSLAVE(APPLET(ifenslave, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_IFPLUGD(APPLET(ifplugd, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_IFUPDOWN(APPLET_ODDNAME(ifup, ifupdown, _BB_DIR_SBIN, _BB_SUID_DROP, ifup)) IF_INETD(APPLET(inetd, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) -IF_INIT(APPLET(init, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_INOTIFYD(APPLET(inotifyd, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_INSMOD(APPLET(insmod, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, _BB_DIR_SBIN, _BB_SUID_DROP, modprobe)) @@ -212,7 +209,6 @@ IF_LENGTH(APPLET_NOFORK(length, length, _BB_DIR_USR_BIN, _BB_SUID_DROP, length)) IF_LESS(APPLET(less, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_SETARCH(APPLET_ODDNAME(linux32, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux32)) IF_SETARCH(APPLET_ODDNAME(linux64, setarch, _BB_DIR_BIN, _BB_SUID_DROP, linux64)) -IF_FEATURE_INITRD(APPLET_ODDNAME(linuxrc, init, _BB_DIR_ROOT, _BB_SUID_DROP, linuxrc)) IF_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN, _BB_SUID_DROP, ln)) IF_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) @@ -241,7 +237,6 @@ IF_MAN(APPLET(man, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_MATCHPATHCON(APPLET(matchpathcon, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, _BB_DIR_USR_BIN, _BB_SUID_DROP, md5sum)) IF_MDEV(APPLET(mdev, _BB_DIR_SBIN, _BB_SUID_DROP)) -IF_MESG(APPLET(mesg, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_MICROCOM(APPLET(microcom, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, _BB_DIR_BIN, _BB_SUID_DROP, mkdir)) IF_MKFS_VFAT(APPLET_ODDNAME(mkdosfs, mkfs_vfat, _BB_DIR_SBIN, _BB_SUID_DROP, mkfs_vfat)) @@ -284,7 +279,6 @@ IF_PIPE_PROGRESS(APPLET(pipe_progress, _BB_DIR_BIN, _BB_SUID_DROP)) IF_PIVOT_ROOT(APPLET(pivot_root, _BB_DIR_SBIN, _BB_SUID_DROP)) IF_PKILL(APPLET_ODDNAME(pkill, pgrep, _BB_DIR_USR_BIN, _BB_SUID_DROP, pkill)) IF_POPMAILDIR(APPLET(popmaildir, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) -IF_HALT(APPLET_ODDNAME(poweroff, halt, _BB_DIR_SBIN, _BB_SUID_DROP, poweroff)) IF_PRINTENV(APPLET_NOFORK(printenv, printenv, _BB_DIR_BIN, _BB_SUID_DROP, printenv)) IF_PRINTF(APPLET_NOFORK(printf, printf, _BB_DIR_USR_BIN, _BB_SUID_DROP, printf)) IF_PS(APPLET(ps, _BB_DIR_BIN, _BB_SUID_DROP)) @@ -297,7 +291,6 @@ IF_READAHEAD(APPLET(readahead, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_READLINK(APPLET(readlink, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_READPROFILE(APPLET(readprofile, _BB_DIR_USR_SBIN, _BB_SUID_DROP)) IF_REALPATH(APPLET(realpath, _BB_DIR_USR_BIN, _BB_SUID_DROP)) -IF_HALT(APPLET_ODDNAME(reboot, halt, _BB_DIR_SBIN, _BB_SUID_DROP, reboot)) IF_REFORMIME(APPLET(reformime, _BB_DIR_BIN, _BB_SUID_DROP)) IF_RENICE(APPLET(renice, _BB_DIR_USR_BIN, _BB_SUID_DROP)) IF_RESET(APPLET(reset, _BB_DIR_USR_BIN, _BB_SUID_DROP)) diff --git a/include/usage.src.h b/include/usage.src.h index 5552503..084427c 100644 --- a/include/usage.src.h +++ b/include/usage.src.h @@ -1515,36 +1515,6 @@ INSERT "$ ls -la /tmp/busybox*\n" \ "-rw-rw-r-- 1 andersen andersen 554058 Apr 14 17:49 /tmp/busybox.tar.gz\n" -#define halt_trivial_usage \ - "[-d DELAY] [-n] [-f]" IF_FEATURE_WTMP(" [-w]") -#define halt_full_usage "\n\n" \ - "Halt the system\n" \ - "\nOptions:" \ - "\n -d SEC Delay interval" \ - "\n -n Do not sync" \ - "\n -f Force (don't go through init)" \ - IF_FEATURE_WTMP( \ - "\n -w Only write a wtmp record" \ - ) - -#define poweroff_trivial_usage \ - "[-d DELAY] [-n] [-f]" -#define poweroff_full_usage "\n\n" \ - "Halt and shut off power\n" \ - "\nOptions:" \ - "\n -d SEC Delay interval" \ - "\n -n Do not sync" \ - "\n -f Force (don't go through init)" \ - -#define reboot_trivial_usage \ - "[-d DELAY] [-n] [-f]" -#define reboot_full_usage "\n\n" \ - "Reboot the system\n" \ - "\nOptions:" \ - "\n -d SEC Delay interval" \ - "\n -n Do not sync" \ - "\n -f Force (don't go through init)" \ - #define hdparm_trivial_usage \ "[OPTIONS] [DEVICE]" #define hdparm_full_usage "\n\n" \ @@ -1863,138 +1833,6 @@ INSERT "\n -R N Pause services after N connects/min" \ "\n (default: 0 - disabled)" \ -#define init_trivial_usage \ - "" -#define init_full_usage "\n\n" \ - "Init is the parent of all processes" - -#define init_notes_usage \ -"This version of init is designed to be run only by the kernel.\n" \ -"\n" \ -"BusyBox init doesn't support multiple runlevels. The runlevels field of\n" \ -"the /etc/inittab file is completely ignored by BusyBox init. If you want\n" \ -"runlevels, use sysvinit.\n" \ -"\n" \ -"BusyBox init works just fine without an inittab. If no inittab is found,\n" \ -"it has the following default behavior:\n" \ -"\n" \ -" ::sysinit:/etc/init.d/rcS\n" \ -" ::askfirst:/bin/sh\n" \ -" ::ctrlaltdel:/sbin/reboot\n" \ -" ::shutdown:/sbin/swapoff -a\n" \ -" ::shutdown:/bin/umount -a -r\n" \ -" ::restart:/sbin/init\n" \ -"\n" \ -"if it detects that /dev/console is _not_ a serial console, it will also run:\n" \ -"\n" \ -" tty2::askfirst:/bin/sh\n" \ -" tty3::askfirst:/bin/sh\n" \ -" tty4::askfirst:/bin/sh\n" \ -"\n" \ -"If you choose to use an /etc/inittab file, the inittab entry format is as follows:\n" \ -"\n" \ -" <id>:<runlevels>:<action>:<process>\n" \ -"\n" \ -" <id>:\n" \ -"\n" \ -" WARNING: This field has a non-traditional meaning for BusyBox init!\n" \ -" The id field is used by BusyBox init to specify the controlling tty for\n" \ -" the specified process to run on. The contents of this field are\n" \ -" appended to \"/dev/\" and used as-is. There is no need for this field to\n" \ -" be unique, although if it isn't you may have strange results. If this\n" \ -" field is left blank, the controlling tty is set to the console. Also\n" \ -" note that if BusyBox detects that a serial console is in use, then only\n" \ -" entries whose controlling tty is either the serial console or /dev/null\n" \ -" will be run. BusyBox init does nothing with utmp. We don't need no\n" \ -" stinkin' utmp.\n" \ -"\n" \ -" <runlevels>:\n" \ -"\n" \ -" The runlevels field is completely ignored.\n" \ -"\n" \ -" <action>:\n" \ -"\n" \ -" Valid actions include: sysinit, respawn, askfirst, wait,\n" \ -" once, restart, ctrlaltdel, and shutdown.\n" \ -"\n" \ -" The available actions can be classified into two groups: actions\n" \ -" that are run only once, and actions that are re-run when the specified\n" \ -" process exits.\n" \ -"\n" \ -" Run only-once actions:\n" \ -"\n" \ -" 'sysinit' is the first item run on boot. init waits until all\n" \ -" sysinit actions are completed before continuing. Following the\n" \ -" completion of all sysinit actions, all 'wait' actions are run.\n" \ -" 'wait' actions, like 'sysinit' actions, cause init to wait until\n" \ -" the specified task completes. 'once' actions are asynchronous,\n" \ -" therefore, init does not wait for them to complete. 'restart' is\n" \ -" the action taken to restart the init process. By default this should\n" \ -" simply run /sbin/init, but can be a script which runs pivot_root or it\n" \ -" can do all sorts of other interesting things. The 'ctrlaltdel' init\n" \ -" actions are run when the system detects that someone on the system\n" \ -" console has pressed the CTRL-ALT-DEL key combination. Typically one\n" \ -" wants to run 'reboot' at this point to cause the system to reboot.\n" \ -" Finally the 'shutdown' action specifies the actions to taken when\n" \ -" init is told to reboot. Unmounting filesystems and disabling swap\n" \ -" is a very good here.\n" \ -"\n" \ -" Run repeatedly actions:\n" \ -"\n" \ -" 'respawn' actions are run after the 'once' actions. When a process\n" \ -" started with a 'respawn' action exits, init automatically restarts\n" \ -" it. Unlike sysvinit, BusyBox init does not stop processes from\n" \ -" respawning out of control. The 'askfirst' actions acts just like\n" \ -" respawn, except that before running the specified process it\n" \ -" displays the line \"Please press Enter to activate this console.\"\n" \ -" and then waits for the user to press enter before starting the\n" \ -" specified process.\n" \ -"\n" \ -" Unrecognized actions (like initdefault) will cause init to emit an\n" \ -" error message, and then go along with its business. All actions are\n" \ -" run in the order they appear in /etc/inittab.\n" \ -"\n" \ -" <process>:\n" \ -"\n" \ -" Specifies the process to be executed and its command line.\n" \ -"\n" \ -"Example /etc/inittab file:\n" \ -"\n" \ -" # This is run first except when booting in single-user mode\n" \ -" #\n" \ -" ::sysinit:/etc/init.d/rcS\n" \ -" \n" \ -" # /bin/sh invocations on selected ttys\n" \ -" #\n" \ -" # Start an \"askfirst\" shell on the console (whatever that may be)\n" \ -" ::askfirst:-/bin/sh\n" \ -" # Start an \"askfirst\" shell on /dev/tty2-4\n" \ -" tty2::askfirst:-/bin/sh\n" \ -" tty3::askfirst:-/bin/sh\n" \ -" tty4::askfirst:-/bin/sh\n" \ -" \n" \ -" # /sbin/getty invocations for selected ttys\n" \ -" #\n" \ -" tty4::respawn:/sbin/getty 38400 tty4\n" \ -" tty5::respawn:/sbin/getty 38400 tty5\n" \ -" \n" \ -" \n" \ -" # Example of how to put a getty on a serial line (for a terminal)\n" \ -" #\n" \ -" #::respawn:/sbin/getty -L ttyS0 9600 vt100\n" \ -" #::respawn:/sbin/getty -L ttyS1 9600 vt100\n" \ -" #\n" \ -" # Example how to put a getty on a modem line\n" \ -" #::respawn:/sbin/getty 57600 ttyS2\n" \ -" \n" \ -" # Stuff to do when restarting the init process\n" \ -" ::restart:/sbin/init\n" \ -" \n" \ -" # Stuff to do before rebooting\n" \ -" ::ctrlaltdel:/sbin/reboot\n" \ -" ::shutdown:/bin/umount -a -r\n" \ -" ::shutdown:/sbin/swapoff -a\n" - #define inotifyd_trivial_usage \ "PROG FILE1[:MASK]..." #define inotifyd_full_usage "\n\n" \ @@ -2651,13 +2489,6 @@ INSERT "the last line match .* to override this.)\n\n" \ ) -#define mesg_trivial_usage \ - "[y|n]" -#define mesg_full_usage "\n\n" \ - "Control write access to your terminal\n" \ - " y Allow write access to your terminal\n" \ - " n Disallow write access to your terminal" - #define microcom_trivial_usage \ "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY" #define microcom_full_usage "\n\n" \ |