summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/dropbear/README5
-rw-r--r--network/dropbear/doinst.sh4
2 files changed, 7 insertions, 2 deletions
diff --git a/network/dropbear/README b/network/dropbear/README
index c73c86120f..625d2d433c 100644
--- a/network/dropbear/README
+++ b/network/dropbear/README
@@ -8,5 +8,6 @@ wireless routers.
Please note that this package conflicts with OpenSSH's scp binary.
Installing this package will overwrite this file with a symbolic link
-to the dropbearmulti binary. If you later remove dropbear, scp will no
-longer work.
+to the dropbearmulti binary, so a backup of /usr/bin/scp will be made
+if it exists. After uninstalling dropbear, you can restore the backup
+with 'mv /usr/bin/scp.openssh /usr/bin/scp'.
diff --git a/network/dropbear/doinst.sh b/network/dropbear/doinst.sh
index f6e2f5b030..7b2d54ca18 100644
--- a/network/dropbear/doinst.sh
+++ b/network/dropbear/doinst.sh
@@ -17,4 +17,8 @@ if [ -e etc/rc.d/rc.dropbear ]; then
mv etc/rc.d/rc.dropbear.new.incoming etc/rc.d/rc.dropbear.new
fi
+if [ -e usr/bin/scp ]; then
+ mv usr/bin/scp usr/bin/scp.openssh
+fi
+
config etc/rc.d/rc.dropbear.new