1 files changed, 34 insertions, 27 deletions
diff --git a/Config.in b/Config.in
index d2e64a08d..273f2de38 100644
--- a/Config.in
+++ b/Config.in
@@ -146,6 +146,14 @@ config FEATURE_INSTALLER
          busybox at runtime to create hard links or symlinks for all the
          applets that are compiled into busybox.
+config INSTALL_NO_USR
+        bool "Don't use /usr"
+        default n
+        depends on FEATURE_INSTALLER
+        help
+          Disable use of /usr. busybox --install will install applets
+          only to /bin and /sbin, never to /usr/bin or /usr/sbin.
 config LOCALE_SUPPORT
        bool "Enable locale support (system needs locale for this to work)"
        default n
@@ -298,15 +306,6 @@ config FEATURE_CLEAN_UP
          Don't enable this unless you have a really good reason to clean
          things up manually.
-config FEATURE_UTMP
-        bool "Support utmp file"
-        default y
-        help
-          The file /var/run/utmp is used to track who is currently logged in.
-          With this option on, certain applets (getty, login, telnetd etc)
-          will create and delete entries there.
-          "who" applet requires this option.
 config FEATURE_WTMP
        bool "Support wtmp file"
        default y
@@ -318,6 +317,15 @@ config FEATURE_WTMP
          will append new entries there.
          "last" applet requires this option.
+config FEATURE_UTMP
+        bool "Support utmp file"
+        default y
+        help
+          The file /var/run/utmp is used to track who is currently logged in.
+          With this option on, certain applets (getty, login, telnetd etc)
+          will create and delete entries there.
+          "who" applet requires this option.
 config FEATURE_PIDFILE
        bool "Support writing pidfiles"
        default y
@@ -330,14 +338,19 @@ config FEATURE_SUID
        default y
        help
          With this option you can install the busybox binary belonging
-          to root with the suid bit set, and it will automatically drop
+          to root with the suid bit set, enabling some applets to perform
-          priviledges for applets that don't need root access.
+          root-level operations even when run by ordinary users
+          (for example, mounting of user mounts in fstab needs this).
+          Busybox will automatically drop priviledges for applets
+          that don't need root access.
          If you are really paranoid and don't want to do this, build two
          busybox binaries with different applets in them (and the appropriate
          symlinks pointing to each binary), and only set the suid bit on the
-          one that needs it. The applets currently marked to need the suid bit
+          one that needs it.
-          are:
+          The applets currently marked to need the suid bit are:
          crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
          traceroute, vlock.
@@ -674,20 +687,13 @@ endchoice
 endmenu
-menu 'Installation Options'
+menu 'Installation Options ("make install" behavior)'
-config INSTALL_NO_USR
-        bool "Don't use /usr"
-        default n
-        help
-          Disable use of /usr. Don't activate this option if you don't know
-          that you really want this behaviour.
 choice
-        prompt "Applets links"
+        prompt "What kind of applet links to install"
        default INSTALL_APPLET_SYMLINKS
        help
-          Choose how you install applets links.
+          Choose what kind of links to applets are created by "make install".
 config INSTALL_APPLET_SYMLINKS
        bool "as soft-links"
@@ -711,8 +717,9 @@ config INSTALL_APPLET_DONT
        bool "not installed"
        depends on FEATURE_INSTALLER || FEATURE_SH_STANDALONE || FEATURE_PREFER_APPLETS
        help
-          Do not install applet links. Useful when using the -install feature
+          Do not install applet links. Useful when you plan to use
-          or a standalone shell for rescue purposes.
+          busybox --install for installing links, or plan to use
+          a standalone shell and thus don't need applet links.
 endchoice
@@ -736,8 +743,8 @@ config INSTALL_SH_APPLET_HARDLINK
 config INSTALL_SH_APPLET_SCRIPT_WRAPPER
        bool "as script wrapper"
        help
-          Install /bin/sh applet as script wrapper that call the busybox
+          Install /bin/sh applet as script wrapper that calls
-          binary.
+          the busybox binary.
 endchoice

diff --git a/Config.in b/Config.in index d2e64a08d..273f2de38 100644 --- a/Config.in +++ b/Config.in
@@ -146,6 +146,14 @@ config FEATURE_INSTALLER
146	busybox at runtime to create hard links or symlinks for all the	146	busybox at runtime to create hard links or symlinks for all the
147	applets that are compiled into busybox.	147	applets that are compiled into busybox.
148		148
		149	config INSTALL_NO_USR
		150	bool "Don't use /usr"
		151	default n
		152	depends on FEATURE_INSTALLER
		153	help
		154	Disable use of /usr. busybox --install will install applets
		155	only to /bin and /sbin, never to /usr/bin or /usr/sbin.
		156
