Changeset 356d3a6 in freewrt for package/Config.shell

Timestamp:

Jul 27, 2006, 3:04:40 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

4e0f7fd

Parents:

f2e3b63e

Message:

• bring shell configuration in one single place
• enhance comments; make sure we always need one /bin/sh (currently not enforced; there will be no root shell selectable if none is available; the user shell will default to /bin/sh but that isn't supplied) and one /bin/ash (either busybox ash or mksh, both work fine)

Now feel free to go and add a GNU b(lo)a(t)sh package...
configuration is similar as mksh, and it can also be used
as /bin/sh (obviously) and /bin/ash.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@443 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/Config.shell (modified) (6 diffs)

package/Config.shell

@@ -1 +1 @@
 # $FreeWRT$
 
-comment "Shell selection"
+comment "Shell selection --"
+comment "Building shell packages and configuring their features"
+source "package/busybox/config/shell/Config.in"
+source "package/mksh/Config.in"
+comment "Selecting appropriate shells from these enabled above"
 choice
         prompt "Choose the default bourne shell (/bin/sh)"
-        default BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
+        default BUSYBOX_CONFIG_FEATURE_SH_IS_ASH if BUSYBOX_CONFIG_ASH
+        default FWRT_PACKAGE_MKSH_AS_BINSH if FWRT_PACKAGE_MKSH
         help
           Choose a shell which is to be used for /bin/sh.
           The ash shell is the most bash-compatible shell
           and full-featured one in busybox; mksh is a bit
-          more heavy-weight but feature-complete.
+          more heavy-weight but feature-complete. The other
+          shells probably do not work as /bin/sh in FreeWRT.
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
-        select BUSYBOX_CONFIG_ASH
+        depends BUSYBOX_CONFIG_ASH
         bool "ash (busybox)"
         help
@@ -22 +28 @@
 
 config FWRT_PACKAGE_MKSH_AS_BINSH
-        select FWRT_PACKAGE_MKSH
+        depends FWRT_PACKAGE_MKSH
         select BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
         bool "mksh"
@@ -34 +40 @@
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
-        select BUSYBOX_CONFIG_HUSH
+        depends BUSYBOX_CONFIG_HUSH
         bool "hush (busybox)"
         help
@@ -47 +53 @@
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_LASH
-        select BUSYBOX_CONFIG_LASH
+        depends BUSYBOX_CONFIG_LASH
         bool "lash (busybox)"
         help
@@ -58 +64 @@
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH
-        select BUSYBOX_CONFIG_MSH
+        depends BUSYBOX_CONFIG_MSH
         bool "msh (busybox)"
         help
@@ -71 +77 @@
 
 choice
-        prompt "Choose the login shell for admin"
-        default FWRT_BASEFILES_ADMIN_ASH
+        prompt "Choose the login shell for the admin user"
+        default FWRT_BASEFILES_ADMIN_ASH if BUSYBOX_CONFIG_ASH
+        default FWRT_BASEFILES_ADMIN_MKSH if FWRT_PACKAGE_MKSH
+        default FWRT_BASEFILES_ADMIN_SH if (!BUSYBOX_CONFIG_ASH && !FWRT_PACKAGE_MKSH)
         help
           Choose a shell which is to be used as the default login