Changeset 9a87912 in freewrt

Timestamp:

Jul 27, 2006, 2:22:26 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

2314460

Parents:

bc417a4

Message:

add the ability to choose user's default shell, too
XXX untested

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

Location:

package

Files:

• Config.shell (modified) (2 diffs)
• base-files/Makefile (modified) (3 diffs)
• base-files/default/etc/passwd (modified) (1 diff)

package/Config.shell

@@ -1 +1 @@
 # $FreeWRT$
 
-comment "/bin/sh"
+comment "Shell selection"
 choice
-        prompt "Choose your default shell"
+        prompt "Choose the default bourne shell (/bin/sh)"
         default BUSYBOX_CONFIG_FEATURE_SH_IS_ASH
         help
@@ -69 +69 @@
 
 endchoice
+
+choice
+        prompt "Choose the login shell for admin"
+        default FWRT_BASEFILES_ADMIN_ASH
+        help
+          Choose a shell which is to be used as the default login
+          shell for the "admin" user. Only shells selected above
+          can be chosen.
+
+config FWRT_BASEFILES_ADMIN_ASH
+        depends BUSYBOX_CONFIG_ASH
+        bool "ash (busybox)"
+        help
+          Tha 'ash' shell adds about 60k in the default configuration and is
+          the most complete and most pedantically correct shell included with
+          busybox.  This shell is actually a derivative of the Debian 'dash'
+          shell (by Herbert Xu), which was created by porting the 'ash' shell
+          (written by Kenneth Almquist) from NetBSD.
+
+config FWRT_BASEFILES_ADMIN_MKSH
+        depends FWRT_PACKAGE_MKSH
+        bool "mksh"
+        help
+          mksh is the MirBSD enhanced version of the Public Domain Korn
+          shell (pdksh), a bourne-compatible shell which is largely similar
+          to the original AT&T Korn shell. It includes bug fixes and
+          feature improvements in order to produce a modern, robust shell
+          good for interactive and especially script use. Some sh/ksh/pdksh
+          compatibility kludges have been removed.
+
+config FWRT_BASEFILES_ADMIN_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 FWRT_BASEFILES_ADMIN_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 FWRT_BASEFILES_ADMIN_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.
+
+config FWRT_BASEFILES_ADMIN_SH
+        bool "/bin/sh"
+        help
+          Fall-back: use /bin/sh, whatever it is.
+
+endchoice

package/base-files/Makefile

@@ -4 +4 @@
 
 PKG_NAME:=              base-files
-PKG_RELEASE:=           8
+PKG_RELEASE:=           9
 WRKSRC=                 ${WRKDIR}/base-files
 
@@ -46 +46 @@
 endif
 
+ADMIN_SHELL:=           /bin/sh
+ifeq (${FWRT_BASEFILES_ADMIN_ASH},y)
+ADMIN_SHELL:=           /bin/ash
+endif
+ifeq (${FWRT_BASEFILES_ADMIN_MKSH},y)
+ADMIN_SHELL:=           /bin/mksh
+endif
+ifeq (${FWRT_BASEFILES_ADMIN_HUSH},y)
+ADMIN_SHELL:=           /bin/hush
+endif
+ifeq (${FWRT_BASEFILES_ADMIN_LASH},y)
+ADMIN_SHELL:=           /bin/lash
+endif
+ifeq (${FWRT_BASEFILES_ADMIN_MSH},y)
+ADMIN_SHELL:=           /bin/msh
+endif
+
 $(WRKBUILD)/.prepared:
         mkdir -p $(WRKBUILD) $(PACKAGE_DIR)
@@ -66 +83 @@
         test -z $(FWRT_RUNTIME_PASSWORD) || \
             $(SED) 's,\*NP\*,$(MD5CRYPT),g' $(IDIR_BASE)/etc/passwd
+        $(SED) 's!@SHELL@!${ADMIN_SHELL}!g' $(IDIR_BASE)/etc/passwd
         test -z $(FWRT_RUNTIME_SSHKEY) || ( \
             mkdir -p $(IDIR_BASE)/etc/dropbear; \

package/base-files/default/etc/passwd

@@ -1 +1 @@
 root:*NP*:0:0:root:/tmp:/bin/sh
-admin:*NP*:100:100:admin:/tmp:/bin/ash
+admin:*NP*:100:100:admin:/tmp:@SHELL@
 nobody:*:65534:65534:nobody:/var:/bin/false