Hello community,
here is the log from the commit of package mkinitrd
checked in at Thu Nov 16 18:46:16 CET 2006.
--------
--- mkinitrd/mkinitrd.changes 2006-11-02 14:09:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2006-11-16 17:41:55.000000000 +0100
@@ -1,0 +2,60 @@
+Thu Nov 16 17:41:10 CET 2006 - olh@suse.de
+
+- use BuildIgnore to reduce build requires
+
+-------------------------------------------------------------------
+Thu Nov 16 14:42:24 CET 2006 - hare@suse.de
+
+- Update iscsi boot support
+
+-------------------------------------------------------------------
+Thu Nov 16 14:23:01 CET 2006 - olh@suse.de
+
+- declare loop variable i as local in mkinitrd_kernel
+ otherwise the global loop variable i used for the list of
+ available kernels/initrds gets overwritten
+
+-------------------------------------------------------------------
+Thu Nov 16 08:42:21 CET 2006 - hare@suse.de
+
+- Removed rootmd feature again. Wrong approach
+- Fixed dmraid detection (#220765)
+
+-------------------------------------------------------------------
+Mon Nov 13 10:18:25 CET 2006 - bwalle@suse.de
+
+- added rootmd in feature list (-f), fixes #218167
+
+-------------------------------------------------------------------
+Fri Nov 10 16:19:59 CET 2006 - bwalle@suse.de
+
+- fixed mkinitrd uml hostfs support (#215240)
+
+-------------------------------------------------------------------
+Tue Nov 7 17:33:54 CET 2006 - bwalle@suse.de
+
+- porting changes from SLES 10 branch to HEAD:
+- Add multipath compat rules for udev (#218172)
+- Really fix SCSI device ordering (#213641)
+- Fixup DASD device ordering (#202182)
+- Check return values from lspci (#213400)
+- Properly check for whitespaces in output of 'lvs' (#216117)
+- Include all multipath prio callout programs (#211863)
+- Fixup zfcp device ordering (#213641)
+- Enable md detection when booting from lilo (#211089)
+- Fixup netmask generation for static IP setup.
+- Strip duplicate md devices (#192039)
+- fixed #218116 - mkinitrd broke root=/dev/disk/by-*/* on LVM
+- fixed #218119 - mkinitrd requires a parameter for -P (contrary to help text)
+
+-------------------------------------------------------------------
+Sat Nov 4 09:53:46 CET 2006 - olh@suse.de
+
+- keep local modifications to mkinitrd/ipconfig scripts (#113539)
+
+-------------------------------------------------------------------
+Sat Nov 4 09:42:57 CET 2006 - olh@suse.de
+
+- skip resume of resumedev is empty
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.QPQ51b/_old 2006-11-16 18:45:53.000000000 +0100
+++ /var/tmp/diff_new_pack.QPQ51b/_new 2006-11-16 18:45:53.000000000 +0100
@@ -11,14 +11,14 @@
# norootforbuild
Name: mkinitrd
-License: GNU General Public License (GPL) - all versions
+License: GNU General Public License (GPL)
Group: System/Base
Provides: aaa_base:/sbin/mk_initrd
-BuildRequires: -e2fsprogs -module-init-tools -pciutils -reiserfs -udev
+#!BuildIgnore: module-init-tools e2fsprogs udev pciutils reiserfs
Requires: coreutils modutils util-linux grep e2fsprogs gzip sed gawk cpio udev pciutils sysvinit reiserfs file
Autoreqprov: on
Version: 1.2
-Release: 138
+Release: 142
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd
@@ -81,12 +81,48 @@
%dir /lib/mkinitrd/dev
%dir /lib/mkinitrd/bin
/lib/mkinitrd/bin/run-init
-/lib/mkinitrd/bin/ipconfig.sh
-/sbin/*
-/usr/share/mkinitrd/hotplug.sh
+%config /lib/mkinitrd/bin/ipconfig.sh
+%config /sbin/mkinitrd
+/sbin/mk_initrd
+/sbin/module_upgrade
+/sbin/installkernel
+%config /usr/share/mkinitrd/hotplug.sh
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog -n mkinitrd
+* Thu Nov 16 2006 - olh@suse.de
+- use BuildIgnore to reduce build requires
+* Thu Nov 16 2006 - hare@suse.de
+- Update iscsi boot support
+* Thu Nov 16 2006 - olh@suse.de
+- declare loop variable i as local in mkinitrd_kernel
+ otherwise the global loop variable i used for the list of
+ available kernels/initrds gets overwritten
+* Thu Nov 16 2006 - hare@suse.de
+- Removed rootmd feature again. Wrong approach
+- Fixed dmraid detection (#220765)
+* Mon Nov 13 2006 - bwalle@suse.de
+- added rootmd in feature list (-f), fixes #218167
+* Fri Nov 10 2006 - bwalle@suse.de
+- fixed mkinitrd uml hostfs support (#215240)
+* Tue Nov 07 2006 - bwalle@suse.de
+- porting changes from SLES 10 branch to HEAD:
+- Add multipath compat rules for udev (#218172)
+- Really fix SCSI device ordering (#213641)
+- Fixup DASD device ordering (#202182)
+- Check return values from lspci (#213400)
+- Properly check for whitespaces in output of 'lvs' (#216117)
+- Include all multipath prio callout programs (#211863)
+- Fixup zfcp device ordering (#213641)
+- Enable md detection when booting from lilo (#211089)
+- Fixup netmask generation for static IP setup.
+- Strip duplicate md devices (#192039)
+- fixed #218116 - mkinitrd broke root=/dev/disk/by-*/* on LVM
+- fixed #218119 - mkinitrd requires a parameter for -P (contrary to help text)
+* Sat Nov 04 2006 - olh@suse.de
+- keep local modifications to mkinitrd/ipconfig scripts (#113539)
+* Sat Nov 04 2006 - olh@suse.de
+- skip resume of resumedev is empty
* Thu Nov 02 2006 - trenn@suse.de
- Also allow SSDT[0-9]?.aml files to be placed to initrd root dir
to let the BIOS provided ones be overridden
++++++ mkinitrd ++++++
--- mkinitrd/mkinitrd 2006-11-02 14:09:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd 2006-11-16 14:54:53.000000000 +0100
@@ -23,7 +23,7 @@
# This file is kept in the following CVS repository:
#
# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.349 $
+# $Revision: 1.369 $
usage() {
cat< /dev/null)
- if [ -z "$sysfs_path" ]; then
+ if [ -z "$sysfs_path" ] || [ ! -d /sys$sysfs_path ] ; then
return;
fi
@@ -1065,7 +1074,7 @@
if [ "$s390_enable_zfcp" ] ; then
# Root is on SCSI, detect all SCSI devices
- for dev_dir in /sys/class/scsi_device/*; do
+ for dev_dir in /sys/block/sd? /sys/block/sd?? /sys/block/sd??? /sys/block/sd???? ; do
if [ -d "$dev_dir" ] && [ -e "$dev_dir/device" ]; then
pushd $dev_dir > /dev/null;
cd $(readlink device);
@@ -1100,7 +1109,7 @@
if [ "$s390_enable_dasd" ]; then
# Root device is on a dasd device, enable all dasd disks
- for dir in /sys/block/dasd*; do
+ for dir in /sys/block/dasd[a-z] /sys/block/dasd[a-z][a-z] /sys/block/dasd[a-z][a-z][a-z] ; do
if [ -d "$dir" ] && [ -d ${dir}/device ]; then
pushd $dir > /dev/null
cd $(readlink device)
@@ -1209,6 +1218,7 @@
local need_dmraid
local -a features
local fs_modules drv_modules uld_modules xen_modules
+ local i
tmp_mnt=$work_dir/mnt
tmp_mnt_small=${tmp_mnt}_small
@@ -1329,7 +1339,7 @@
cp_bin $vendor_init_script $vendor_script
fi
- if [ -n "$root_dmraid" -a -x /sbin/dmraid -a -x /sbin/kpartx ] ; then
+ if [ -n "$root_dmraid" -a -x /sbin/dmraid ] ; then
need_dmraid=1
fi
@@ -1342,15 +1352,13 @@
if has_module iscsi_tcp ; then
features=(${features[@]} iscsi)
+ add_module crc32c
cp_bin /sbin/iscsid $tmp_mnt/sbin/iscsid
cp_bin /sbin/iscsiadm $tmp_mnt/sbin/iscsiadm
- cat /etc/initiatorname.iscsi > $tmp_mnt/etc/initiatorname.iscsi
- mkdir -p $tmp_mnt/var/lib/open-iscsi
+ mkdir -p $tmp_mnt/etc/iscsi
+ cat /etc/iscsi/initiatorname.iscsi > $tmp_mnt/etc/iscsi/initiatorname.iscsi
mkdir -p $tmp_mnt/var/run
- 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
+ mkdir -p $tmp_mnt/var/lock/iscsi
fi
if [ -n "$s390_dasd_disks" ]; then
@@ -1455,10 +1463,14 @@
cp_bin /sbin/dmsetup $tmp_mnt/sbin
cp_bin /sbin/mpath_id $tmp_mnt/sbin
cp_bin /sbin/kpartx_id $tmp_mnt/sbin
+ for pp in /sbin/mpath_prio_* ; do
+ cp_bin $pp $tmp_mnt/sbin
+ done
if [ -f /etc/multipath.conf ] ; then
cp -a /etc/multipath.conf $tmp_mnt/etc
fi
cp /etc/udev/rules.d/71-multipath.rules $tmp_mnt/etc/udev/rules.d
+ cp /etc/udev/rules.d/72-multipath-compat.rules $tmp_mnt/etc/udev/rules.d
fi
if [ -n "$root_lvm2" ] ; then
@@ -1529,9 +1541,8 @@
fi
if [ -n "$need_dmraid" ] ; then
- features=(${features[@]} dmraid)
+ features=(${features[@]} dm/raid)
cp_bin /sbin/dmraid $tmp_mnt/sbin
- cp_bin /sbin/kpartx $tmp_mnt/sbin
fi
if [ -n "$use_dhcp" ] ; then
@@ -1760,6 +1771,12 @@
| rootdev=\${o#root=}
| rootdev_cmdline=1
| ;;
+ | rootfstype=*)
+ | rootfstype=\${o#rootfstype=}
+ | ;;
+ | rootflags=*)
+ | rootflags=\${o#rootflags=}
+ | ;;
| nfsroot=*)
| rootdev=\${o#nfsroot=}
| rootdev_cmdline=1
@@ -1832,6 +1849,11 @@
| rootdev=/dev/\$rootdev
| ;;
|esac
+ |md_major=\$(sed -ne 's/\s*\([0-9]\+\)\s*md$/\1/p' /proc/devices)
+ |if [ -n "\$md_major" -a "\$md_major" = "\$maj" ]; then
+ | md_minor="\$min"
+ | md_dev="/dev/md\$md_minor"
+ |fi
|
|# Verify manual resume mode
|if [ "\$resume_mode" != "off" -a -n "\$resumedev" ]; then
@@ -2240,7 +2262,7 @@
| TargetPort=*)
| iscsiport="\${o#TargetPort=}" ;;
| InitiatorName=*)
- | echo \$o > /etc/initiatorname.iscsi ;;
+ | echo \$o > /etc/iscsi/initiatorname.iscsi ;;
| esac
|done
|# Always enable DHCP for iSCSI
@@ -2328,31 +2350,27 @@
if [ -n "$iscsi_root" ] ; then
iscsi_tgtname=$(cat /sys/class/iscsi_session/${iscsi_root}/targetname)
iscsi_tgtaddr=$(cat /sys/class/iscsi_connection/connection${iscsi_root#session}:0/address)
- iscsi_sid=$(/sbin/iscsiadm -m node | grep "$iscsi_tgtname" | grep "$iscsi_tgtaddr" | sed 's@\[\(.*\)\] .*@\1@g')
cat_linuxrc <<-EOF
|iscsi_login_root_node()
|{
- | local NODE
- | local iscsi_sid
- |
- | if [ -n "\$iscsitarget" ] ; then
- | if [ -n "\$iscsiserver" ] ; then
- | iscsi_sid=\$(/sbin/iscsiadm -m node | grep \$iscsitarget | grep \$iscsiserver | sed 's@\[\(.*\)\] .*@\1@g')
- | else
- | iscsi_sid=\$(/sbin/iscsiadm -m node | grep \$iscsitarget | sed 's@\[\(.*\)\] .*@\1@g')
- | fi
- | else
- | if [ -n "\$iscsiserver" ] ; then
- | iscsi_sid=\$(/sbin/iscsiadm -m node | grep \$iscsiserver | sed 's@\[\(.*\)\] .*@\1@g')
- | fi
+ | if [ -z "\$iscsitarget" ] ; then
+ | iscsitarget=$iscsi_tgtname
| fi
- | if [ -z "\$iscsi_sid" ] ; then
- | iscsi_sid=$iscsi_sid
+ |
+ | if [ -z "\$iscsiserver" ] ; then
+ | iscsiserver=$iscsi_tgtaddr
| fi
|
- | NODE=`/sbin/iscsiadm -m node -r \$iscsi_sid | grep "node.name" | cut -d' ' -f3`
- | echo -n "Logging into \$NODE: "
- | if /sbin/iscsiadm -m node -r \$iscsi_sid -l ; then
+ |
+ | echo -n "Discover targets on \$iscsiserver: "
+ | if /sbin/iscsiadm -m discovery -t st -p \$iscsiserver:\$iscsiport 2> /dev/null ; then
+ | echo "ok."
+ | else
+ | echo "failed."
+ | return 1
+ | fi
+ | echo -n "Logging into \$iscsitarget: "
+ | if /sbin/iscsiadm -m node -T \$iscsitarget -p \$iscsiserver:\$iscsiport -l ; then
| echo "ok."
| else
| echo "failed."
@@ -2361,7 +2379,6 @@
|
|echo "Starting iSCSI daemon"
|/sbin/iscsid
- |usleep 5000000
|
|iscsi_login_root_node
|
@@ -2440,6 +2457,9 @@
| if [ ! -f /sys/power/resume ] ; then
| return
| fi
+ | if [ -z "$resumedev" ] ; then
+ | return
+ | fi
| # Waits for the resume device to appear
| if [ "$resume_mode" != "off" ]; then
| if [ -e $resumedev ] ; then
@@ -2469,6 +2489,7 @@
| case "$rootdev" in
| *:*) root= ;;
| /dev/nfs) root= ;;
+ | /dev/root) root= ;;
| /dev/*) root=${rootdev#/dev/} ;;
| esac
| if [ -z "$root" ]; then
@@ -2830,6 +2851,7 @@
|[ "$rootfstype" = "xfs" -a -n "$journaldev" ] && opt="${opt},logdev=$journaldev"
|[ "$rootfstype" = "xfs" -a -n "$rootfsflags" ] && opt="${opt},$rootfsflags"
|[ "$rootfstype" = "reiserfs" -a -n "$journaldev" ] && opt="${opt},jdev=$journaldev"
+ |[ -n "$rootflags" ] && opt="${opt},$rootflags"
|[ -n "$rootfstype" ] && opt="${opt} -t $rootfstype"
|if [ -x /bin/nfsmount -a "$rootfstype" = "nfs" ]; then
| nfsmount $rootdev /root || die 1
@@ -3071,6 +3093,10 @@
fi
# check if the root device is an lvm device
+#
+# Caveat: currently the dmraid support requires some programs from
+# the multipath-tools package (kpartx etc). So we always have
+# to select both, multipath and dmraid, for full dmraid support.
root_lvm=
root_dm=
root_lvm2=
@@ -3105,7 +3131,7 @@
fi
# Check whether we are using LVM2
if [ -z "$root_evms" ] && [ -x /sbin/lvs ] ; then
- vg_root=$(lvs --noheadings -o vg_name,lv_kernel_major,lv_kernel_minor 2> /dev/null | sed -n "s/ \(.*\) *$major *$minor/\1/p")
+ vg_root=$(lvs --noheadings -o vg_name,lv_kernel_major,lv_kernel_minor 2> /dev/null | sed -n "s/ *\(.*\) *$major *$minor/\1/p")
if [ "$vg_root" ] ; then
root_lvm2=1
fi
@@ -3115,7 +3141,7 @@
if [ "$root_lvm2" ] ; then
# Check for LVM2 on top of md
md_list=
- pv_list=$(vgs --noheadings --options devices $vg_root 2> /dev/null | sed -n "s@ \(/dev/.*\)([0-9]*)@\1@p")
+ pv_list=$(vgs --noheadings --options devices $vg_root 2> /dev/null | sed -n "s@ *\(/dev/.*\)([0-9]*) *@\1@p" | sort | uniq)
for dev in $pv_list ; do
case $dev in
/dev/dm-*)
@@ -3135,6 +3161,16 @@
unset md_dev
unset mdconf
fi
+ if [ -z "$root_lvm2" ] ; then
+ # Check for dmraid
+ dm_uuid=$(dmsetup info -c --noheadings -o uuid -j $major -m $minor)
+ case $dm_uuid in
+ part*)
+ root_dmraid=1
+ root_mpath=1
+ ;;
+ esac
+ fi
fi
if [ "$root_md" ] && [ -x /sbin/mdadm ] ; then
minor=$(devminor $rootdevn)
++++++ mkinitrd.8 ++++++
--- mkinitrd/mkinitrd.8 2006-11-02 14:09:05.000000000 +0100
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.8 2006-11-07 17:38:33.000000000 +0100
@@ -1,5 +1,5 @@
.\" Copyright (C) 2003 SuSE Linux AG
-.\"$Id: mkinitrd.8,v 1.20 2006/09/21 15:40:06 hare Exp $
+.\"$Id: mkinitrd.8,v 1.21 2006/11/07 16:38:33 bwalle Exp $
.TH mkinitrd 8
.SH NAME
mkinitrd, mk_initrd \- create initrd disk image
@@ -64,7 +64,7 @@
variable in /etc/sysconfig/kernel.
.TP
\fB-t tmp_dir\fR
-tmp dir, defaults to "/tmp"
+tmp dir, defaults to "/tmp".
.TP
\fB-e\fR
Use static binaries where possible. (currently unavailable)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org