Hello community,
here is the log from the commit of package mkinitrd
checked in at Fri Nov 21 15:34:47 CET 2008.
--------
--- mkinitrd/mkinitrd.changes 2008-10-09 09:41:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-11-21 13:42:47.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Nov 21 10:51:52 CET 2008 - hare@suse.de
+
+- network: use wildcard match for nettype 'dhcp' (bnc#440192)
+- Update modules script for zfcpdump (bnc#446427)
+- Select correct network interface when 'ip=' is specified
+ on the commandline (bnc#442074)
+- Disable fsck for kdump (bnc#438192)
+
+-------------------------------------------------------------------
+Wed Oct 29 10:53:39 CET 2008 - hare@suse.de
+
+- Include lsinitrd script (bnc#439103)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.hh9729/_old 2008-11-21 15:34:24.000000000 +0100
+++ /var/tmp/diff_new_pack.hh9729/_new 2008-11-21 15:34:24.000000000 +0100
@@ -22,10 +22,10 @@
License: GPL v2 or later
Group: System/Base
#!BuildIgnore: module-init-tools e2fsprogs udev reiserfs
-Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl
+Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader
AutoReqProv: on
Version: 2.4
-Release: 27
+Release: 28
Conflicts: udev < 118
Requires: dhcpcd
Summary: Creates an Initial RAM Disk Image for Preloading Modules
@@ -77,6 +77,7 @@
chmod -R 755 $RPM_BUILD_ROOT/lib/mkinitrd
install -D -m 644 man/mkinitrd.5 $RPM_BUILD_ROOT/%{_mandir}/man5/mkinitrd.5
install -D -m 644 man/mkinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/mkinitrd.8
+install -D -m 644 man/lsinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/lsinitrd.8
mkdir -p $RPM_BUILD_ROOT/etc/rpm
cat > $RPM_BUILD_ROOT/etc/rpm/macros.mkinitrd < /dev/null ; then
- echo "git-archive not found, cannot continue"
+if ! which git > /dev/null ; then
+ echo "git not found, cannot continue"
exit 1
fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/lib/mkinitrd/bin/ipconfig.sh new/mkinitrd-2.4/lib/mkinitrd/bin/ipconfig.sh
--- old/mkinitrd-2.4/lib/mkinitrd/bin/ipconfig.sh 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/lib/mkinitrd/bin/ipconfig.sh 2008-11-21 13:26:11.000000000 +0100
@@ -61,10 +61,6 @@
fi
shift
-if [ "$mode" ] ; then
- echo "Ignoring mode $mode, using static configuration"
-fi
-
# Calculate the prefix
prefix=${client%%*/}
if [ "$prefix" == "$client" ] ; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/man/lsinitrd.8 new/mkinitrd-2.4/man/lsinitrd.8
--- old/mkinitrd-2.4/man/lsinitrd.8 1970-01-01 01:00:00.000000000 +0100
+++ new/mkinitrd-2.4/man/lsinitrd.8 2008-11-21 13:26:11.000000000 +0100
@@ -0,0 +1,42 @@
+.\" Copyright (C) 2008 SUSE Linux Products GmbH
+.\"
+.\" This program is free software; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License
+.\" as published by the Free Software Foundation; either version 2
+.\" of the License, or (at your option) any later version.
+.\"
+.\" This program is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program; if not, write to the Free Software
+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+.\" USA.
+.\"
+.\" This file is kept in the following git repository:
+.\"
+.\" git://git.kernel.org/pub/scm/linux/kernel/git/hare/mkinitrd.git
+.\"
+.TH lsinitrd 8
+.SH NAME
+lsinitrd \- lists contents of an initrd disk image
+.SH SYNOPSIS
+\fBlsinitrd\fR [options] [initrd file]
+.SH DESCRIPTION
+\fBlsinitrd\fR list the contents of an initial ramdisk images
+for booting Linux as created by \fBmkinitrd\fR.
+
+.SH OPTIONS
+.TP
+\fB-h\fR
+This Text.
+.TP
+\fB-l\fR
+verbose listing, similar to \fBls -l\fR.
+
+.BR
+.SH AUTHORS
+Hannes Reinecke , Alexander Graf
+.BR
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/mkinitrd.changes new/mkinitrd-2.4/mkinitrd.changes
--- old/mkinitrd-2.4/mkinitrd.changes 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/mkinitrd.changes 2008-11-21 13:26:11.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Fri Nov 21 10:51:52 CET 2008 - hare@suse.de
+
+- network: use wildcard match for nettype 'dhcp' (bnc#440192)
+- Update modules script for zfcpdump (bnc#446427)
+- Select correct network interface when 'ip=' is specified
+ on the commandline (bnc#442074)
+- Disable fsck for kdump (bnc#438192)
+
+-------------------------------------------------------------------
+Wed Oct 29 10:53:39 CET 2008 - hare@suse.de
+
+- Include lsinitrd script (bnc#439103)
+
+-------------------------------------------------------------------
Thu Oct 9 09:12:14 CEST 2008 - agraf@suse.de
- Remove rootfs module check (bnc#432766)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/mkinitrd.spec new/mkinitrd-2.4/mkinitrd.spec
--- old/mkinitrd-2.4/mkinitrd.spec 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/mkinitrd.spec 2008-11-21 13:26:11.000000000 +0100
@@ -70,6 +70,7 @@
chmod -R 755 $RPM_BUILD_ROOT/lib/mkinitrd
install -D -m 644 man/mkinitrd.5 $RPM_BUILD_ROOT/%{_mandir}/man5/mkinitrd.5
install -D -m 644 man/mkinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/mkinitrd.8
+install -D -m 644 man/lsinitrd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/lsinitrd.8
mkdir -p $RPM_BUILD_ROOT/etc/rpm
cat > $RPM_BUILD_ROOT/etc/rpm/macros.mkinitrd < /etc/fstab
# Display progress bar if possible
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/boot-network.sh new/mkinitrd-2.4/scripts/boot-network.sh
--- old/mkinitrd-2.4/scripts/boot-network.sh 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/scripts/boot-network.sh 2008-11-21 13:26:11.000000000 +0100
@@ -23,13 +23,19 @@
# mac address based config
if [ "$macaddress" ] ; then
- for dev in /sys/class/net/* ; do
- read tmpmac < $dev/address
- if [ "$tmpmac" = "$macaddress" ] ; then
- interface=${dev##*/}
- echo "[NETWORK] using interface $interface"
- fi
- done
+ nettype=${ip##*:}
+ ip=${ip%:*}
+ interface=${ip##*:}
+ tmpip=${ip%:*}
+ for dev in /sys/class/net/* ; do
+ read tmpmac < $dev/address
+ if [ "$tmpmac" == "$macaddress" ] ; then
+ interface=${dev##*/}
+ echo "using interface $interface"
+ fi
+ done
+ ip="${tmpip}:${interface}:${nettype}"
+ fi
fi
if [ "$nfsaddrs" -a ! "$(get_param ip)" ]; then
@@ -107,6 +113,7 @@
# dhcp information emulation
IPADDR="${ip%%:*}"
ip="${ip#*:}" # first entry => peeraddr
+ PEERADDR="${ip%%:*}"
ip="${ip#*:}" # first entry => gwaddr
GATEWAY="${ip%%:*}"
ip="${ip#*:}" # first entry => netmask
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-modules.sh new/mkinitrd-2.4/scripts/setup-modules.sh
--- old/mkinitrd-2.4/scripts/setup-modules.sh 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/scripts/setup-modules.sh 2008-11-21 13:26:11.000000000 +0100
@@ -5,6 +5,14 @@
# TODO: generate module deps and copy them to the initrd
# take xen into account
+# Check if module $1 is listed in $modules.
+has_module() {
+ case " $modules " in
+ *" $1 "*) return 0 ;;
+ esac
+ return 1
+}
+
# Check if any of the modules in $* are listed in $modules.
has_any_module() {
local module
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-network.sh new/mkinitrd-2.4/scripts/setup-network.sh
--- old/mkinitrd-2.4/scripts/setup-network.sh 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/scripts/setup-network.sh 2008-11-21 13:26:11.000000000 +0100
@@ -130,11 +130,14 @@
if [ "$interface" = "default" ]; then
ifspec=$(get_default_interface)
interface=${ifspec%%/*}
- if [ "${ifspec##*/}" = "dhcp" ] ; then
- nettype=dhcp
- else
- nettype=static
- fi
+ case "${ifspec##*/}" in
+ dhcp*)
+ nettype=dhcp
+ ;;
+ *)
+ nettype=static
+ ;;
+ esac
fi
if [ "$create_monster_initrd" ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.4/scripts/setup-start.sh new/mkinitrd-2.4/scripts/setup-start.sh
--- old/mkinitrd-2.4/scripts/setup-start.sh 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/scripts/setup-start.sh 2008-11-21 13:26:11.000000000 +0100
@@ -22,14 +22,6 @@
return
}
-# Check if module $1 is listed in $modules.
-has_module() {
- case " $modules " in
- *" $1 "*) return 0 ;;
- esac
- return 1
-}
-
# Set in the mkinitrd script
save_var build_day
@@ -46,9 +38,13 @@
fi
# Activate features which are eqivalent to modules
-if has_module dm-multipath; then
- ADDITIONAL_FEATURES="$ADDITIONAL_FEATURES multipath"
-fi
+for m in "$module" ; do
+ case "$m" in
+ dm-multipath)
+ ADDITIONAL_FEATURES="$ADDITIONAL_FEATURES multipath"
+ ;;
+ esac
+done
save_var rootdev
root="$rootdev"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org