From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 2 Jan 2006 13:00:09 +0000 (+0000)
Subject: Corrected ticket #100
X-Git-Tag: fast2504n-3.10.28-merged~23607
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=fa1006508aa988e04643466a5a1c1c3451fa291b;p=openwrt.git

Corrected ticket #100


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2804 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/openssh/files/S50sshd b/openwrt/package/openssh/files/S50sshd
index bb23691954..f1bc83366d 100755
--- a/openwrt/package/openssh/files/S50sshd
+++ b/openwrt/package/openssh/files/S50sshd
@@ -2,7 +2,7 @@
 
 for type in rsa dsa; do {
   # check for keys
-  key=/etc/ssh/ssh_${type}_host_key
+  key=/etc/ssh/ssh_host_${type}_key
   [ ! -f $key ] && {
     # generate missing keys
     [ -x /usr/bin/ssh-keygen ] && {
@@ -11,5 +11,5 @@ for type in rsa dsa; do {
     exit 0
   }
 }; done
-
+mkdir -p /var/emtpy
 /usr/sbin/sshd
diff --git a/openwrt/package/openssh/ipkg/openssh-server.postinst b/openwrt/package/openssh/ipkg/openssh-server.postinst
new file mode 100644
index 0000000000..b6e167f696
--- /dev/null
+++ b/openwrt/package/openssh/ipkg/openssh-server.postinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+name=sshd
+id=99
+
+# do not change below
+# check if we are on real system
+if [ -z "${IPKG_INSTROOT}" ]; then
+	# create copies of passwd and group, if we use squashfs
+	rootfs=`mount |awk '/root/ { print $5 }'`
+	if [ "$rootfs" = "squashfs" ]; then
+		if [ -h /etc/group ]; then
+			rm /etc/group
+			cp /rom/etc/group /etc/group
+		fi
+		if [ -h /etc/passwd ]; then
+			rm /etc/passwd
+			cp /rom/etc/passwd /etc/passwd
+		fi
+	fi
+fi
+
+echo ""
+if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/group)" ]; then 
+	echo "adding group $name to /etc/group"
+	echo "${name}:x:${id}:" >> ${IPKG_INSTROOT}/etc/group  
+fi
+
+if [ -z "$(grep ^\\${name}: ${IPKG_INSTROOT}/etc/passwd)" ]; then 
+	echo "adding user $name to /etc/passwd"
+	echo "${name}:x:${id}:${id}:${name}:/var/empty/.${name}:/bin/false" >> ${IPKG_INSTROOT}/etc/passwd
+fi