Author: jim
Date: 2006-03-26 10:50:05 -0700 (Sun, 26 Mar 2006)
New Revision: 1316
Modified:
/
trunk/udev/
trunk/udev/35-helper.rules
trunk/udev/Makefile
Log:
[EMAIL PROTECTED] (orig r1316): jim | 2006-03-26 09:42:31 -0800
[EMAIL PROTECTED]: jim | 2006-03-26 09:41:12 -0800
Updates: separated sound removed network_helper from the default install
Property changes on:
___________________________________________________________________
Name: svk:merge
- b6734a72-470d-0410-b049-f317dca95413:/:1313
+ b6734a72-470d-0410-b049-f317dca95413:/:1316
Property changes on: trunk/udev
___________________________________________________________________
Name: svk:merge
- 38c7b366-470d-0410-a457-935707c16d9b:/udev:2685
3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1263
+ 38c7b366-470d-0410-a457-935707c16d9b:/udev:2702
3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1263
Modified: trunk/udev/35-helper.rules
===================================================================
--- trunk/udev/35-helper.rules 2006-03-23 19:35:03 UTC (rev 1315)
+++ trunk/udev/35-helper.rules 2006-03-26 17:50:05 UTC (rev 1316)
@@ -29,9 +29,5 @@
ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%m"
ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="dvdrw%m"
-# Run network stuff when the network device is loaded
-ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="network_helper.sh"
-ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="*",
RUN+="network_helper.sh"
-
# adds floppy devices
KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{cmos}=="*",
RUN+="create_floppy_devices -c -t $sysfs{cmos} -m %M /dev/%k"t
Modified: trunk/udev/Makefile
===================================================================
--- trunk/udev/Makefile 2006-03-23 19:35:03 UTC (rev 1315)
+++ trunk/udev/Makefile 2006-03-26 17:50:05 UTC (rev 1316)
@@ -16,7 +16,6 @@
install -m ${RULESMODE} 35-helper.rules
${DESTDIR}/etc/udev/rules.d/35-helper.rules
install -m ${RULESMODE} 40-modprobe.rules
${DESTDIR}/etc/udev/rules.d/40-modprobe.rules
install -m ${RULESMODE} 50-udev.rules
${DESTDIR}/etc/udev/rules.d/50-udev.rules
- install -m ${RULESMODE} 55-sound.rules
${DESTDIR}/etc/udev/rules.d/55-sound.rules
install -m ${RULESMODE} 60-persistent-disk.rules
${DESTDIR}/etc/udev/rules.d/60-persistent-disk.rules
install -m ${RULESMODE} 61-persistent-input.rules
${DESTDIR}/etc/udev/rules.d/60-persistent-input.rules
install -m ${RULESMODE} 90-user.rules
${DESTDIR}/etc/udev/rules.d/90-user.rules
@@ -83,6 +82,7 @@
@echo "make install-netboot install udev rules package for
netboot"
@echo "make install-network install network helper package"
@echo "make install-network-upgrade upgrades current network helper
package"
+ @echo "make install-sound install sound rules"
@echo
"---------------------------------------------------------------------------------------"
install-helper-functions:
@@ -96,9 +96,14 @@
@echo "Adding rules to ${DESTDIR}/etc/udev/rules.d/35-helper.rules."
@cp ${DESTDIR}/etc/udev/rules.d/35-helper.rules /tmp/first
@cat /tmp/first contrib/network/rules >
${DESTDIR}/etc/udev/rules.d/35-helper.rules 2>&1
- @rm -f ${DESTDIR}/etc/rc.d/rc2.d/K80network
- @rm -f ${DESTDIR}/etc/rc.d/rc{3,4,5}.d/S20network
+ @rm -f ${DESTDIR}/etc/rc.d/rc2.d/*network
+ @rm -f ${DESTDIR}/etc/rc.d/rc{3,4,5}.d/*network
+install-sound:
+ install -d ${DESTDIR}/lib/udev
+ install -d ${DESTDIR}/etc/rc.d/init.d
+ install -m ${RULESMODE} 55-sound.rules
${DESTDIR}/etc/udev/rules.d/55-sound.rules
+
install-network-update:
install -d ${DESTDIR}/lib/udev
install -d ${DESTDIR}/etc/rc.d/init.d
--
http://linuxfromscratch.org/mailman/listinfo/cross-lfs
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
