base-files: reformat banner to better work with varying version string lengths, do...

SVN-Revision: 31289

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f3bfecaa757c4ed3d02ec6b7e32533bcb5a65ee5..892a31777c34feb51b853be4483aa9dc2d751a8b 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=105
+PKG_RELEASE:=106
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
index 301861568230a1020145e38e377c641c796289c8..058cb55733c21af8e1f8c5e886f6e5129c795e8d 100644 (file)
--- a/package/base-files/files/etc/banner
+++ b/package/base-files/files/etc/banner
@@ -3,7 +3,9 @@
  |   -   ||  _  |  -__|     ||  |  |  ||   _||   _|
  |_______||   __|_____|__|__||________||__|  |____|
           |__| W I R E L E S S   F R E E D O M
- ATTITUDE ADJUSTMENT (%C, %R) ----------
+ -----------------------------------------------------
+ ATTITUDE ADJUSTMENT (%C, %R)
+ -----------------------------------------------------
   * 1/4 oz Vodka      Pour all ingredients into mixing
   * 1/4 oz Gin        tin with ice, strain into glass.
   * 1/4 oz Amaretto

diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in
index a9ec76a10bcc270213c242d963a911a7848f634f..ac08c8da7ce26dda283666d1b0a3e38aecccb043 100644 (file)
--- a/package/base-files/image-config.in
+++ b/package/base-files/image-config.in
@@ -145,7 +145,7 @@ menuconfig VERSIONOPT
        config VERSION_DIST
                string
                prompt "Release distribution" if VERSIONOPT
-               default "OpenWrt"
+               default "OpenWrt" if VERSIONOPT
                help
                        This is the name of the release distribution.
                        If unspecified, it defaults to OpenWrt.
@@ -168,7 +168,7 @@ menuconfig VERSIONOPT
        config VERSION_REPO
                string
                prompt "Release repository" if VERSIONOPT
-               default "http://downloads.openwrt.org/snapshots/trunk/%T/packages"
+               default "http://downloads.openwrt.org/snapshots/trunk/%T/packages" if VERSIONOPT
                help
                        This is the repository address embedded in the image, it defaults
                        to the trunk snapshot repo; the url may contain the following placeholders: