r1026 - in trunk/bootscripts: . contrib lfs/init.d

jim at linuxfromscratch.org jim at linuxfromscratch.org
Sun Jan 8 15:20:53 PST 2006


Author: jim
Date: 2006-01-08 16:20:51 -0700 (Sun, 08 Jan 2006)
New Revision: 1026

Removed:
   trunk/bootscripts/contrib/hotplug/
   trunk/bootscripts/lfs/init.d/hotplug
   trunk/bootscripts/lfs/init.d/udev
Modified:
   trunk/bootscripts/
   trunk/bootscripts/Makefile
Log:
 r1320 at server:  jim | 2006-01-08 15:19:58 -0800
 Removed net.agent since it's a part of the udev package



Property changes on: trunk/bootscripts
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1319
   + 3949c430-d905-0410-97b6-f115d20341b5:/bootscripts:1320

Modified: trunk/bootscripts/Makefile
===================================================================
--- trunk/bootscripts/Makefile	2006-01-08 23:20:41 UTC (rev 1025)
+++ trunk/bootscripts/Makefile	2006-01-08 23:20:51 UTC (rev 1026)
@@ -120,9 +120,5 @@
 	ln -sf ../init.d/setclock    ${EXTDIR}/rc.d/rcsysinit.d/S60setclock
 	if [ ! -f ${EXTDIR}/sysconfig/rc          ]; then install -m ${CONFMODE} lfs/sysconfig/rc          ${EXTDIR}/sysconfig/; fi
 
-install-net-agent:
-	install                   -m 755 contrib/hotplug/net.agent   ${EXTDIR}/hotplug
-
 .PHONY: all create-dirs create-service-dir \
-	install install-service-mtu install-livecd \
-	install-net-agent install-enhanced
+	install install-service-mtu

Deleted: trunk/bootscripts/lfs/init.d/hotplug
===================================================================
--- trunk/bootscripts/lfs/init.d/hotplug	2006-01-08 23:20:41 UTC (rev 1025)
+++ trunk/bootscripts/lfs/init.d/hotplug	2006-01-08 23:20:51 UTC (rev 1026)
@@ -1,44 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/hotplug
-#
-# Description : Load modules for system devices
-#
-# Authors     : Zack Winkles
-#
-# Version     : 00.02
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-	start|restart)
-		boot_mesg "Loading modules for system devices..."
-		for rc in /etc/hotplug/*.rc
-		do
-			${rc} ${1}
-		done
-		echo_ok
-		;;
-	stop)
-		# Remove and Recreate /var/log/hotplug/events
-		> /var/log/hotplug/events
-
-		;;
-	status)
-		for rc in /etc/hotplug/*.rc
-		do
-			${rc} status
-		done
-		;;
-	*)
-		echo "Usage: ${0} {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/hotplug

Deleted: trunk/bootscripts/lfs/init.d/udev
===================================================================
--- trunk/bootscripts/lfs/init.d/udev	2006-01-08 23:20:41 UTC (rev 1025)
+++ trunk/bootscripts/lfs/init.d/udev	2006-01-08 23:20:51 UTC (rev 1026)
@@ -1,88 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/udev
-#
-# Description : Udev cold-plugging script
-#
-# Authors     : Zack Winkles
-#
-# Version     : 00.01
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-# Create some things that sysfs does not, and should not export for us.  Feel
-# free to add devices to this list.
-make_extra_nodes() {
-	ln -s /proc/self/fd /dev/fd
-	ln -s /proc/self/fd/0 /dev/stdin
-	ln -s /proc/self/fd/1 /dev/stdout
-	ln -s /proc/self/fd/2 /dev/stderr
-	ln -s /proc/kcore /dev/core
-	mkdir /dev/pts
-	mkdir /dev/shm
-}
-
-case "${1}" in
-	start)
-		boot_mesg "Populating /dev with device nodes..."
-		if ! grep -q '[[:space:]]sysfs' /proc/mounts; then
-			boot_log " The SysFS filesystem could not be found.  Unable to continue."
-			echo_failure
-			boot_mesg -n "FAILURE:\n\nUnable to create" ${FAILURE}
-			boot_mesg -n " devices without a SysFS filesystem"
-			boot_mesg -n "\n\nAfter you press Enter, this system"
-			boot_mesg -n " will be halted and powered off."
-			boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
-			boot_mesg "" ${NORMAL}
-			read ENTER
-			/etc/rc.d/init.d/halt stop
-		fi
-
-		# Mount a temporary file system over /dev, so that any devices
-		# made or removed during this boot don't affect the next one.
-		# The reason we don't write to mtab is because we don't ever
-		# want /dev to be unavailable (such as by `umount -a').
-		mount -n -t tmpfs tmpfs /dev -o mode=755
-		if [ ${?} != 0 ]; then
-			boot_log "Unable to mount a tmpfs onto /dev."
-			echo_failure
-			boot_mesg -n "FAILURE:\n\nCannot mount a tmpfs" ${FAILURE}
-			boot_mesg -n " onto /dev, this system will be halted."
-			boot_mesg -n "\n\nAfter you press Enter, this system"
-			boot_mesg -n " will be halted and powered off."
-			boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
-			boot_mesg "" ${NORMAL}
-			read ENTER
-			/etc/rc.d/init.d/halt stop
-		fi
-
-		# Assign udevsend to get hotplug events. udevsend can manage the whole
-		# hotplug handling by taking over the kernel spawned event process
-		echo /sbin/udevsend > /proc/sys/kernel/hotplug
-
-		# Populate /dev with all the devices that are already available,
-		# and save it's status so we can report failures.
-		udevstart || failed=1
-
-		# Now, create some required files/directories/devices that sysfs
-		# doesn't export for us.
-		make_extra_nodes
-
-		# When reporting the status, base it on the success or failure
-		# of the `udevstart' command, since that's the most important.
-		(exit ${failed})
-		evaluate_retval
-		;;
-
-	*)
-		echo "Usage ${0} {start}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/udev




More information about the cross-lfs mailing list