From f560422fa079b07a761a572ca4f9cf287c2cc47e Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 10 Jan 2017 14:58:54 +0100 Subject: Big cleanup in config help and description Redundant help texts (one which only repeats the description) are deleted. Descriptions and help texts are trimmed. Some config options are moved, even across menus. No config option _names_ are changed. Signed-off-by: Denys Vlasenko --- init/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'init') diff --git a/init/init.c b/init/init.c index 08cfa2f8c..8db4ced58 100644 --- a/init/init.c +++ b/init/init.c @@ -104,13 +104,13 @@ //config: sets TERM to "vt102" if one is found. //config: //config:config FEATURE_INIT_MODIFY_CMDLINE -//config: bool "Modify the command-line to \"init\"" +//config: bool "Clear init's command line" //config: default y //config: depends on INIT || LINUXRC //config: help //config: When launched as PID 1 and after parsing its arguments, init //config: wipes all the arguments but argv[0] and rewrites argv[0] to -//config: contain only "init", so that its command-line appears solely as +//config: contain only "init", so that its command line appears solely as //config: "init" in tools such as ps. //config: If this option is set to Y, init will keep its original behavior, //config: otherwise, all the arguments including argv[0] will be preserved, -- cgit v1.2.3-55-g6feb From f35ad3bd1287627fc6ca7cc9c1f48b186257dd87 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 10 Jan 2017 15:24:13 +0100 Subject: init: rename FEATURE_EXTRA_QUIET -> FEATURE_INIT_QUIET The former name had no INIT anywhere in its name, sounded generic Signed-off-by: Denys Vlasenko --- configs/TEST_nommu_defconfig | 2 +- configs/TEST_noprintf_defconfig | 2 +- configs/TEST_rh9_defconfig | 2 +- configs/android2_defconfig | 2 +- configs/android_502_defconfig | 2 +- configs/android_defconfig | 2 +- configs/android_ndk_defconfig | 2 +- configs/cygwin_defconfig | 2 +- configs/freebsd_defconfig | 2 +- init/init.c | 10 ++++------ 10 files changed, 13 insertions(+), 15 deletions(-) (limited to 'init') diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig index d9ec41cd0..d7a9cfe25 100644 --- a/configs/TEST_nommu_defconfig +++ b/configs/TEST_nommu_defconfig @@ -387,7 +387,7 @@ CONFIG_FEATURE_KILL_REMOVED=y CONFIG_FEATURE_KILL_DELAY=1 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_LINUXRC=y CONFIG_HALT=y diff --git a/configs/TEST_noprintf_defconfig b/configs/TEST_noprintf_defconfig index c7330ed5d..adb6b7036 100644 --- a/configs/TEST_noprintf_defconfig +++ b/configs/TEST_noprintf_defconfig @@ -392,7 +392,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_LINUXRC is not set # CONFIG_HALT is not set diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig index 86e13cd53..0d72cdac9 100644 --- a/configs/TEST_rh9_defconfig +++ b/configs/TEST_rh9_defconfig @@ -404,7 +404,7 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_LINUXRC=y CONFIG_HALT=y diff --git a/configs/android2_defconfig b/configs/android2_defconfig index 9338f66ac..866a87989 100644 --- a/configs/android2_defconfig +++ b/configs/android2_defconfig @@ -422,7 +422,7 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_LINUXRC=y CONFIG_INIT_TERMINAL_TYPE="linux" diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig index 316063440..8d8dd250f 100644 --- a/configs/android_502_defconfig +++ b/configs/android_502_defconfig @@ -529,7 +529,7 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_LINUXRC=y CONFIG_INIT_TERMINAL_TYPE="linux" diff --git a/configs/android_defconfig b/configs/android_defconfig index cd3490c4e..1eaab9eae 100644 --- a/configs/android_defconfig +++ b/configs/android_defconfig @@ -445,7 +445,7 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_LINUXRC=y CONFIG_INIT_TERMINAL_TYPE="linux" diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig index f2773be46..dc9d21ce5 100644 --- a/configs/android_ndk_defconfig +++ b/configs/android_ndk_defconfig @@ -455,7 +455,7 @@ CONFIG_FEATURE_USE_INITTAB=y CONFIG_FEATURE_KILL_DELAY=0 CONFIG_FEATURE_INIT_SCTTY=y CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y +CONFIG_FEATURE_INIT_QUIET=y CONFIG_FEATURE_INIT_COREDUMPS=y CONFIG_LINUXRC=y CONFIG_INIT_TERMINAL_TYPE="linux" diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig index 816f76e65..37e3e210f 100644 --- a/configs/cygwin_defconfig +++ b/configs/cygwin_defconfig @@ -422,7 +422,7 @@ CONFIG_TELINIT_PATH="" CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_LINUXRC is not set CONFIG_INIT_TERMINAL_TYPE="" diff --git a/configs/freebsd_defconfig b/configs/freebsd_defconfig index d223b7230..90e0a8bda 100644 --- a/configs/freebsd_defconfig +++ b/configs/freebsd_defconfig @@ -419,7 +419,7 @@ CONFIG_TELINIT_PATH="" CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INIT_SCTTY is not set # CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_QUIET is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_LINUXRC is not set CONFIG_INIT_TERMINAL_TYPE="" diff --git a/init/init.c b/init/init.c index 8db4ced58..833759341 100644 --- a/init/init.c +++ b/init/init.c @@ -17,7 +17,7 @@ //config: init is the first program run when the system boots. //config: //config:config LINUXRC -//config: bool "Support running init from within an initrd (not initramfs)" +//config: bool "linuxrc: support running init from initrd (not initramfs)" //config: default y //config: select FEATURE_SYSLOG //config: help @@ -74,12 +74,10 @@ //config: default y //config: depends on INIT || LINUXRC //config: -//config:config FEATURE_EXTRA_QUIET -//config: bool "Be _extra_ quiet on boot" +//config:config FEATURE_INIT_QUIET +//config: bool "Be quiet on boot (no 'init started:' message)" //config: default y //config: depends on INIT || LINUXRC -//config: help -//config: Prevent init from logging some messages to the console during boot. //config: //config:config FEATURE_INIT_COREDUMPS //config: bool "Support dumping core for child processes (debugging only)" @@ -1098,7 +1096,7 @@ int init_main(int argc UNUSED_PARAM, char **argv) if (argv[1]) xsetenv("RUNLEVEL", argv[1]); -#if !ENABLE_FEATURE_EXTRA_QUIET +#if !ENABLE_FEATURE_INIT_QUIET /* Hello world */ message(L_CONSOLE | L_LOG, "init started: %s", bb_banner); #endif -- cgit v1.2.3-55-g6feb From 205d48e9480e3a60f2bf1094f67d837f1b44aea5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sun, 29 Jan 2017 14:57:33 +0100 Subject: *: add comment about APPLET_ODDNAME format It confused me more than once Signed-off-by: Denys Vlasenko --- archival/bbunzip.c | 48 +++++++++++++++++++++++-------------------- archival/lzop.c | 3 ++- coreutils/expand.c | 1 + coreutils/who.c | 1 + findutils/grep.c | 1 + init/halt.c | 3 ++- loginutils/add-remove-shell.c | 1 + miscutils/flash_lock_unlock.c | 3 ++- miscutils/ubi_tools.c | 11 +++++----- modutils/modprobe-small.c | 5 +++-- networking/hostname.c | 1 + networking/ifupdown.c | 3 ++- printutils/lpr.c | 1 + procps/kill.c | 3 ++- procps/pgrep.c | 1 + runit/chpst.c | 3 ++- selinux/setfiles.c | 1 + shell/ash.c | 3 ++- shell/hush.c | 5 +++-- util-linux/freeramdisk.c | 1 + util-linux/mkfs_ext2.c | 3 ++- util-linux/mkfs_minix.c | 1 + util-linux/mkfs_vfat.c | 3 ++- util-linux/setarch.c | 1 + util-linux/swaponoff.c | 3 ++- 25 files changed, 69 insertions(+), 41 deletions(-) (limited to 'init') diff --git a/archival/bbunzip.c b/archival/bbunzip.c index fb7a3678d..0e2a261f0 100644 --- a/archival/bbunzip.c +++ b/archival/bbunzip.c @@ -314,6 +314,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv) //config: depends on (GUNZIP || ZCAT) && LONG_OPTS //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat)) #if ENABLE_FEATURE_GZIP_DECOMPRESS static @@ -425,6 +426,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv) //config: Alias to "bunzip2 -c". //applet:IF_BUNZIP2(APPLET(bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_BZCAT(APPLET_ODDNAME(bzcat, bunzip2, BB_DIR_USR_BIN, BB_SUID_DROP, bzcat)) #if ENABLE_FEATURE_BZIP2_DECOMPRESS int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -467,26 +469,6 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //usage: "[FILE]..." //usage:#define lzcat_full_usage "\n\n" //usage: "Decompress to stdout" -//usage: -//usage:#define unxz_trivial_usage -//usage: "[-cf] [FILE]..." -//usage:#define unxz_full_usage "\n\n" -//usage: "Decompress FILE (or stdin)\n" -//usage: "\n -c Write to stdout" -//usage: "\n -f Force" -//usage: -//usage:#define xz_trivial_usage -//usage: "-d [-cf] [FILE]..." -//usage:#define xz_full_usage "\n\n" -//usage: "Decompress FILE (or stdin)\n" -//usage: "\n -d Decompress" -//usage: "\n -c Write to stdout" -//usage: "\n -f Force" -//usage: -//usage:#define xzcat_trivial_usage -//usage: "[FILE]..." -//usage:#define xzcat_full_usage "\n\n" -//usage: "Decompress to stdout" //config:config UNLZMA //config: bool "unlzma" @@ -528,8 +510,9 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv) //config: a 1K bigger binary. //applet:IF_UNLZMA(APPLET(unlzma, BB_DIR_USR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_LZCAT(APPLET_ODDNAME(lzcat, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzcat)) -//applet:IF_LZMA(APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) +//applet:IF_LZMA( APPLET_ODDNAME(lzma, unlzma, BB_DIR_USR_BIN, BB_SUID_DROP, lzma)) //kbuild:lib-$(CONFIG_UNLZMA) += bbunzip.o //kbuild:lib-$(CONFIG_LZCAT) += bbunzip.o //kbuild:lib-$(CONFIG_LZMA) += bbunzip.o @@ -553,6 +536,26 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) #endif +//usage:#define unxz_trivial_usage +//usage: "[-cf] [FILE]..." +//usage:#define unxz_full_usage "\n\n" +//usage: "Decompress FILE (or stdin)\n" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define xz_trivial_usage +//usage: "-d [-cf] [FILE]..." +//usage:#define xz_full_usage "\n\n" +//usage: "Decompress FILE (or stdin)\n" +//usage: "\n -d Decompress" +//usage: "\n -c Write to stdout" +//usage: "\n -f Force" +//usage: +//usage:#define xzcat_trivial_usage +//usage: "[FILE]..." +//usage:#define xzcat_full_usage "\n\n" +//usage: "Decompress to stdout" + //config:config UNXZ //config: bool "unxz" //config: default y @@ -573,8 +576,9 @@ int unlzma_main(int argc UNUSED_PARAM, char **argv) //config: IOW: you'll get xz applet, but it will always require -d option. //applet:IF_UNXZ(APPLET(unxz, BB_DIR_USR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_XZCAT(APPLET_ODDNAME(xzcat, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xzcat)) -//applet:IF_XZ(APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) +//applet:IF_XZ( APPLET_ODDNAME(xz, unxz, BB_DIR_USR_BIN, BB_SUID_DROP, xz)) //kbuild:lib-$(CONFIG_UNXZ) += bbunzip.o //kbuild:lib-$(CONFIG_XZCAT) += bbunzip.o //kbuild:lib-$(CONFIG_XZ) += bbunzip.o diff --git a/archival/lzop.c b/archival/lzop.c index e0e90ac6c..ca61add3c 100644 --- a/archival/lzop.c +++ b/archival/lzop.c @@ -53,7 +53,8 @@ //config: and take up 3.2K of code. //applet:IF_LZOP(APPLET(lzop, BB_DIR_BIN, BB_SUID_DROP)) -//applet:IF_UNLZOP(APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_UNLZOP( APPLET_ODDNAME(unlzop, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, unlzop)) //applet:IF_LZOPCAT(APPLET_ODDNAME(lzopcat, lzop, BB_DIR_USR_BIN, BB_SUID_DROP, lzopcat)) //kbuild:lib-$(CONFIG_LZOP) += lzop.o //kbuild:lib-$(CONFIG_UNLZOP) += lzop.o diff --git a/coreutils/expand.c b/coreutils/expand.c index 63b682330..9ce86ebff 100644 --- a/coreutils/expand.c +++ b/coreutils/expand.c @@ -43,6 +43,7 @@ //config: depends on UNEXPAND && LONG_OPTS //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand)) //kbuild:lib-$(CONFIG_EXPAND) += expand.o diff --git a/coreutils/who.c b/coreutils/who.c index ac19dc720..e6179bb00 100644 --- a/coreutils/who.c +++ b/coreutils/who.c @@ -30,6 +30,7 @@ //config: help //config: Print users currently logged on. +// APPLET_ODDNAME:name main location suid_type help //applet:IF_USERS(APPLET_ODDNAME(users, who, BB_DIR_USR_BIN, BB_SUID_DROP, users)) //applet:IF_WHO(APPLET(who, BB_DIR_USR_BIN, BB_SUID_DROP)) diff --git a/findutils/grep.c b/findutils/grep.c index 547e3d576..ec7605d85 100644 --- a/findutils/grep.c +++ b/findutils/grep.c @@ -46,6 +46,7 @@ //config: Print the specified number of context lines (-C). //applet:IF_GREP(APPLET(grep, BB_DIR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_EGREP(APPLET_ODDNAME(egrep, grep, BB_DIR_BIN, BB_SUID_DROP, egrep)) //applet:IF_FGREP(APPLET_ODDNAME(fgrep, grep, BB_DIR_BIN, BB_SUID_DROP, fgrep)) diff --git a/init/halt.c b/init/halt.c index b7fb10869..f69b89772 100644 --- a/init/halt.c +++ b/init/halt.c @@ -46,8 +46,9 @@ //config: locating telinit executable. //applet:IF_HALT(APPLET(halt, BB_DIR_SBIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_POWEROFF(APPLET_ODDNAME(poweroff, halt, BB_DIR_SBIN, BB_SUID_DROP, poweroff)) -//applet:IF_REBOOT(APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot)) +//applet:IF_REBOOT( APPLET_ODDNAME(reboot, halt, BB_DIR_SBIN, BB_SUID_DROP, reboot)) //kbuild:lib-$(CONFIG_HALT) += halt.o //kbuild:lib-$(CONFIG_POWEROFF) += halt.o diff --git a/loginutils/add-remove-shell.c b/loginutils/add-remove-shell.c index ce4a7bbd2..af7c31779 100644 --- a/loginutils/add-remove-shell.c +++ b/loginutils/add-remove-shell.c @@ -19,6 +19,7 @@ //config: help //config: Remove shells from /etc/shells. +// APPLET_ODDNAME:name main location suid_type help //applet:IF_ADD_SHELL( APPLET_ODDNAME(add-shell , add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, add_shell )) //applet:IF_REMOVE_SHELL(APPLET_ODDNAME(remove-shell, add_remove_shell, BB_DIR_USR_SBIN, BB_SUID_DROP, remove_shell)) diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c index 2f698641f..003496d5b 100644 --- a/miscutils/flash_lock_unlock.c +++ b/miscutils/flash_lock_unlock.c @@ -17,7 +17,8 @@ //config: The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This //config: utility unlocks part or all of the flash device. -//applet:IF_FLASH_LOCK(APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_FLASH_LOCK( APPLET_ODDNAME(flash_lock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_lock)) //applet:IF_FLASH_UNLOCK(APPLET_ODDNAME(flash_unlock, flash_lock_unlock, BB_DIR_USR_SBIN, BB_SUID_DROP, flash_unlock)) //kbuild:lib-$(CONFIG_FLASH_LOCK) += flash_lock_unlock.o diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c index 8e55e9577..982e3e52a 100644 --- a/miscutils/ubi_tools.c +++ b/miscutils/ubi_tools.c @@ -45,11 +45,12 @@ //config: help //config: Update a UBI volume. -//applet:IF_UBIATTACH(APPLET_ODDNAME(ubiattach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach)) -//applet:IF_UBIDETACH(APPLET_ODDNAME(ubidetach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubidetach)) -//applet:IF_UBIMKVOL(APPLET_ODDNAME(ubimkvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubimkvol)) -//applet:IF_UBIRMVOL(APPLET_ODDNAME(ubirmvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirmvol)) -//applet:IF_UBIRSVOL(APPLET_ODDNAME(ubirsvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirsvol)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_UBIATTACH( APPLET_ODDNAME(ubiattach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiattach)) +//applet:IF_UBIDETACH( APPLET_ODDNAME(ubidetach, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubidetach)) +//applet:IF_UBIMKVOL( APPLET_ODDNAME(ubimkvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubimkvol)) +//applet:IF_UBIRMVOL( APPLET_ODDNAME(ubirmvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirmvol)) +//applet:IF_UBIRSVOL( APPLET_ODDNAME(ubirsvol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubirsvol)) //applet:IF_UBIUPDATEVOL(APPLET_ODDNAME(ubiupdatevol, ubi_tools, BB_DIR_USR_SBIN, BB_SUID_DROP, ubiupdatevol)) //kbuild:lib-$(CONFIG_UBIATTACH) += ubi_tools.o diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c index 21fa9dbdd..e44feeefa 100644 --- a/modutils/modprobe-small.c +++ b/modutils/modprobe-small.c @@ -25,10 +25,11 @@ //config: Check if the module is already loaded. //applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_DEPMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))) //applet:IF_INSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))) -//applet:IF_LSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))) -//applet:IF_RMMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))) +//applet:IF_LSMOD(IF_MODPROBE_SMALL( APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))) +//applet:IF_RMMOD(IF_MODPROBE_SMALL( APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))) //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o diff --git a/networking/hostname.c b/networking/hostname.c index 04a051ede..9f2418422 100644 --- a/networking/hostname.c +++ b/networking/hostname.c @@ -22,6 +22,7 @@ //config: help //config: Alias to "hostname -d". +// APPLET_ODDNAME:name main location suid_type help //applet:IF_DNSDOMAINNAME(APPLET_ODDNAME(dnsdomainname, hostname, BB_DIR_BIN, BB_SUID_DROP, dnsdomainname)) //applet:IF_HOSTNAME(APPLET(hostname, BB_DIR_BIN, BB_SUID_DROP)) diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 78baa6690..a76fe1021 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -106,7 +106,8 @@ //config: Otherwise, if udhcpc applet is enabled, it is used. //config: Otherwise, ifup/ifdown will have no support for DHCP. -//applet:IF_IFUP(APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_IFUP( APPLET_ODDNAME(ifup, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifup)) //applet:IF_IFDOWN(APPLET_ODDNAME(ifdown, ifupdown, BB_DIR_SBIN, BB_SUID_DROP, ifdown)) //kbuild:lib-$(CONFIG_IFUP) += ifupdown.o diff --git a/printutils/lpr.c b/printutils/lpr.c index ed6a84a93..8cc87d167 100644 --- a/printutils/lpr.c +++ b/printutils/lpr.c @@ -23,6 +23,7 @@ //config: help //config: lpq is a print spool queue examination and manipulation program. +// APPLET_ODDNAME:name main location suid_type help //applet:IF_LPQ(APPLET_ODDNAME(lpq, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpq)) //applet:IF_LPR(APPLET_ODDNAME(lpr, lpqr, BB_DIR_USR_BIN, BB_SUID_DROP, lpr)) diff --git a/procps/kill.c b/procps/kill.c index 0ef1716a4..7ae5beead 100644 --- a/procps/kill.c +++ b/procps/kill.c @@ -33,7 +33,8 @@ //config: the script it was called from. //applet:IF_KILL(APPLET(kill, BB_DIR_BIN, BB_SUID_DROP)) -//applet:IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_KILLALL( APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) //applet:IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_SBIN, BB_SUID_DROP, killall5)) //kbuild:lib-$(CONFIG_KILL) += kill.o diff --git a/procps/pgrep.c b/procps/pgrep.c index ac82b5156..e932a32bc 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c @@ -19,6 +19,7 @@ //config: Send signals to processes by name. //applet:IF_PGREP(APPLET(pgrep, BB_DIR_USR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_PKILL(APPLET_ODDNAME(pkill, pgrep, BB_DIR_USR_BIN, BB_SUID_DROP, pkill)) //kbuild:lib-$(CONFIG_PGREP) += pgrep.o diff --git a/runit/chpst.c b/runit/chpst.c index 3769af25e..846c846d3 100644 --- a/runit/chpst.c +++ b/runit/chpst.c @@ -60,7 +60,8 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. //config: Sets soft resource limits as specified by options //applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP)) -//applet:IF_ENVDIR(APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_ENVDIR( APPLET_ODDNAME(envdir, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir)) //applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid)) //applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid)) //applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit)) diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 9fa5d3f30..c14a67be5 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c @@ -30,6 +30,7 @@ //config: the same as setfiles, but usage is a little different. //applet:IF_SETFILES(APPLET(setfiles, BB_DIR_SBIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_RESTORECON(APPLET_ODDNAME(restorecon, setfiles, BB_DIR_SBIN, BB_SUID_DROP, restorecon)) //kbuild:lib-$(CONFIG_SETFILES) += setfiles.o diff --git a/shell/ash.c b/shell/ash.c index d8f41327b..e07b81c05 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -136,7 +136,8 @@ //config:endif # ash options //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP)) -//applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_SH_IS_ASH( APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP, ash)) //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o diff --git a/shell/hush.c b/shell/hush.c index d90c1485a..4123cc19e 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -277,8 +277,9 @@ //config: msh is deprecated and will be removed, please migrate to hush. //applet:IF_HUSH(APPLET(hush, BB_DIR_BIN, BB_SUID_DROP)) -//applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) -//applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_MSH( APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) +//applet:IF_SH_IS_HUSH( APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush)) //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o diff --git a/util-linux/freeramdisk.c b/util-linux/freeramdisk.c index 8bc2c443b..28148fcbe 100644 --- a/util-linux/freeramdisk.c +++ b/util-linux/freeramdisk.c @@ -33,6 +33,7 @@ //config: ramdisk. If you have no use for freeing memory from a ramdisk, leave //config: this disabled. +// APPLET_ODDNAME:name main location suid_type help //applet:IF_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, BB_DIR_BIN, BB_SUID_DROP, fdflush)) //applet:IF_FREERAMDISK(APPLET(freeramdisk, BB_DIR_SBIN, BB_SUID_DROP)) diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index 5816a208e..4a7a878ac 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -21,7 +21,8 @@ //config: help //config: Alias to "mke2fs". -//applet:IF_MKE2FS(APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_MKE2FS( APPLET_ODDNAME(mke2fs, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) //applet:IF_MKFS_EXT2(APPLET_ODDNAME(mkfs.ext2, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) ////////:IF_MKFS_EXT3(APPLET_ODDNAME(mkfs.ext3, mkfs_ext2, BB_DIR_SBIN, BB_SUID_DROP, mkfs_ext2)) diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 912246b93..0dfe34705 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -80,6 +80,7 @@ //config: this. If you enabled 'mkfs_minix' then you almost certainly want to //config: be using the version 2 filesystem support. +// APPLET_ODDNAME:name main location suid_type help //applet:IF_MKFS_MINIX(APPLET_ODDNAME(mkfs.minix, mkfs_minix, BB_DIR_SBIN, BB_SUID_DROP, mkfs_minix)) //kbuild:lib-$(CONFIG_MKFS_MINIX) += mkfs_minix.o diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c index ab70853a1..1fc943430 100644 --- a/util-linux/mkfs_vfat.c +++ b/util-linux/mkfs_vfat.c @@ -21,7 +21,8 @@ //config: help //config: Alias to "mkdosfs". -//applet:IF_MKDOSFS(APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_MKDOSFS( APPLET_ODDNAME(mkdosfs, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) //applet:IF_MKFS_VFAT(APPLET_ODDNAME(mkfs.vfat, mkfs_vfat, BB_DIR_SBIN, BB_SUID_DROP, mkfs_vfat)) //kbuild:lib-$(CONFIG_MKDOSFS) += mkfs_vfat.o diff --git a/util-linux/setarch.c b/util-linux/setarch.c index ec473e9cb..e4124b044 100644 --- a/util-linux/setarch.c +++ b/util-linux/setarch.c @@ -31,6 +31,7 @@ //config: Alias to "setarch linux64". //applet:IF_SETARCH(APPLET(setarch, BB_DIR_BIN, BB_SUID_DROP)) +// APPLET_ODDNAME:name main location suid_type help //applet:IF_LINUX32(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) //applet:IF_LINUX64(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index b8f4e9447..313ea0ef9 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -41,7 +41,8 @@ //config: help //config: This option enables the 'swapoff' utility. -//applet:IF_SWAPON(APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon)) +// APPLET_ODDNAME:name main location suid_type help +//applet:IF_SWAPON( APPLET_ODDNAME(swapon, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon)) //applet:IF_SWAPOFF(APPLET_ODDNAME(swapoff, swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapoff)) //kbuild:lib-$(CONFIG_SWAPON) += swaponoff.o -- cgit v1.2.3-55-g6feb