#4985 - fixes dropbear banner file, thanks Roman Yepishev

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18009 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/dropbear/files/dropbear.config b/package/dropbear/files/dropbear.config
index e660ac7356f11bf3c06f169d6eb4886a443b1976..492d2a1742a260af6ecc09f5dfd5e7ec0e4d1c72 100644 (file)
--- a/package/dropbear/files/dropbear.config
+++ b/package/dropbear/files/dropbear.config
@@ -1,3 +1,4 @@
 config dropbear
        option PasswordAuth 'on'
        option Port         '22'
+#      option BannerFile   '/etc/banner'

diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index c91d0a71661d76a35e779e5ec93c8e6bc1cb1d5d..30cb44b1b151e309cdef616914625abe68c65bfb 100755 (executable)
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -34,10 +34,14 @@ dropbear_start()
        # B) listen port
        local port
        config_get port "${section}" Port
+       # C) banner file
+       local bannerfile
+       config_get bannerfile ${section} BannerFile
+       [ -f $bannerfile ] || bannerfile=''
 
        # concatenate parameters
        local args
-       args="${nopasswd:+-s }${port:+-p ${port}} -P /var/run/${NAME}.${PIDCOUNT}.pid"
+       args="${nopasswd:+-s }${port:+-p ${port} }${bannerfile:+-b $bannerfile }-P /var/run/${NAME}.${PIDCOUNT}.pid"
 
        # execute program and return its exit code
        [ "${verbosed}" -ne 0 ] && echo "${initscript}: section ${section} starting ${PROG} ${args}"