diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-02-03 22:28:16 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-02-03 22:28:16 +0000 |
| commit | a377aa9ab534ed8fbbc6bbd867bfd66566da73ce (patch) | |
| tree | 1524bfc4ecb86f4e12f4842dcf20e64fe4675bd1 | |
| parent | 59ff6c01d8581b8b787d6df3580bdcce96f17625 (diff) | |
| download | mtk-20170518-a377aa9ab534ed8fbbc6bbd867bfd66566da73ce.zip mtk-20170518-a377aa9ab534ed8fbbc6bbd867bfd66566da73ce.tar.gz mtk-20170518-a377aa9ab534ed8fbbc6bbd867bfd66566da73ce.tar.bz2 | |
add dropkey ssh keys and config files to the conffiles section (#2014)
SVN-Revision: 14399
| -rw-r--r-- | package/dropbear/Makefile | 11 | ||||
| -rwxr-xr-x | package/dropbear/files/dropbear.init | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index a98c24a..5943fc6 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -35,6 +35,12 @@ define Package/dropbear/description A small SSH2 server/client designed for small memory environments. endef +define Package/dropbear/conffiles +/etc/dropbear/dropbear_rsa_host_key +/etc/dropbear/dropbear_dss_host_key +/etc/config/dropbear +endef + define Package/dropbearconvert $(call Package/dropbear/Default) SECTION:=utils @@ -89,8 +95,9 @@ define Package/dropbear/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dropbear.init $(1)/etc/init.d/dropbear $(INSTALL_DIR) $(1)/usr/lib/opkg/info - echo /etc/dropbear/dropbear_rsa_host_key > $(1)/usr/lib/opkg/info/dropbear.conffiles - echo /etc/dropbear/dropbear_dss_host_key >> $(1)/usr/lib/opkg/info/dropbear.conffiles + $(INSTALL_DIR) $(1)/etc/dropbear + touch $(1)/etc/dropbear/dropbear_rsa_host_key + touch $(1)/etc/dropbear/dropbear_dss_host_key endef define Package/dropbearconvert/install diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init index f671df7..aaa4470 100755 --- a/package/dropbear/files/dropbear.init +++ b/package/dropbear/files/dropbear.init @@ -26,7 +26,7 @@ keygen() { for keytype in rsa dss; do # check for keys key=dropbear/dropbear_${keytype}_host_key - [ -f /tmp/$key -o -f /etc/$key ] || { + [ -f /tmp/$key -o -s /etc/$key ] || { # generate missing keys mkdir -p /tmp/dropbear [ -x /usr/bin/dropbearkey ] && { @@ -45,8 +45,8 @@ keygen() { } start() { - [ -f /etc/dropbear/dropbear_rsa_host_key -a \ - -f /etc/dropbear/dropbear_dss_host_key ] || keygen + [ -s /etc/dropbear/dropbear_rsa_host_key -a \ + -s /etc/dropbear/dropbear_dss_host_key ] || keygen config_load dropbear /usr/sbin/dropbear $DROPBEAR_ARGS |