Hello community, here is the log from the commit of package udev checked in at Tue Jul 10 19:12:42 CEST 2007. -------- --- udev/udev.changes 2007-06-25 01:07:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/udev.changes 2007-07-06 10:54:53.650808000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 5 22:48:44 CEST 2007 - kay.sievers@suse.de + +- modprobe all requested modules without relying on sysconfig (#286132) +- rules to load TI FlashMedia modules +- remove hwup call from boot.udev +- do not care about cleaning /events, eventrecorder is gone + +------------------------------------------------------------------- New: ---- udev-git-HEAD.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udev.spec ++++++ --- /var/tmp/diff_new_pack.j22121/_old 2007-07-10 19:11:34.000000000 +0200 +++ /var/tmp/diff_new_pack.j22121/_new 2007-07-10 19:11:34.000000000 +0200 @@ -13,8 +13,8 @@ Name: udev URL: ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/ Version: 113 -Release: 2 -License: GNU General Public License (GPL) +Release: 5 +License: GPL v2 or later Group: System/Kernel Summary: A Rule-Based Device Node and Kernel Event Manager PreReq: /bin/pidof /bin/rm /usr/bin/stat %insserv_prereq %fillup_prereq @@ -29,7 +29,7 @@ Source60: boot.udev Source61: boot.udev_retry # -#Patch0: udev-git.patch +Patch0: udev-git-HEAD.patch %description udev's main task is to create and remove device nodes in /dev when a @@ -78,7 +78,7 @@ %define extras "extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/cdrom_id extras/floppy extras/path_id extras/firmware extras/rule_generator" %prep %setup -#%patch0 -p1 +%patch0 -p1 %build make V=1 libdir=/%{_lib} usrlibdir=%{_libdir} OPTFLAGS="${RPM_OPT_FLAGS}" EXTRAS=%{extras} all @@ -234,6 +234,11 @@ /%{_lib}/libvolume_id.so.* %changelog +* Thu Jul 05 2007 - kay.sievers@suse.de +- modprobe all requested modules without relying on sysconfig (#286132) +- rules to load TI FlashMedia modules +- remove hwup call from boot.udev +- do not care about cleaning /events, eventrecorder is gone * Sun Jun 24 2007 - kay.sievers@suse.de - rpmlint fixes - remove ChangeLog and other files from doc directory ++++++ boot.udev ++++++ --- udev/boot.udev 2007-04-22 22:13:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/udev/boot.udev 2007-07-06 10:47:34.215726000 +0200 @@ -32,17 +32,6 @@ rm -rf /dev/.udev $DAEMON $udevd_args - # cleanup stuff - rm -rf /events/* - - # run static device configurations - HWCFG_STUB=/etc/sysconfig/hardware/hwcfg - for cfg in ${HWCFG_STUB}-static*; do - if [ -f $cfg ]; then - /sbin/hwup ${cfg#$HWCFG_STUB-} ${cfg#$HWCFG_STUB-static-} -o auto > /dev/null 2>&1 - fi - done - # trigger events for all devices /sbin/udevtrigger ++++++ udev-git-HEAD.patch ++++++ diff --git a/etc/udev/suse/50-udev-default.rules b/etc/udev/suse/50-udev-default.rules index d859827..32e5008 100644 --- a/etc/udev/suse/50-udev-default.rules +++ b/etc/udev/suse/50-udev-default.rules @@ -96,11 +96,7 @@ SUBSYSTEM=="block", GROUP="disk", MODE="0640" # st/osst: 1 TYPE_TAPE SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60" SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900" -SUBSYSTEM=="scsi_device", ACTION=="add", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst" -SUBSYSTEM=="scsi_device", ACTION=="add", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions" -SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi" -SUBSYSTEM=="mmc", ACTION=="add", RUN+="/sbin/modprobe mmc_block" # misc storage devices (non-block) KERNEL=="sg*", GROUP="disk", MODE="0640" diff --git a/etc/udev/suse/80-drivers.rules b/etc/udev/suse/80-drivers.rules new file mode 100644 index 0000000..0351b11 --- /dev/null +++ b/etc/udev/suse/80-drivers.rules @@ -0,0 +1,13 @@ +ACTION!="add", GOTO="drivers_end" + +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe --quiet $env{MODALIAS}" + +SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /sbin/modprobe --quiet pnp:d$$id; done < /sys$devpath/id'" + +SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --quiet -all tifm_sd tifm_ms" +SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block" +SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi" +SUBSYSTEM=="scsi_device", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst" +SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg" + +LABEL="drivers_end" diff --git a/extras/rule_generator/Makefile b/extras/rule_generator/Makefile index f023848..cc6fe05 100644 --- a/extras/rule_generator/Makefile +++ b/extras/rule_generator/Makefile @@ -37,7 +37,7 @@ clean: .PHONY: clean install-bin: all - $(INSTALL_SCRIPT) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions + $(INSTALL_DATA) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions $(INSTALL_SCRIPT) -D write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules $(INSTALL_SCRIPT) -D write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules $(INSTALL_DATA) -D 75-cd-aliases-generator.rules \ diff --git a/udev_node.c b/udev_node.c index 9e09e58..fcd52d0 100644 --- a/udev_node.c +++ b/udev_node.c @@ -63,6 +63,7 @@ int udev_node_mknod(struct udevice *udev, const char *file, dev_t devt, mode_t m info("atomically replace '%s'", file); strlcpy(file_tmp, file, sizeof(file_tmp)); strlcat(file_tmp, TMP_FILE_EXT, sizeof(file_tmp)); + unlink(file_tmp); selinux_setfscreatecon(file_tmp, udev->dev->kernel, mode); retval = mknod(file_tmp, mode, devt); selinux_resetfscreatecon(); @@ -162,6 +163,7 @@ static int node_symlink(const char *node, const char *slink) info("atomically replace '%s'", slink); strlcpy(slink_tmp, slink, sizeof(slink_tmp)); strlcat(slink_tmp, TMP_FILE_EXT, sizeof(slink_tmp)); + unlink(slink_tmp); selinux_setfscreatecon(slink_tmp, NULL, S_IFLNK); retval = symlink(target, slink_tmp); selinux_resetfscreatecon(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org