[Clfs-commits] commit: r38 - in /trunk/standard: Changelog Makefile netboot/rc.sysinit

[svn at cross-lfs.org]

Author: jim
Date: Wed Jan 14 09:17:51 2009
New Revision: 38

Log:
Updates to netboot scripts

Modified:
    trunk/standard/Changelog
    trunk/standard/Makefile
    trunk/standard/netboot/rc.sysinit

Modified: trunk/standard/Changelog
==============================================================================
--- trunk/standard/Changelog (original)
+++ trunk/standard/Changelog Wed Jan 14 09:17:51 2009
@@ -1,3 +1,7 @@
+jim - Janurary 14, 2009
+	* Fixed Netboot Udev Setup
+	* Remove all script directories for netboot
+
 jim - Janurary 8, 2009
 	* Remove Console Script
 	* Added i18n Script

Modified: trunk/standard/Makefile
==============================================================================
--- trunk/standard/Makefile (original)
+++ trunk/standard/Makefile Wed Jan 14 09:17:51 2009
@@ -196,7 +196,8 @@
 install-service-pppoe: create-service-dir
 	install -m ${MODE} cblfs/sysconfig/network-devices/services/pppoe    ${EXTDIR}/sysconfig/network-devices/services
 
-install-netboot: create-dirs
+install-netboot: create-dirs create-service-dir udev_device_dirs udev_device_links
+	rm -rf ${EXTDIR}/rc.d
 	install -d -m ${DIRMODE} ${EXTDIR}/rc.d
 	install -m ${MODE} netboot/rc.0         ${EXTDIR}/rc.d/
 	install -m ${MODE} netboot/rc.1         ${EXTDIR}/rc.d/

Modified: trunk/standard/netboot/rc.sysinit
==============================================================================
--- trunk/standard/netboot/rc.sysinit (original)
+++ trunk/standard/netboot/rc.sysinit Wed Jan 14 09:17:51 2009
@@ -14,12 +14,6 @@
 
 export PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin:/tools/sbin
 
-if [ -d "/lib64" ]; then
-	udev_libdir=/lib64
-else
-	udev_libdir=/lib
-fi
-
 echo -n "Mounting kernel-based file systems:"
 echo -n " proc"
 mount -n /proc
@@ -29,13 +23,13 @@
 
 echo "Starting udev"
 mount -n -t tmpfs -o mode=0755 udev /dev
-cp --preserve=all --recursive --remove-destination  ${udev_libdir}/udev/devices/* /dev
+cp --preserve=all --recursive --remove-destination  /lib/udev/devices/* /dev
 chmod 1777 /dev/shm
 echo "" > /sys/kernel/uevent_helper
 /sbin/udevd --daemon
 mkdir -p /dev/.udev/queue
-/sbin/udevtrigger
-/sbin/udevsettle
+/sbin/udevadm trigger
+/sbin/udevadm settle
 
 echo "Remounting Root File System"
 mount -n -o remount,rw /