mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-01-27 16:01:05 +02:00
fix unnecessary dropbear key generation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5354 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
f37f881a01
commit
49e1c4a590
@ -21,15 +21,15 @@ config_cb() {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
keygen() {
|
||||||
for keytype in rsa dss; do
|
for keytype in rsa dss; do
|
||||||
# check for keys
|
# check for keys
|
||||||
key=/tmp/dropbear/dropbear_${keytype}_host_key
|
key=dropbear/dropbear_${keytype}_host_key
|
||||||
[ ! -f $key ] && {
|
[ -f /tmp/$key -o -f /etc/$key ] || {
|
||||||
# generate missing keys
|
# generate missing keys
|
||||||
mkdir -p /tmp/dropbear
|
mkdir -p /tmp/dropbear
|
||||||
[ -x /usr/bin/dropbearkey ] && {
|
[ -x /usr/bin/dropbearkey ] && {
|
||||||
/usr/bin/dropbearkey -t $keytype -f $key 2>&- >&- && exec /etc/rc.common "$initscript" start
|
/usr/bin/dropbearkey -t $keytype -f /etc/$key 2>&- >&- && exec /etc/rc.common "$initscript" start
|
||||||
} &
|
} &
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
@ -39,9 +39,14 @@ start() {
|
|||||||
mkdir -p /etc/dropbear
|
mkdir -p /etc/dropbear
|
||||||
mv /tmp/dropbear/dropbear_* /etc/dropbear/
|
mv /tmp/dropbear/dropbear_* /etc/dropbear/
|
||||||
lock -u /tmp/.switch2jffs
|
lock -u /tmp/.switch2jffs
|
||||||
|
|
||||||
chown root /etc/dropbear
|
chown root /etc/dropbear
|
||||||
chmod 0700 /etc/dropbear
|
chmod 0700 /etc/dropbear
|
||||||
|
}
|
||||||
|
|
||||||
|
start() {
|
||||||
|
[ -f /etc/dropbear/dropbear_rsa_host_key -a \
|
||||||
|
-f /etc/dropbear/dropbear_dss_host_key ] || keygen
|
||||||
|
|
||||||
config_load dropbear
|
config_load dropbear
|
||||||
/usr/sbin/dropbear $DROPBEAR_ARGS
|
/usr/sbin/dropbear $DROPBEAR_ARGS
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user