Changeset 531da75 in freewrt

Timestamp:

Jul 1, 2007, 4:05:40 AM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

6b5052df

Parents:

aac582b

Message:

• add zsh to /etc/shells, forgotten by wbx@
• remove lash, hush and msh from the choice for /bin/sh – we require either ash or mksh there for FreeWRT 1.1, other shells are not compatible enough
• enable the use of zsh as login shell (alongside with ash, hash, msh, lush, bash, mksh, /bin/sh)

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

Location:

package

Files:

• Config.in.shell (modified) (2 diffs)
• base-files/Makefile (modified) (2 diffs)

package/Config.in.shell

@@ -38 +38 @@
           good for interactive and especially script use. Some sh/ksh/pdksh
           compatibility kludges have been removed.
-
-config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
-        depends BUSYBOX_CONFIG_HUSH
-        bool "hush (busybox)"
-        help
-          hush is a very small shell (just 18k) and it has fairly complete
-          Bourne shell grammar.  It even handles all the normal flow control
-          options such as if/then/elif/else/fi, for/in/do/done, while loops,
-          etc.
-
-          It does not handle case/esac, select, function, here documents ( <<
-          word ), arithmetic expansion, aliases, brace expansion, tilde
-          expansion, &> and >& redirection of stdout+stderr, etc.
-
-config BUSYBOX_CONFIG_FEATURE_SH_IS_LASH
-        depends BUSYBOX_CONFIG_LASH
-        bool "lash (busybox)"
-        help
-          lash is the very smallest shell (adds just 10k) and it is quite
-          usable as a command prompt, but it is not suitable for any but the
-          most trivial scripting (such as an initrd that calls insmod a few
-          times) since it does not understand any Bourne shell grammar.  It
-          does handle pipes, redirects, and job control though.  Adding in
-          command editing makes it a very nice lightweight command prompt.
-
-config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH
-        depends BUSYBOX_CONFIG_MSH
-        bool "msh (busybox)"
-        help
-          The minix shell (adds just 30k) is quite complete and handles things
-          like for/do/done, case/esac and all the things you expect a Bourne
-          shell to do.  It is not always pedantically correct about Bourne
-          shell grammar (try running the shell testscript "tests/sh.testcases"
-          on it and compare vs bash) but for most things it works quite well.
-          It also uses only vfork, so it can be used on uClinux systems.
 
 endchoice
@@ -116 +81 @@
           be selected as /bin/sh.
 
+config FWRT_BASEFILES_ADMIN_ZSH
+        depends FWRT_PACKAGE_ZSH
+        bool "zsh"
+        help
+          zsh is a powerful, bloated not-quite bourne (and even less
+          korn) compatible shell with rich features for interactive
+          uses. It cannot be selected as /bin/sh but as login shell.
+
 config FWRT_BASEFILES_ADMIN_HUSH
         depends BUSYBOX_CONFIG_HUSH

package/base-files/Makefile

@@ -41 +41 @@
 ifeq (${FWRT_BASEFILES_ADMIN_BASH},y)
 ADMIN_SHELL:=           /bin/bash
+endif
+ifeq (${FWRT_BASEFILES_ADMIN_ZSH},y)
+ADMIN_SHELL:=           /bin/zsh
 endif
 
@@ -86 +89 @@
         echo /bin/bash >>${IDIR_BASE_FILES}/etc/shells
 endif
+ifneq (${FWRT_PACKAGE_ZSH},)
+        echo /bin/zsh >>${IDIR_BASE_FILES}/etc/shells
+endif
 ifneq (${FWRT_PACKAGE_MKSH_AS_BINASH},)
         echo /bin/ash >>${IDIR_BASE_FILES}/etc/shells