Mailinglist Archive: opensuse-commit (705 mails)
| < Previous | Next > |
commit mkinitrd
- From: root@xxxxxxx (h_root)
- Date: Thu, 27 Jul 2006 18:01:34 +0200 (CEST)
- Message-id: <20060727160134.DD8B194E78@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package mkinitrd
checked in at Thu Jul 27 18:01:34 CEST 2006.
--------
--- mkinitrd/mkinitrd.changes 2006-06-13 13:37:11.000000000 +0200
+++ mkinitrd/mkinitrd.changes 2006-07-27 09:10:18.000000000 +0200
@@ -1,0 +2,32 @@
+Thu Jul 27 09:09:02 CEST 2006 - hare@xxxxxxx
+
+- Fix cut&paste error in UUID= rules.
+
+-------------------------------------------------------------------
+Wed Jul 26 16:29:20 CEST 2006 - hare@xxxxxxx
+
+- Add udev requirement for correct update (#189713)
+- Fixup udev rules for lilo etc. (#192725)
+
+-------------------------------------------------------------------
+Fri Jul 14 11:58:59 CEST 2006 - olh@xxxxxxx
+
+- remove real-root-dev usage
+ its a writeonly variable for unused prepare_namespace()
+
+-------------------------------------------------------------------
+Tue Jun 27 15:53:46 CEST 2006 - hare@xxxxxxx
+
+- Check for nfs last; persistent device names might
+ contain ':'.
+- Use 'module' link to get the correct module name for
+ network modules
+- Fixup detection of EVMS installations (#188511)
+
+-------------------------------------------------------------------
+Tue Jun 13 13:46:20 CEST 2006 - hare@xxxxxxx
+
+- Get correct network parameter during installation
+ of root on iSCSI (#184393)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.ijhpcW/_old 2006-07-27 18:00:52.000000000 +0200
+++ /var/tmp/diff_new_pack.ijhpcW/_new 2006-07-27 18:00:52.000000000 +0200
@@ -15,10 +15,11 @@
Group: System/Base
Provides: aaa_base:/sbin/mk_initrd
Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils sysvinit reiserfs
+Requires: udev >= udev-096
# bootsplash required only if creating splash initrd's.
Autoreqprov: on
Version: 1.2
-Release: 112
+Release: 113
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd
@@ -85,6 +86,23 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog -n mkinitrd
+* Thu Jul 27 2006 - hare@xxxxxxx
+- Fix cut&paste error in UUID= rules.
+* Wed Jul 26 2006 - hare@xxxxxxx
+- Add udev requirement for correct update (#189713)
+- Fixup udev rules for lilo etc. (#192725)
+* Fri Jul 14 2006 - olh@xxxxxxx
+- remove real-root-dev usage
+ its a writeonly variable for unused prepare_namespace()
+* Tue Jun 27 2006 - hare@xxxxxxx
+- Check for nfs last; persistent device names might
+ contain ':'.
+- Use 'module' link to get the correct module name for
+ network modules
+- Fixup detection of EVMS installations (#188511)
+* Tue Jun 13 2006 - hare@xxxxxxx
+- Get correct network parameter during installation
+ of root on iSCSI (#184393)
* Tue Jun 13 2006 - hare@xxxxxxx
- Fixup path names for udev helper binaries.
* Wed Jun 07 2006 - hare@xxxxxxx
++++++ mkinitrd ++++++
--- mkinitrd/mkinitrd 2006-06-13 13:37:44.000000000 +0200
+++ mkinitrd/mkinitrd 2006-07-27 09:10:14.000000000 +0200
@@ -23,7 +23,7 @@
# This file is kept in the following CVS repository:
#
# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.311 $
+# $Revision: 1.316 $
usage() {
cat<<EOF
@@ -367,7 +367,7 @@
done
# Get current modes from fb
for fb in /sys/class/graphics/fb* ; do
- if [ -d $fb ] ; then
+ if [ -d $fb ] && [ -f $fb/virtual_size ] ; then
size=$(sed -ne 's/,/x/p' $fb/virtual_size)
eval splash_size_$size=1
fi
@@ -913,8 +913,14 @@
get_default_interface() {
local ifname
+ local inffile="/etc/install.inf"
# Determine the default network interface
+ if [ -f $inffile ] ; then
+ # Get info from install.inf during installation
+ BOOTPROTO=$(sed -ne 's/NetConfig: \(.*\)/\1/p' $inffile)
+ ifname=$(sed -ne 's/Netdevice: \(.*\)/\1/p' $inffile)
+ else
for cfg in /etc/sysconfig/network/ifcfg-*; do
if [ $(basename $cfg) = "ifcfg-lo" ] ; then
continue;
@@ -927,6 +933,7 @@
break;
fi
done
+ fi
echo $ifname/$BOOTPROTO
}
@@ -1340,6 +1347,7 @@
cp /var/lib/open-iscsi/discovery.db $tmp_mnt/var/lib/open-iscsi
cp /var/lib/open-iscsi/node.db $tmp_mnt/var/lib/open-iscsi
cp_bin /bin/usleep $tmp_mnt/bin/usleep
+ cp_bin /bin/basename $tmp_mnt/bin/basename
fi
if [ -n "$s390_dasd_disks" ]; then
@@ -1732,30 +1740,28 @@
| ;;
| LABEL=*)
| label=\${rootdev#LABEL=}
- | 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
+ | echo "ENV{ID_FS_USAGE}==\"filesystem|other\", ENV{ID_FS_LABEL_SAFE}==\"\$label\", SYMLINK+=\"root\"" > /etc/udev/rules.d/99-mkinitrd-label.rules
| rootdev=/dev/root
| ;;
| UUID=*)
| uuid=\${rootdev#UUID=}
- | 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
+ | echo "ENV{ID_FS_USAGE}==\"filesystem|other\", ENV{ID_FS_UUID}==\"\$uuid\", SYMLINK+=\"root\"" > /etc/udev/rules.d/99-mkinitrd-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-mkinitrd-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-mkinitrd-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-mkinitrd-lilo.rules
| rootdev=/dev/root ;;
| *:*)
| rootfstype="nfs"
@@ -2194,7 +2200,6 @@
| dhcpcd -R -Y -N -t 100000000 $interface
| [ -s /var/lib/dhcpcd/dhcpcd-$interface.info ] || {
| echo "no response from dhcp server."
- | echo 256 > /proc/sys/kernel/real-root-dev
| die 0
| }
| . /var/lib/dhcpcd/dhcpcd-$interface.info
@@ -2325,7 +2330,6 @@
| if [ -z "$rootdev" ]; then
| echo "no local root= kernel option given and no root" \
| "server set by the dhcp server."
- | echo 256 > /proc/sys/kernel/real-root-dev
| die 0
| fi
|fi
@@ -2411,9 +2415,6 @@
| minor=$(devminor $devn)
| fi
| if [ -n "$devn" ]; then
- | echo "rootfs: major=$major minor=$minor" \
- | "devn=$devn"
- | echo $devn > /proc/sys/kernel/real-root-dev
| return 0
| else
| return 1
@@ -2673,10 +2674,9 @@
| fix_evms_root_node /mnt \$rootdev
| remove_evms_fstab \$FSTAB_ITEMS
| umount /mnt
- | echo \$(devnumber \$rootdev) > /proc/sys/kernel/real-root-dev ;;
+ | ;;
| *)
- | # hex number or major:minor pair
- | echo \$rootdev > /proc/sys/kernel/real-root-dev ;;
+ | ;;
| esac
|fi
EOF
@@ -2765,8 +2765,6 @@
|[ -n "$read_write" ] && opt="-o rw"
|[ "$rootfstype" = "nfs" ] && opt="${opt},nolock"
|
- |# tell kernel root is /dev/ram0, prevents remount after initrd
- |echo 256 > /proc/sys/kernel/real-root-dev
|# mount the actual root device below /root
|echo "Mounting root $rootdev"
|# check external journal
@@ -2964,12 +2962,6 @@
realrootdev="$rootdev"
case "$rootdev" in
- /*:*)
- ;;
- *:*)
- rootdev=
- rootfstype=nfs
- ;;
/dev/md*)
rootcpio=`echo $root_dir/ | cpio --quiet -o -H newc`
rootmajor=0x${rootcpio:62:8}
@@ -3010,6 +3002,7 @@
if [ -z "$realrootdev" ] ; then
error 1 "Could not expand $rootdev to real device"
fi
+ realrootdev=$(/usr/bin/readlink -m $realrootdev)
;;
/dev/disk/*)
realrootdev=$(/usr/bin/readlink -m $rootdev)
@@ -3017,6 +3010,10 @@
sid=$(check_iscsi_root $realrootdev)
iscsi_root="$sid"
;;
+ *:*)
+ rootdev=
+ rootfstype=nfs
+ ;;
esac
# check for journal device
@@ -3044,8 +3041,15 @@
&& root_lvm=1
[ "$(block_driver "$root_dir/${realrootdev#/}")" = device-mapper ] \
&& root_dm=1
- [ "${realrootdev:0:10}" = /dev/evms/ ] \
- && root_evms=1
+ if [ "$root_dm" ] ; then
+ major=$(devmajor $rootdevn)
+ minor=$(devminor $rootdevn)
+ region=$(dmsetup info -c --noheadings -o name -j $major -m $minor | tr '|' '/')
+ if echo "q:r,r=$region" | evms -s > /dev/null; then
+ root_evms=1
+ realrootdev=/dev/evms/$region
+ fi
+ fi
fi
###################################################################
@@ -3149,6 +3153,8 @@
if [ -d /sys/class/net/$interface/device ] ; then
if [ -f /sys/class/net/$interface/device/modalias ] ; then
read drvlink < /sys/class/net/$interface/device/modalias
+ elif [ -f /sys/class/net/$interface/device/driver/module ] ; then
+ drvlink=$(cd /sys/class/net/$interface/device/driver; readlink module)
else
drvlink=$(cd /sys/class/net/$interface/device; readlink driver)
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit-help@xxxxxxxxxxxx
| < Previous | Next > |