Mailinglist Archive: opensuse-commit (1206 mails)
| < Previous | Next > |
commit mkinitrd
- From: root@xxxxxxx (h_root)
- Date: Tue, 23 May 2006 01:19:36 +0200 (CEST)
- Message-id: <20060522231936.2294C8EFB7@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mkinitrd
checked in at Tue May 23 01:19:36 CEST 2006.
--------
--- mkinitrd/mkinitrd.changes 2006-05-19 17:08:48.000000000 +0200
+++ mkinitrd/mkinitrd.changes 2006-05-22 10:00:40.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 22 09:58:22 CEST 2006 - hare@xxxxxxx
+
+- Handle persistent device names correctly if
+ LVM is activated (#175972)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.owlMXf/_old 2006-05-23 01:16:24.000000000 +0200
+++ /var/tmp/diff_new_pack.owlMXf/_new 2006-05-23 01:16:24.000000000 +0200
@@ -18,7 +18,7 @@
# bootsplash required only if creating splash initrd's.
Autoreqprov: on
Version: 1.2
-Release: 108
+Release: 109
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd
@@ -85,6 +85,9 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog -n mkinitrd
+* Mon May 22 2006 - hare@xxxxxxx
+- Handle persistent device names correctly if
+ LVM is activated (#175972)
* Fri May 19 2006 - hare@xxxxxxx
- Configure network interfaces automatically if
root device is an iSCSI device (#176804)
++++++ mkinitrd ++++++
--- mkinitrd/mkinitrd 2006-05-19 17:08:43.000000000 +0200
+++ mkinitrd/mkinitrd 2006-05-22 10:00:37.000000000 +0200
@@ -23,7 +23,7 @@
# This file is kept in the following CVS repository:
#
# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.298 $
+# $Revision: 1.299 $
usage() {
cat<<EOF
@@ -1718,30 +1718,30 @@
| ;;
| 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=\"/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
| 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=\"/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
| rootdev=/dev/root
| ;;
| [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])
| maj=\$((0x0\$rootdev >> 8))
| min=\$((0x0\$rootdev & 0xff))
- | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules
+ | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK+=\"root\"" > /etc/udev/rules.d/05-lilo.rules
| rootdev=/dev/root ;;
| [0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F])
| maj=\$((0x\$rootdev >> 8))
| min=\$((0x\$rootdev & 0xff))
- | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules
+ | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK+=\"root\"" > /etc/udev/rules.d/05-lilo.rules
| rootdev=/dev/root ;;
| 0x[0-9a-fA-F][0-9a-fA-F]*)
| maj=\$((\$rootdev >> 8))
| min=\$((\$rootdev & 0xff))
- | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK=\"root\"" > /etc/udev/rules.d/05-lilo.rules
+ | echo "SUBSYSTEM=\"block\", SYSFS{dev}=\"\$maj:\$min\", SYMLINK+=\"root\"" > /etc/udev/rules.d/05-lilo.rules
| rootdev=/dev/root ;;
| *:*)
| rootfstype="nfs"
@@ -2556,6 +2556,13 @@
|
|for o in \$(cat /proc/cmdline); do
| case \$o in
+ | root=/dev/disk/by-*/*)
+ | vg_root=
+ | ;;
+ | root=/dev/mapper/*)
+ | set -- \$(IFS=- ; echo \$o)
+ | vg_root=\$2
+ | ;;
| root=/dev/*)
| set -- \$(IFS=/ ; echo \$o)
| vg_root=\$3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |