Author: jhuntwork
Date: 2005-05-14 10:01:14 -0600 (Sat, 14 May 2005)
New Revision: 164
Added:
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050509-add-autosshd-1.patch
Removed:
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
Modified:
trunk/TODO
trunk/etc/sysconfig/network-devices/ifconfig.eth0
trunk/packages/blfs-bootscripts/Makefile
Log:
Upgraded blfs bootscripts and added 20 second timeout to dhcpcd
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-05-14 15:45:30 UTC (rev 163)
+++ trunk/TODO 2005-05-14 16:01:14 UTC (rev 164)
@@ -9,6 +9,5 @@
* Remove Bitstream Vera, adjust /etc/fonts/fonts.conf accordingly
* Ask someone how to use USB to serial converters. Add support to the kernel.
* Find out exact requirements for Intel framebuffer
-* Reduce dhcpcd timeout. The boot process appears to hang when there is no
DHCP server in the network.
* Change /etc/issue information to acknowledge work done by the new livecd
team as well.
Should we list team members?
Modified: trunk/etc/sysconfig/network-devices/ifconfig.eth0
===================================================================
--- trunk/etc/sysconfig/network-devices/ifconfig.eth0 2005-05-14 15:45:30 UTC
(rev 163)
+++ trunk/etc/sysconfig/network-devices/ifconfig.eth0 2005-05-14 16:01:14 UTC
(rev 164)
@@ -1,5 +1,5 @@
ONBOOT="yes"
SERVICE="dhcpcd"
-DHCP_START=""
+DHCP_START="-t 20"
DHCP_STOP="-k"
PRINTALL="yes"
Modified: trunk/packages/blfs-bootscripts/Makefile
===================================================================
--- trunk/packages/blfs-bootscripts/Makefile 2005-05-14 15:45:30 UTC (rev
163)
+++ trunk/packages/blfs-bootscripts/Makefile 2005-05-14 16:01:14 UTC (rev
164)
@@ -2,7 +2,7 @@
# Package versions
NM= blfs-bootscripts
-VRS= 20050313
+VRS= 20050509
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
PATCH=$(DIR)-add-autosshd-1.patch
Deleted:
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
===================================================================
---
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
2005-05-14 15:45:30 UTC (rev 163)
+++
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
2005-05-14 16:01:14 UTC (rev 164)
@@ -1,63 +0,0 @@
-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-13
09:07:15.000000000 +0600
-@@ -0,0 +1,26 @@
-+#!/bin/sh
-+# Begin $rc_base/init.d/autosshd
-+
-+. /etc/sysconfig/rc
-+. $rc_functions
-+
-+case "$1" in
-+ start)
-+ if cat /proc/cmdline | grep -q "autosshd"; then
-+ echo "root:lfs" | chpasswd
-+ /etc/rc.d/init.d/sshd start
-+ fi
-+ ;;
-+ stop)
-+ if statusproc /usr/sbin/sshd | grep -q "Process ID"
-+ then
-+ /etc/rc.d/init.d/sshd stop
-+ fi
-+ ;;
-+ *)
-+ echo "Usage: $0 {start|stop}"
-+ exit 1
-+ ;;
-+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-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
-
-+install-autosshd: create-dirs
-+ install -m ${MODE} blfs/init.d/autosshd ${EXTDIR}/rc.d/init.d/
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc0.d/K40autosshd
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc1.d/K40autosshd
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc2.d/K40autosshd
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc3.d/S40autosshd
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc4.d/S40autosshd
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc5.d/S40autosshd
-+ ln -sf ../init.d/autosshd ${EXTDIR}/rc.d/rc6.d/K40autosshd
-+
- install-bind: create-dirs
- install -m ${MODE} blfs/init.d/bind ${EXTDIR}/rc.d/init.d/
- ln -sf ../init.d/bind ${EXTDIR}/rc.d/rc0.d/K49bind
Copied:
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050509-add-autosshd-1.patch
(from rev 161,
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
