diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-05 15:52:05 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-05 15:52:21 +0200 |
| commit | 7517e61aa8d1d7ab72c89585c632463b108624bc (patch) | |
| tree | 0e2f687acdf66351f09a7be7ee8215e08510e164 | |
| parent | d944fa88674123f429a06dca7ff588abf52671be (diff) | |
start shell on serial and vga, if both available
| -rw-r--r-- | package/base-files/Makefile | 6 | ||||
| -rw-r--r-- | package/base-files/files/inittab.shell | 2 | ||||
| -rw-r--r-- | package/base-files/files/inittab.shellvga | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b6e771d4a..2b26175b8 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 83 +PKG_RELEASE:= 84 PKG_SECTION:= base PKG_DESCR:= basic files and scripts @@ -62,7 +62,9 @@ endif rm -rf $(IDIR_BASE_FILES)/var ln -sf tmp $(IDIR_BASE_FILES)/var test -z $(ADK_RUNTIME_SHELL) || \ - cat ./files/inittab.shell >> $(IDIR_BASE_FILES)/etc/inittab + cat ./files/inittab.shell >> $(IDIR_BASE_FILES)/etc/inittab && \ + test -z $(ADK_TARGET_WITH_VGA) || \ + cat ./files/inittab.shellvga >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_GETTY_VGA) || \ cat ./files/inittab.vga >> $(IDIR_BASE_FILES)/etc/inittab test -z $(ADK_RUNTIME_GETTY_SERIAL) || \ diff --git a/package/base-files/files/inittab.shell b/package/base-files/files/inittab.shell index d12593ca1..43685827e 100644 --- a/package/base-files/files/inittab.shell +++ b/package/base-files/files/inittab.shell @@ -1 +1 @@ -::askfirst:-/bin/sh +@DEVICE@::askfirst:-/bin/sh diff --git a/package/base-files/files/inittab.shellvga b/package/base-files/files/inittab.shellvga new file mode 100644 index 000000000..a5c6e34ba --- /dev/null +++ b/package/base-files/files/inittab.shellvga @@ -0,0 +1 @@ +tty0::askfirst:-/bin/sh |