rpms/udev/devel udev-118-sysconf.patch, NONE, 1.1 udev.sysconfig, NONE, 1.1 start_udev, 1.68, 1.69 udev-post.init, 1.4, 1.5 udev.spec, 1.236, 1.237
Harald Hoyer (harald)
fedora-extras-commits at redhat.com
Thu Mar 13 15:28:55 UTC 2008
- Previous message (by thread): rpms/kernel/devel patch-2.6.25-rc5-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.780, 1.781 kernel.spec, 1.500, 1.501 sources, 1.740, 1.741 upstream, 1.662, 1.663 linux-2.6-ppc32-ucmpdi2.patch, 1.3, NONE patch-2.6.25-rc5-git2.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/libvirt/devel libvirt-0.4.1-qemu-media-change.patch, NONE, 1.1 libvirt-0.4.1-tap-ifname.patch, NONE, 1.1 libvirt-0.4.1-xen-boot-device.patch, NONE, 1.1 libvirt.spec, 1.77, 1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: harald
Update of /cvs/pkgs/rpms/udev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15012
Modified Files:
start_udev udev-post.init udev.spec
Added Files:
udev-118-sysconf.patch udev.sysconfig
Log Message:
* Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-8
- added /etc/sysconfig/udev to configure some speedups
- added "udevnopersist" as a kernel command line, to disable
persistent storage symlink generation
udev-118-sysconf.patch:
--- NEW FILE udev-118-sysconf.patch ---
diff -up udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules
--- udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules.sysconf 2008-03-13 16:10:00.000000000 +0100
+++ udev-118/etc/udev/rules.d/60-persistent-storage-tape.rules 2008-03-13 16:12:52.000000000 +0100
@@ -3,6 +3,7 @@
# persistent storage links: /dev/tape/{by-id,by-path}
ACTION!="add", GOTO="persistent_storage_tape_end"
+ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_tape_end"
KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
diff -up udev-118/etc/udev/rules.d/60-persistent-storage.rules.sysconf udev-118/etc/udev/rules.d/60-persistent-storage.rules
--- udev-118/etc/udev/rules.d/60-persistent-storage.rules.sysconf 2008-03-13 16:09:51.000000000 +0100
+++ udev-118/etc/udev/rules.d/60-persistent-storage.rules 2008-03-13 16:12:55.000000000 +0100
@@ -4,6 +4,7 @@
# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
ACTION!="add", GOTO="persistent_storage_end"
+ENV{UDEV_NO_PERSISTENT_STORAGE}=="1", GOTO="persistent_storage_end"
SUBSYSTEM!="block", GOTO="persistent_storage_end"
# skip rules for inappropriate block devices
--- NEW FILE udev.sysconfig ---
# generate a cache shell file of what MAKEDEV would do
# speedup some systems with slow disks
UDEV_USE_MAKEDEV_CACHE="yes"
# generates /dev/disk/by* symlinks
# set to "no", if you don't need it and want a speedup at boot time
UDEV_PERSISTENT_STORAGE="yes"
Index: start_udev
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/start_udev,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- start_udev 13 Mar 2008 13:00:09 -0000 1.68
+++ start_udev 13 Mar 2008 15:28:17 -0000 1.69
@@ -37,6 +37,7 @@
fi
. /etc/init.d/functions
+. /etc/sysconfig/udev
prog=udev
bin=/sbin/udev
@@ -83,7 +84,7 @@
[ -d /dev/.udev/makedev.d ] || mkdir -p /dev/.udev/makedev.d
USE_MD5="false"
- [ -x /usr/bin/md5sum ] && USE_MD5="true"
+ [ -x /usr/bin/md5sum -a "$UDEV_USE_MAKEDEV_CACHE" == "yes" ] && USE_MD5="true"
if [ -x "$MAKEDEV" ]; then
for i in /etc/udev/makedev.d/*.nodes; do
if [ -f "$i" ]; then
@@ -232,6 +233,14 @@
/sbin/udevcontrol max_childs_running=$(getval udevchilds $cmdline)
fi
+ if [ "$UDEV_PERSISTENT_STORAGE" == "no" ]; then
+ /sbin/udevcontrol env UDEV_NO_PERSISTENT_STORAGE=1
+ fi
+
+ if strstr "$cmdline" udevnopersist; then
+ /sbin/udevcontrol env UDEV_NO_PERSISTENT_STORAGE=1
+ fi
+
/sbin/udevcontrol env STARTUP=1
/sbin/udevtrigger
ret=$[$ret + $?]
Index: udev-post.init
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev-post.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- udev-post.init 13 Mar 2008 14:33:00 -0000 1.4
+++ udev-post.init 13 Mar 2008 15:28:17 -0000 1.5
@@ -17,6 +17,7 @@
### END INIT INFO
. /etc/rc.d/init.d/functions
+. /etc/sysconfig/udev
# See how we were called.
case "$1" in
@@ -28,7 +29,7 @@
STRING=$"Generating udev makedev cache file"
MAKEDEV="/sbin/MAKEDEV"
USE_MD5="false"
- [ -x /usr/bin/md5sum ] && USE_MD5="true"
+ [ -x /usr/bin/md5sum -a "$UDEV_USE_MAKEDEV_CACHE" == "yes" ] && USE_MD5="true"
if [ "$USE_MD5" == "true" -a -x "$MAKEDEV" ]; then
for i in /etc/udev/makedev.d/*.nodes; do
if [ -f "$i" ]; then
Index: udev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/udev/devel/udev.spec,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- udev.spec 13 Mar 2008 14:33:00 -0000 1.236
+++ udev.spec 13 Mar 2008 15:28:17 -0000 1.237
@@ -6,7 +6,7 @@
Summary: A userspace implementation of devfs
Name: udev
Version: 118
-Release: 7%{?dist}
+Release: 8%{?dist}
License: GPLv2
Group: System Environment/Base
Provides: udev-persistent = %{version}-%{release}
@@ -17,10 +17,12 @@
Source2: udev.nodes
Source3: udev-post.init
Source4: fw_unit_symlinks.sh
+Source5: udev.sysconfig
Patch1: udev-116-nettype.patch
Patch2: udev-116-rhrules.patch
Patch3: udev-118-varlib.patch
+Patch4: udev-118-sysconf.patch
Patch100: udev-089-nopie.patch
Patch101: udev-091-lib64.patch
@@ -75,6 +77,8 @@
%patch1 -p1 -b .nettype
%patch2 -p1 -b .rhrules
%patch3 -p1 -b .varlib
+%patch4 -p1 -b .sysconf
+
%patch100 -p1 -b .nopie
%patch101 -p1 -b .lib64
%patch102 -p1 -b .slink
@@ -243,6 +247,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
install -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/udev-post
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/udev
+
mkdir -p $RPM_BUILD_ROOT/var/lib/udev/
mkdir -p $RPM_BUILD_ROOT/var/lib/udev/makedev.d
mkdir -p $RPM_BUILD_ROOT/var/lib/udev/rules.d
@@ -348,6 +355,8 @@
%attr(0755,root,root) %dir %{udev_scriptdir}/devices/
%attr(0755,root,root) %dir %{_sysconfdir}/udev/makedev.d/
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/udev
+
%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf
%config %attr(0644,root,root) %{_sysconfdir}/udev/rules.d/*.rules
%config %attr(0644,root,root) %dir %{_sysconfdir}/udev/makedev.d/50-udev.nodes
@@ -403,6 +412,11 @@
%{_libdir}/pkgconfig/libvolume_id.pc
%changelog
+* Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-8
+- added /etc/sysconfig/udev to configure some speedups
+- added "udevnopersist" as a kernel command line, to disable
+ persistent storage symlink generation
+
* Thu Mar 13 2008 Harald Hoyer <harald at redhat.com> 118-7
- files from /var/lib/udev/rules.d are copied to /dev/.udev/rules.d
at startup and back at shutdown
- Previous message (by thread): rpms/kernel/devel patch-2.6.25-rc5-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.780, 1.781 kernel.spec, 1.500, 1.501 sources, 1.740, 1.741 upstream, 1.662, 1.663 linux-2.6-ppc32-ucmpdi2.patch, 1.3, NONE patch-2.6.25-rc5-git2.bz2.sign, 1.1, NONE
- Next message (by thread): rpms/libvirt/devel libvirt-0.4.1-qemu-media-change.patch, NONE, 1.1 libvirt-0.4.1-tap-ifname.patch, NONE, 1.1 libvirt-0.4.1-xen-boot-device.patch, NONE, 1.1 libvirt.spec, 1.77, 1.78
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list