diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-09-02 14:50:37 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-09-03 16:01:25 +0200 |
commit | b0c16de1ff870c61b1aa981e6cb160bc0ca58cc2 (patch) | |
tree | aa3e6a88f91d45c52f268c6c25fb6c08a7f9a6fd | |
parent | f8bc1e0621dfb56170b7c6266a624b0884fa1adc (diff) | |
download | ptxdist-b0c16de1ff870c61b1aa981e6cb160bc0ca58cc2.tar.gz ptxdist-b0c16de1ff870c61b1aa981e6cb160bc0ca58cc2.tar.xz |
initmethod-bbinit: remove banner
use /etc/issue instead
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | generic/etc/init.d/banner | 47 | ||||
-rw-r--r-- | rules/initmethod-bbinit.in | 22 | ||||
-rw-r--r-- | rules/initmethod-bbinit.make | 32 |
3 files changed, 0 insertions, 101 deletions
diff --git a/generic/etc/init.d/banner b/generic/etc/init.d/banner deleted file mode 100644 index 964c6662d..000000000 --- a/generic/etc/init.d/banner +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# /etc/init.d/banner -# - -FIGLET="/usr/bin/figlet" -FIGLET_FONTS="/usr/share/figlet" -PATH=/sbin:/bin:/usr/bin - -test -f $FIGLET || { echo "$FIGLET not found" >&2 ; exit 1; } - -start_proc() { - echo - echo "OSELAS(R)-@PROJECT@@PRJVERSION@ (@PTXDIST@-@VERSION@.@PATCHLEVEL@.@SUBLEVEL@@EXTRAVERSION@/@DATE@)" - echo - host=`/bin/hostname` - if [ -n "@VENDOR@" ]; then - ${FIGLET} -w 0 -f "${FIGLET_FONTS}/standard" "@VENDOR@" - fi - ${FIGLET} -w 0 -f "${FIGLET_FONTS}/standard" "$host" - echo - echo -} - - -case "$1" in - start) - start_proc - ;; - stop) - # do nothing - ;; - restart|force-reload) - start_proc - ;; - reload) - echo "Not supported" >&2 - exit 1 - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 - diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in index 0d1af16ff..108ee0d28 100644 --- a/rules/initmethod-bbinit.in +++ b/rules/initmethod-bbinit.in @@ -2,22 +2,6 @@ if INITMETHOD_BBINIT -config INITMETHOD_BBINIT_ETC_INITD_BANNER - bool - default y - depends on FIGLET - prompt "install /etc/init.d/banner" - help - This Option adds a specific vendor string to - the script which displays a nifty ptxdist - _ - | |__ __ _ _ __ _ __ ___ _ __ - | '_ \ / _` | '_ \| '_ \ / _ \ '__| - | |_) | (_| | | | | | | | __/ | - |_.__/ \__,_|_| |_|_| |_|\___|_| - page with the hostname and other stuff at - startup. - config INITMETHOD_BBINIT_ETC_INITD_MODULES bool prompt "install /etc/init.d/modules" @@ -59,12 +43,6 @@ menu "service startup configuration " source "generated/initmethod_bbinit.in" -config INITMETHOD_BBINIT_LINK_BANNER - string - depends on INITMETHOD_BBINIT_ETC_INITD_BANNER - prompt "banner" - default "S99banner" - config INITMETHOD_BBINIT_LINK_LOGROTATE string depends on INITMETHOD_BBINIT_ETC_INITD_LOGROTATE diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make index cd67eb111..538224b62 100644 --- a/rules/initmethod-bbinit.make +++ b/rules/initmethod-bbinit.make @@ -86,31 +86,6 @@ $(STATEDIR)/initmethod-bbinit.targetinstall: # # # # start scripts # # -ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_BANNER - @$(call install_alternative, initmethod-bbinit, 0, 0, 0755, /etc/init.d/banner, n) - - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @PROJECT@, $(PTXCONF_PROJECT)) - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @PRJVERSION@, $(PTXCONF_PROJECT_VERSION)) - - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @PTXDIST@, ptxdist) - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @VERSION@, $(PTXDIST_VERSION_YEAR)) - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @PATCHLEVEL@, $(PTXDIST_VERSION_MONTH)) - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @SUBLEVEL@, $(PTXDIST_VERSION_BUGFIX)) - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @EXTRAVERSION@, $(PTXDIST_VERSION_SCM)) - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @DATE@, $(shell date -Iseconds)) - - @$(call install_replace, initmethod-bbinit, /etc/init.d/banner, \ - @VENDOR@, $(PTXCONF_PROJECT_VENDOR)) -endif - ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_MODULES @$(call install_alternative, initmethod-bbinit, 0, 0, 0755, /etc/init.d/modules, n) @$(call install_alternative, initmethod-bbinit, 0, 0, 0644, /etc/modules, n) @@ -136,13 +111,6 @@ endif # # # # collect start links # # - -ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_BANNER)),) - @$(call install_link, initmethod-bbinit, \ - ../init.d/banner, \ - /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_BANNER)) -endif - ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_LOGROTATE)),) @$(call install_link, initmethod-bbinit, \ ../init.d/logrotate, \ |