From: Rosen Penev Date: Wed, 30 Aug 2017 22:58:09 +0000 (-0700) Subject: dropbear: Link ssh and scp command to /bin instead of /usr/bin X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=f7528ed0a8586434e18e9007b1bf0d05a18d6418;p=openwrt%2Fstaging%2Fblogic.git dropbear: Link ssh and scp command to /bin instead of /usr/bin ssh and scp commands interfere with OpenSSH when installed in /usr/bin . One use case is when installing dropbear to get root access when only OpenSSH is available (OpenSSH disallows root password logins). Once dropbear installs, it replaces OpenSSH's executables, even when removed with opkg. OpenSSH must be reinstalled to get them back. Signed-off-by: Rosen Penev --- diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile index 7302db273c9d..95852baf77f7 100644 --- a/package/network/services/dropbear/Makefile +++ b/package/network/services/dropbear/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dropbear PKG_VERSION:=2017.75 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:= \ @@ -126,8 +126,8 @@ define Package/dropbear/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/dropbearmulti $(1)/usr/sbin/dropbear $(INSTALL_DIR) $(1)/usr/bin - $(LN) ../sbin/dropbear $(1)/usr/bin/scp - $(LN) ../sbin/dropbear $(1)/usr/bin/ssh + $(LN) ../sbin/dropbear $(1)/bin/scp + $(LN) ../sbin/dropbear $(1)/bin/ssh $(LN) ../sbin/dropbear $(1)/usr/bin/dbclient $(LN) ../sbin/dropbear $(1)/usr/bin/dropbearkey $(INSTALL_DIR) $(1)/etc/config