# HG changeset patch
# User Aleksej Bobylev <al.bobylev@gmail.com>
# Date 1449787259 -7200
# Node ID e2e3be9972facf2a07cd7d911f686b6fdd187a2a
# Parent  b103fbd6b3b8a06a43e51bfcdec10972bcac5ec2
openssh, openssh-pam: fix post_install() with --root

diff -r b103fbd6b3b8 -r e2e3be9972fa openssh-pam/receipt
--- a/openssh-pam/receipt	Thu Dec 10 21:28:40 2015 +0100
+++ b/openssh-pam/receipt	Fri Dec 11 00:40:59 2015 +0200
@@ -40,7 +40,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh 
+	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
 	cp -a $install/usr/sbin $install/usr/bin $fs/usr
 	rm -f $fs/usr/sbin/sftp-server
 	cp -a $install/etc $fs
@@ -52,22 +52,23 @@
 
 post_install()
 {
-	grep -q ssh $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
+	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
 #ssh	stream	tcp	nowait	root	sshd	sshd	-i
 EOT
 	while read dropbear openssh ; do
-		[ -s $1$dropbear ] || continue
-		dropbearconvert dropbear openssh $1$dropbear $1$openssh
-		dropbearkey -y -f $1$dropbear | grep ssh > $1$openssh.pub
-		dropbearkey -y -f $1$dropbear | grep Fingerprint
+		[ -s "$1$dropbear" ] || continue
+		dropbearconvert dropbear openssh "$1$dropbear" "$1$openssh"
+		dropbearkey -y -f "$1$dropbear" | grep ssh > "$1$openssh.pub"
+		dropbearkey -y -f "$1$dropbear" | grep Fingerprint
 	done <<EOT
 /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 EOT
-ssh-keygen -A
+
+	chroot "$1/" ssh-keygen -A
 }
 
 post_remove()
 {
-	grep -q sshd $1/etc/inetd.conf && sed -i '/sshd/d' $1/etc/inetd.conf
+	grep -q sshd "$1/etc/inetd.conf" && sed -i '/sshd/d' "$1/etc/inetd.conf"
 }
diff -r b103fbd6b3b8 -r e2e3be9972fa openssh/receipt
--- a/openssh/receipt	Thu Dec 10 21:28:40 2015 +0100
+++ b/openssh/receipt	Fri Dec 11 00:40:59 2015 +0200
@@ -40,7 +40,7 @@
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh 
+	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/ssh
 	cp -a $install/usr/sbin $install/usr/bin $fs/usr
 	rm -f $fs/usr/sbin/sftp-server
 	cp -a $install/etc $fs
@@ -51,22 +51,23 @@
 
 post_install()
 {
-	grep -q ssh $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
+	grep -q ssh "$1/etc/inetd.conf" || cat >> "$1/etc/inetd.conf" <<EOT
 #ssh	stream	tcp	nowait	root	sshd	sshd	-i
 EOT
 	while read dropbear openssh ; do
-		[ -s $1$dropbear ] || continue
-		dropbearconvert dropbear openssh $1$dropbear $1$openssh
-		dropbearkey -y -f $1$dropbear | grep ssh > $1$openssh.pub
-		dropbearkey -y -f $1$dropbear | grep Fingerprint
+		[ -s "$1$dropbear" ] || continue
+		dropbearconvert dropbear openssh "$1$dropbear" "$1$openssh"
+		dropbearkey -y -f "$1$dropbear" | grep ssh > "$1$openssh.pub"
+		dropbearkey -y -f "$1$dropbear" | grep Fingerprint
 	done <<EOT
 /etc/dropbear/dropbear_rsa_host_key	/etc/ssh/ssh_host_rsa_key
 /etc/dropbear/dropbear_dss_host_key	/etc/ssh/ssh_host_dsa_key
 EOT
-ssh-keygen -A
+
+	chroot "$1/" ssh-keygen -A
 }
 
 post_remove()
 {
-	grep -q sshd $1/etc/inetd.conf && sed -i '/sshd/d' $1/etc/inetd.conf
+	grep -q sshd "$1/etc/inetd.conf" && sed -i '/sshd/d' "$1/etc/inetd.conf"
 }
