Hello community, here is the log from the commit of package mkinitrd checked in at Wed Jun 14 13:24:36 CEST 2006. -------- --- mkinitrd/mkinitrd.changes 2006-06-07 12:10:40.000000000 +0200 +++ mkinitrd/mkinitrd.changes 2006-06-13 13:37:11.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Jun 13 13:34:22 CEST 2006 - hare@suse.de + +- Fixup path names for udev helper binaries. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.Fh7uHC/_old 2006-06-14 13:24:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Fh7uHC/_new 2006-06-14 13:24:06.000000000 +0200 @@ -18,7 +18,7 @@ # bootsplash required only if creating splash initrd's. Autoreqprov: on Version: 1.2 -Release: 111 +Release: 112 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -85,6 +85,8 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Tue Jun 13 2006 - hare@suse.de +- Fixup path names for udev helper binaries. * Wed Jun 07 2006 - hare@suse.de - Revert changes for kdump; broke default installation (#182341) ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-06-07 12:10:36.000000000 +0200 +++ mkinitrd/mkinitrd 2006-06-13 13:37:44.000000000 +0200 @@ -1421,11 +1421,6 @@ echo '#!/bin/sh' > $tmp_mnt/lib/udev/mount.sh echo 'exit 0' >> $tmp_mnt/lib/udev/mount.sh - # udev *_id programs - for prog in ata_id scsi_id usb_id vol_id dasd_id edd_id path_id; do - cp_bin /sbin/$prog $tmp_mnt/sbin - done - # scsi_id config file cp /etc/scsi_id.config $tmp_mnt/etc/scsi_id.config @@ -1737,14 +1732,14 @@ | ;; | LABEL=*) | label=\${rootdev#LABEL=} - | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"/sbin/vol_id -l %N\", RESULT=\"\$label\", SYMLINK+=\"root\"" > /etc/udev/rules.d/01-label.rules - | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"/sbin/vol_id -l %N\", RESULT=\"\$label\", SYMLINK+=\"root\"" >> /etc/udev/rules.d/01-label.rules + | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"vol_id -l %N\", RESULT=\"\$label\", SYMLINK+=\"root\"" > /etc/udev/rules.d/01-label.rules + | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"vol_id -l %N\", RESULT=\"\$label\", SYMLINK+=\"root\"" >> /etc/udev/rules.d/01-label.rules | rootdev=/dev/root | ;; | UUID=*) | uuid=\${rootdev#UUID=} - | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"/sbin/vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK+=\"root\"" > /etc/udev/rules.d/02-uuid.rules - | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"/sbin/vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK+=\"root\"" >> /etc/udev/rules.d/02-uuid.rules + | echo "SUBSYSTEM=\"block\", SYSFS{start}=\"*\", PROGRAM=\"vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK+=\"root\"" > /etc/udev/rules.d/02-uuid.rules + | echo "KERNEL=\"dm-[0-9]*\", PROGRAM=\"vol_id -u %N\", RESULT=\"\$uuid\", SYMLINK+=\"root\"" >> /etc/udev/rules.d/02-uuid.rules | rootdev=/dev/root | ;; | [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]) @@ -2723,7 +2718,7 @@ cat_linuxrc <<-'EOF' |if [ -z "$rootfstype" ]; then - | rootfstype=$(/sbin/vol_id -t $rootdev) + | rootfstype=$(/lib/udev/vol_id -t $rootdev) | [ $? -ne 0 ] && rootfstype= | [ -n "$rootfstype" ] && [ "$rootfstype" = "unknown" ] && $rootfstype= |fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org
participants (1)
-
root@suse.de