From dfaaa0166f1e449ada61793bb1fa7c8492782c2d Mon Sep 17 00:00:00 2001 From: Maarten Vanraes Date: Sun, 26 Feb 2012 17:10:20 +0000 Subject: escape / in generated passwords & add trailing ; in command lists in startssh --- rescue/startssh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rescue/startssh') diff --git a/rescue/startssh b/rescue/startssh index 0a88820de..e14bb10e8 100755 --- a/rescue/startssh +++ b/rescue/startssh @@ -8,8 +8,8 @@ fi # generate host keys mkdir -p /etc/dropbear -[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null || { echo "Can't generate dsa host key" >&2 ; exit 4 } -[[ -f /etc/dropbear/dropbear_rsa_host_key ]] || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null || { echo "Can't generate rsa host key" >&2 ; exit 3 } +[[ -f /etc/dropbear/dropbear_dss_host_key ]] || dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key >/dev/null || { echo "Can't generate dsa host key" >&2 ; exit 4; } +[[ -f /etc/dropbear/dropbear_rsa_host_key ]] || dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key >/dev/null || { echo "Can't generate rsa host key" >&2 ; exit 3; } # set a password passwd=`genpasswd` @@ -17,11 +17,11 @@ if (( $? != 0 )); then reset exit $? fi -sed -E -i -e 's/^root:[^:]*:/root:'"$passwd"':/' /etc/passwd || { echo "Can't set password" >&2 ; exit 2 } +sed -E -i -e 's/^root:[^:]*:/root:'"${passwd//\//\\/}"':/' /etc/passwd || { echo "Can't set password" >&2 ; exit 2; } # test for /dev/pts grep '^devpts /dev/pts devpts ' /proc/mounts >/dev/null 2>/dev/null || mount -t devpts devpts /dev/pts echo "" echo -n "Starting ssh daemon... " -dropbear -E 2>/var/log/dropbear.log && echo "OK" || { echo "Failed" ; exit 1 } +dropbear -E 2>/var/log/dropbear.log && echo "OK" || { echo "Failed" ; exit 1; } -- cgit v1.2.1