Author: alexander
Date: 2005-05-12 21:36:52 -0600 (Thu, 12 May 2005)
New Revision: 142
Modified:
branches/unionfs/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
Log:
Moved host key generation from autosshd to sshd script.
Modified:
branches/unionfs/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
===================================================================
---
branches/unionfs/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
2005-05-12 13:09:31 UTC (rev 141)
+++
branches/unionfs/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
2005-05-13 03:36:52 UTC (rev 142)
@@ -1,7 +1,7 @@
diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd
blfs-bootscripts-20050313/blfs/init.d/autosshd
--- blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd 1970-01-01
05:00:00.000000000 +0500
-+++ blfs-bootscripts-20050313/blfs/init.d/autosshd 2005-05-12
15:22:10.000000000 +0600
-@@ -0,0 +1,29 @@
++++ blfs-bootscripts-20050313/blfs/init.d/autosshd 2005-05-13
09:07:15.000000000 +0600
+@@ -0,0 +1,26 @@
+#!/bin/sh
+# Begin $rc_base/init.d/autosshd
+
@@ -12,9 +12,6 @@
+ start)
+ if cat /proc/cmdline | grep -q "autosshd"; then
+ echo "root:lfs" | chpasswd
-+ ssh-keygen -q -t rsa1 -f /etc/ssh/ssh_host_key -N ""
-+ ssh-keygen -q -t rsa -f /etc/ssh/ssh_host_rsa_key -N ""
-+ ssh-keygen -q -t dsa -f /etc/ssh/ssh_host_dsa_key -N ""
+ /etc/rc.d/init.d/sshd start
+ fi
+ ;;
@@ -31,9 +28,22 @@
+esac
+
+# End $rc_base/init.d/autosshd
+diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd
blfs-bootscripts-20050313/blfs/init.d/sshd
+--- blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd 2004-09-29
10:00:58.000000000 +0600
++++ blfs-bootscripts-20050313/blfs/init.d/sshd 2005-05-13 09:09:05.000000000
+0600
+@@ -13,6 +13,9 @@
+ case "$1" in
+ start)
+ echo "Starting SSH Server..."
++ [ -f /etc/ssh/ssh_host_key ] || ssh-keygen -q -t rsa1 -f
/etc/ssh/ssh_host_key -N ""
++ [ -f /etc/ssh/ssh_host_rsa_key ] || ssh-keygen -q -t rsa -f
/etc/ssh/ssh_host_rsa_key -N ""
++ [ -f /etc/ssh/ssh_host_dsa_key ] || ssh-keygen -q -t dsa -f
/etc/ssh/ssh_host_dsa_key -N ""
+ loadproc /usr/sbin/sshd
+ ;;
+
diff -Naur blfs-bootscripts-20050313-ORIG/Makefile
blfs-bootscripts-20050313/Makefile
---- blfs-bootscripts-20050313-ORIG/Makefile 2005-03-06 22:48:33.000000000
-0500
-+++ blfs-bootscripts-20050313/Makefile 2005-05-04 08:30:23.535364221 -0400
+--- blfs-bootscripts-20050313-ORIG/Makefile 2005-03-07 08:48:33.000000000
+0500
++++ blfs-bootscripts-20050313/Makefile 2005-05-13 09:07:03.000000000 +0600
@@ -54,6 +54,16 @@
install -m $(CONFMODE) blfs/sysconfig/autofs.conf $(EXTDIR)/sysconfig/
ln -sf ../init.d/autofs $(EXTDIR)/rc.d/rcsysinit.d/S45autofs
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
