Hello community,
here is the log from the commit of package mkinitrd
checked in at Fri Jun 2 02:05:43 CEST 2006.
--------
--- mkinitrd/mkinitrd.changes 2006-05-22 10:00:40.000000000 +0200
+++ mkinitrd/mkinitrd.changes 2006-06-01 15:24:20.000000000 +0200
@@ -1,0 +2,23 @@
+Thu Jun 1 09:10:10 CEST 2006 - hare@suse.de
+
+- Fix script error for root on iSCSI (#178054)
+- Build additional initrds for kdump (#176908)
+- Do not pass xfs quota options on remount (#177096)
+- Fix syntax error in parsing of udev_timeout (#178106)
+- Fix spelling errors (#177918)
+- Enable DHCP mode for root on iSCSI.
+- Include 64bit EVMS modules, too (#179860)
+- Add 64-device-mapper.rules for udev (#175972)
+
+-------------------------------------------------------------------
+Tue May 30 16:27:35 CEST 2006 - hare@suse.de
+
+- Overhaul root on multipath (#176818)
+
+-------------------------------------------------------------------
+Mon May 22 17:05:18 CEST 2006 - hare@suse.de
+
+- Add dm-mod to domu-modules if required (#177467)
+- Parse 'ro' commandline option (#177599)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.0GSARv/_old 2006-06-02 02:05:19.000000000 +0200
+++ /var/tmp/diff_new_pack.0GSARv/_new 2006-06-02 02:05:19.000000000 +0200
@@ -18,7 +18,7 @@
# bootsplash required only if creating splash initrd's.
Autoreqprov: on
Version: 1.2
-Release: 109
+Release: 110
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd
@@ -85,6 +85,20 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog -n mkinitrd
+* Thu Jun 01 2006 - hare@suse.de
+- Fix script error for root on iSCSI (#178054)
+- Build additional initrds for kdump (#176908)
+- Do not pass xfs quota options on remount (#177096)
+- Fix syntax error in parsing of udev_timeout (#178106)
+- Fix spelling errors (#177918)
+- Enable DHCP mode for root on iSCSI.
+- Include 64bit EVMS modules, too (#179860)
+- Add 64-device-mapper.rules for udev (#175972)
+* Tue May 30 2006 - hare@suse.de
+- Overhaul root on multipath (#176818)
+* Mon May 22 2006 - hare@suse.de
+- Add dm-mod to domu-modules if required (#177467)
+- Parse 'ro' commandline option (#177599)
* Mon May 22 2006 - hare@suse.de
- Handle persistent device names correctly if
LVM is activated (#175972)
++++++ ipconfig.sh ++++++
--- mkinitrd/ipconfig.sh 2006-05-19 17:08:53.000000000 +0200
+++ mkinitrd/ipconfig.sh 2006-06-01 15:05:52.000000000 +0200
@@ -36,30 +36,30 @@
shift
if [ "$1" != "_" ] ; then
peer=$1
- shift
fi
+shift
if [ "$1" != "_" ] ; then
gateway=$1
- shift
fi
+shift
if [ "$1" != "_" ] ; then
netmask=$1
- shift
fi
+shift
if [ "$1" != "_" ] ; then
hostname=$1
- shift
fi
+shift
if [ "$1" != "_" ] ; then
dev=$1
- shift
else
dev=eth0
fi
+shift
if [ "$1" != "_" ] ; then
mode=$1
- shift
fi
+shift
if [ "$mode" ] ; then
echo "Ignoring mode $mode, using static configuration"
++++++ mkinitrd ++++++
--- mkinitrd/mkinitrd 2006-05-22 10:00:37.000000000 +0200
+++ mkinitrd/mkinitrd 2006-06-01 15:24:19.000000000 +0200
@@ -23,7 +23,7 @@
# This file is kept in the following CVS repository:
#
# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.299 $
+# $Revision: 1.310 $
usage() {
cat< /dev/null)
+ if [ -z "$sysfs_path" ]; then
+ return;
+ fi
+
+ pushd /sys$sysfs_path > /dev/null
if [ ! -d device ] ; then
cd ..
fi
if [ ! -d device ] ; then
# no device link; return
+ popd > /dev/null
return;
fi
@@ -903,7 +908,7 @@
cd -P iscsi_session:session*
echo $(basename $PWD)
fi
-
+ popd > /dev/null
}
get_default_interface() {
@@ -1065,7 +1070,7 @@
# Root is on SCSI, detect all SCSI devices
for dev_dir in /sys/class/scsi_device/*; do
if [ -d "$dev_dir" ] && [ -e "$dev_dir/device" ]; then
- cd $dev_dir;
+ pushd $dev_dir > /dev/null;
cd $(readlink device);
if [ -r ./hba_id ]; then
read fcp_disk_hba < ./hba_id
@@ -1081,6 +1086,7 @@
done
[ "$fcp_disk_hba" ] && s390_zfcp_hbas="$s390_zfcp_hbas $fcp_disk_hba"
fi
+ popd > /dev/null
fi
done
if [ "$s390_zfcp_hbas" ]; then
@@ -1099,7 +1105,7 @@
# Root device is on a dasd device, enable all dasd disks
for dir in /sys/block/dasd*; do
if [ -d "$dir" ] && [ -d ${dir}/device ]; then
- cd $dir
+ pushd $dir > /dev/null
cd $(readlink device)
if [ -r ./discipline ]; then
read type < ./discipline
@@ -1122,6 +1128,7 @@
esac
s390_dasd_disks="$s390_dasd_disks $(basename $PWD):$discipline"
fi
+ popd > /dev/null
fi
done
@@ -1279,10 +1286,6 @@
;;
mpath)
add_module dm-multipath
- add_module dm-round-robin
- add_module dm-emc
- root_mpath=1
- root_dm=1
;;
lvm2)
add_module dm-snapshot
@@ -1320,6 +1323,13 @@
cp_bin $vendor_init_script $vendor_script
fi
+ if has_module dm-multipath ; then
+ add_module dm-round-robin
+ add_module dm-emc
+ root_mpath=1
+ root_dm=1
+ fi
+
if has_module iscsi_tcp ; then
features=(${features[@]} iscsi)
cp_bin /sbin/iscsid $tmp_mnt/sbin/iscsid
@@ -1395,7 +1405,7 @@
echo "udev_root=\"/dev\"" > $tmp_mnt/etc/udev/udev.conf
echo "udev_rules=\"/etc/udev/rules.d\"" >> $tmp_mnt/etc/udev/udev.conf
# copy needed rules
- for rule in 05-udev-early.rules 50-udev-default.rules 60-persistent-storage.rules; do
+ for rule in 05-udev-early.rules 50-udev-default.rules 60-persistent-storage.rules 64-device-mapper.rules; do
if [ -f /etc/udev/rules.d/$rule ]; then
cp /etc/udev/rules.d/$rule $tmp_mnt/etc/udev/rules.d
fi
@@ -1440,6 +1450,7 @@
cp_bin /sbin/kpartx $tmp_mnt/sbin
cp_bin /sbin/dmsetup $tmp_mnt/sbin
cp_bin /sbin/mpath_id $tmp_mnt/sbin
+ cp_bin /sbin/kpartx_id $tmp_mnt/sbin
if [ -f /etc/multipath.conf ] ; then
cp -a /etc/multipath.conf $tmp_mnt/etc
fi
@@ -1463,11 +1474,18 @@
cp_bin /usr/bin/expr $tmp_mnt/bin
mkdir -p $tmp_mnt/mnt
cp -a /etc/evms.conf $tmp_mnt/etc
- mkdir -p $tmp_mnt/lib/evms
- SD=$(ls -A /lib/evms | tail -n 1)
- (cd $tmp_mnt/lib/evms && mkdir -p $SD)
- cp_bin /lib/evms/$SD/* $tmp_mnt/lib/evms/$SD
- rm -f $tmp_mnt/lib/evms/*/*{ext2,jfs,ogfs,reiser,swap,xfs}*so
+ [ -d /lib/evms ] && evms_lib="/lib/evms"
+ [ -d /lib64/evms ] && evms_lib="/lib64/evms"
+
+ if [ "$evms_lib" ] ; then
+ mkdir -p ${tmp_mnt}${evms_lib}
+ SD=$(ls -A $evms_lib | tail -n 1)
+ (cd ${tmp_mnt}${evms_lib} && mkdir -p $SD)
+ cp_bin $evms_lib/$SD/* ${tmp_mnt}${evms_lib}/$SD
+ rm -f ${tmp_mnt}${evms_lib}/*/*{ext2,jfs,ogfs,reiser,swap,xfs}*so
+ else
+ oops 7 "No EVMS modules found"
+ fi
fi
if has_any_module raid0 raid1 raid5 linear multipath; then
@@ -1664,6 +1682,9 @@
| rw)
| read_write=1
| ;;
+ | ro)
+ | read_only=1
+ | ;;
| esac
|done
|
@@ -1679,24 +1700,22 @@
| rootdev_cmdline=1
| ;;
| resume=*)
- | set -- \$(IFS== ; echo \$o)
- | resumedev=\$2
+ | resumedev=\${o#resume=}
| ;;
| journal=*)
- | set -- \$(IFS== ; echo \$o)
- | journaldev=\$2
+ | journaldev=\${o#journal=}
| ;;
| mduuid=*)
- | set -- \$(IFS== ; echo \$o)
- | md_uuid=\$2
+ | md_uuid=\${o#mduuid=}
| ;;
| init=*)
- | set -- \$(IFS== ; echo \$o)
- | init=\$2
+ | init=\${o#init=}
| ;;
| udev_timeout=*)
- | set -- \$(IFS== ; echo $\o)
- | udev_timeout=\$2
+ | udev_timeout=\${o#udev_timeout=}
+ | ;;
+ | rootflags=*)
+ | rootfsflags=\${o#rootflags=}
| ;;
| esac
|done
@@ -1888,7 +1907,7 @@
done
# Filter modules into fs and non-fs (driver) modules.
- # We do this to avoid loading xfs when doing a resule: xfs had
+ # We do this to avoid loading xfs when doing a resume: xfs had
# (or still has) a bug that slows down resume a lot.
# FIXME: get rid of this split crap again.
for module in $resolved_modules; do
@@ -2165,6 +2184,8 @@
| echo \$o > /etc/initiatorname.iscsi ;;
| esac
|done
+ |# Always enable DHCP for iSCSI
+ |dhcp_mode=1
EOF
fi
@@ -2261,6 +2282,7 @@
| 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')
@@ -2269,7 +2291,7 @@
| if [ -z "\$iscsi_sid" ] ; then
| iscsi_sid=$iscsi_sid
| 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
@@ -2452,9 +2474,20 @@
if [ -n "$root_mpath" ] ; then
cat_linuxrc <<-EOF
- |# Rescan for multipath
- |/sbin/multipath -v0
- |/sbin/udevsettle --timeout=\$udev_timeout
+ |# check for IDE parameter in /proc/cmdline
+ |for o in \$(cat /proc/cmdline) ; do
+ | case \$o in
+ | multipath=*)
+ | mpath_status=\${o#multipath=};;
+ | esac
+ |done
+ |if [ "\$mpath_status" != "off" ] ; then
+ | # Rescan for multipath
+ | echo -n "Setup multipath devices: "
+ | /sbin/multipath -v0
+ | /sbin/udevsettle --timeout=\$udev_timeout
+ | echo 'ok.'
+ |fi
EOF
fi
@@ -2721,8 +2754,13 @@
| echo "fsck failed. Mounting root device read-only."
| read_write=
| else
- | echo "fsck succeeded. Mounting root device read-write."
- | read_write=1
+ | if [ "$read_only" ]; then
+ | echo "fsck succeeded. Mounting root device read-only."
+ | read_write=
+ | else
+ | echo "fsck succeeded. Mounting root device read-write."
+ | read_write=1
+ | fi
| fi
|fi
EOF
@@ -2738,6 +2776,7 @@
|echo "Mounting root $rootdev"
|# check external journal
|[ "$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 "$rootfstype" ] && opt="${opt} -t $rootfstype"
|if [ -x /bin/nfsmount -a "$rootfstype" = "nfs" ]; then
@@ -2761,14 +2800,30 @@
|fi
|
|if [ -z "$init" ] ; then
- | echo "No init found. Try passing init= optino to the kernel."
+ | echo "No init found. Try passing init= option to the kernel."
| die 1
|fi
|
|# Parse root mount options
|if [ -f /root/etc/fstab ] ; then
| fsoptions=$(cat /root/etc/fstab | while read d m f o r; do if [ "$m" == "/" ] ; then echo $o; fi; done)
- | if [ "$fsoptions" ] && [ "$fsoptions" != "defaults" ] ; then
+ | set -- $(IFS=,; echo $fsoptions)
+ | fsoptions=
+ | while [ "$1" ] ; do
+ | case $1 in
+ | *quota) ;;
+ | defaults) ;;
+ | *)
+ | if [ "$fsoptions" ] ; then
+ | fsoptions="$fsoptions,$1"
+ | else
+ | fsoptions="$1"
+ | fi
+ | ;;
+ | esac
+ | shift
+ | done
+ | if [ "$fsoptions" ] ; then
| mount -o remount,$fsoptions $rootdev /root
| fi
|fi
@@ -3031,6 +3086,7 @@
if [ -n "$root_dm" ] ; then
add_module dm-mod
add_module dm-snapshot
+ domu_modules="$domu_modules dm-mod dm-snapshot"
fi
# check if there is or was more than on raid type active
if [ -f /proc/mdstat -a -z "$root_dir" ] ; then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org