149	config LOCALE_SUPPORT	157	config LOCALE_SUPPORT
150	bool "Enable locale support (system needs locale for this to work)"	158	bool "Enable locale support (system needs locale for this to work)"
151	default n	159	default n
@@ -298,15 +306,6 @@ config FEATURE_CLEAN_UP
298	Don't enable this unless you have a really good reason to clean	306	Don't enable this unless you have a really good reason to clean
299	things up manually.	307	things up manually.
300		308
301	config FEATURE_UTMP
302	bool "Support utmp file"
303	default y
304	help
305	The file /var/run/utmp is used to track who is currently logged in.
306	With this option on, certain applets (getty, login, telnetd etc)
307	will create and delete entries there.
308	"who" applet requires this option.
309
310	config FEATURE_WTMP	309	config FEATURE_WTMP
311	bool "Support wtmp file"	310	bool "Support wtmp file"
312	default y	311	default y
@@ -318,6 +317,15 @@ config FEATURE_WTMP
318	will append new entries there.	317	will append new entries there.
319	"last" applet requires this option.	318	"last" applet requires this option.
320		319
		320	config FEATURE_UTMP
		321	bool "Support utmp file"
		322	default y
		323	help
		324	The file /var/run/utmp is used to track who is currently logged in.
		325	With this option on, certain applets (getty, login, telnetd etc)
		326	will create and delete entries there.
		327	"who" applet requires this option.
		328
321	config FEATURE_PIDFILE	329	config FEATURE_PIDFILE
322	bool "Support writing pidfiles"	330	bool "Support writing pidfiles"
323	default y	331	default y
@@ -330,14 +338,19 @@ config FEATURE_SUID
330	default y	338	default y
331	help	339	help
332	With this option you can install the busybox binary belonging	340	With this option you can install the busybox binary belonging
333	to root with the suid bit set, and it will automatically drop	341	to root with the suid bit set, enabling some applets to perform
334	priviledges for applets that don't need root access.	342	root-level operations even when run by ordinary users
		343	(for example, mounting of user mounts in fstab needs this).
		344
		345	Busybox will automatically drop priviledges for applets
		346	that don't need root access.
335		347
336	If you are really paranoid and don't want to do this, build two	348	If you are really paranoid and don't want to do this, build two
337	busybox binaries with different applets in them (and the appropriate	349	busybox binaries with different applets in them (and the appropriate
338	symlinks pointing to each binary), and only set the suid bit on the	350	symlinks pointing to each binary), and only set the suid bit on the
339	one that needs it. The applets currently marked to need the suid bit	351	one that needs it.
340	are:	352
		353	The applets currently marked to need the suid bit are:
341		354
342	crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,	355	crontab, dnsd, findfs, ipcrm, ipcs, login, passwd, ping, su,
343	traceroute, vlock.	356	traceroute, vlock.
@@ -674,20 +687,13 @@ endchoice
674		687
675	endmenu	688	endmenu
676		689
677	menu 'Installation Options'	690	menu 'Installation Options ("make install" behavior)'
678
679	config INSTALL_NO_USR
680	bool "Don't use /usr"
681	default n
682	help
683	Disable use of /usr. Don't activate this option if you don't know
684	that you really want this behaviour.
685		691
686	choice	692	choice
687	prompt "Applets links"	693	prompt "What kind of applet links to install"
688	default INSTALL_APPLET_SYMLINKS	694	default INSTALL_APPLET_SYMLINKS
689	help	695	help
690	Choose how you install applets links.	696	Choose what kind of links to applets are created by "make install".
691		697
692	config INSTALL_APPLET_SYMLINKS	698	config INSTALL_APPLET_SYMLINKS
693	bool "as soft-links"	699	bool "as soft-links"
@@ -711,8 +717,9 @@ config INSTALL_APPLET_DONT
711	bool "not installed"	717	bool "not installed"
712	depends on FEATURE_INSTALLER \|\| FEATURE_SH_STANDALONE \|\| FEATURE_PREFER_APPLETS	718	depends on FEATURE_INSTALLER \|\| FEATURE_SH_STANDALONE \|\| FEATURE_PREFER_APPLETS
713	help	719	help
714	Do not install applet links. Useful when using the -install feature	720	Do not install applet links. Useful when you plan to use
715	or a standalone shell for rescue purposes.	721	busybox --install for installing links, or plan to use
		722	a standalone shell and thus don't need applet links.
716		723
717	endchoice	724	endchoice
718		725
@@ -736,8 +743,8 @@ config INSTALL_SH_APPLET_HARDLINK
736	config INSTALL_SH_APPLET_SCRIPT_WRAPPER	743	config INSTALL_SH_APPLET_SCRIPT_WRAPPER
737	bool "as script wrapper"	744	bool "as script wrapper"
738	help	745	help
739	Install /bin/sh applet as script wrapper that call the busybox	746	Install /bin/sh applet as script wrapper that calls
740	binary.	747	the busybox binary.
741		748
742	endchoice	749	endchoice
743		750