diff -r b103fbd6b3b8 -r e2e3be9972fa openssh/stuff/openssh
--- a/openssh/stuff/openssh	Thu Dec 10 21:28:40 2015 +0100
+++ b/openssh/stuff/openssh	Fri Dec 11 00:40:59 2015 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
-# /etc/init.d/openssh : Start, stop and restart OpenSSH server on SliTaz, at 
+# /etc/init.d/openssh : Start, stop and restart OpenSSH server on SliTaz, at
 # boot time or with the command line.
 #
 # To start OpenSSH server at boot time, just put openssh in the $RUN_DAEMONS
@@ -15,55 +15,55 @@
 PIDFILE=/var/run/sshd.pid
 
 [ -d /var/run/sshd ] || mkdir -p /var/run/sshd
+
 case "$1" in
-  start)
-    # We need rsa and dsa host key file to start dropbear.
-    if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then
-      echo "Generating $NAME rsa key... "
-      ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N ''
-    fi
-    if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then
-      echo "Generating $NAME dsa key... "
-      ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N ''
-    fi
-    if [ ! -f /etc/ssh/ssh_host_ecdsa_key ] ; then
-      echo "Generating $NAME ecdsa key... "
-      ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C '' -N ''
-    fi
-    if active_pidfile $PIDFILE sshd ; then
-      echo "$NAME already running."
-      exit 1
-    fi
-    echo -n "Starting $DESC: $NAME... "
-    $DAEMON $OPTIONS
-    status
-    ;;
-  stop)
-    if ! active_pidfile $PIDFILE sshd ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Stopping $DESC: $NAME... "
-    kill `cat $PIDFILE`
-    status
-    ;;
-  restart)
-    if ! active_pidfile $PIDFILE sshd ; then
-      echo "$NAME is not running."
-      exit 1
-    fi
-    echo -n "Restarting $DESC: $NAME... "
-    kill `cat $PIDFILE`
-    sleep 2
-    $DAEMON $OPTIONS
-    status
-    ;;
-  *)
-    echo ""
-    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
-    echo ""
-    exit 1
-    ;;
+	start)
+		# We need rsa and dsa host key file to start dropbear.
+		if [ ! -f /etc/ssh/ssh_host_rsa_key ] ; then
+			echo "Generating $NAME rsa key... "
+			ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -C '' -N ''
+		fi
+		if [ ! -f /etc/ssh/ssh_host_dsa_key ] ; then
+			echo "Generating $NAME dsa key... "
+			ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -C '' -N ''
+		fi
+		if [ ! -f /etc/ssh/ssh_host_ecdsa_key ] ; then
+			echo "Generating $NAME ecdsa key... "
+			ssh-keygen -t ecdsa -f /etc/ssh/ssh_host_ecdsa_key -C '' -N ''
+		fi
+		if active_pidfile $PIDFILE sshd ; then
+			echo "$NAME already running."
+			exit 1
+		fi
+		action "Starting $DESC: $NAME... "
+		$DAEMON $OPTIONS
+		status
+		;;
+	stop)
+		if ! active_pidfile $PIDFILE sshd ; then
+			echo "$NAME is not running."
+			exit 1
+		fi
+		action "Stopping $DESC: $NAME... "
+		kill $(cat $PIDFILE)
+		status
+		;;
+	restart)
+		if ! active_pidfile $PIDFILE sshd ; then
+			echo "$NAME is not running."
+			exit 1
+		fi
+		action "Restarting $DESC: $NAME... "
+		kill $(cat $PIDFILE)
+		sleep 2
+		$DAEMON $OPTIONS
+		status
+		;;
+	*)
+		emsg "<n><b>Usage:</b> /etc/init.d/$(basename $0) [start|stop|restart]"
+		newline
+		exit 1
+		;;
 esac
 
 exit 0