Mailinglist Archive: opensuse-commit (1942 mails)
| < Previous | Next > |
commit mkinitrd
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 21 Nov 2008 15:34:47 +0100
- Message-id: <20081121143447.86AC8678168@xxxxxxxxxxxxxxx>
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@xxxxxxx
+
+- 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@xxxxxxx
+
+- 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 <<EOF
#
@@ -103,12 +104,22 @@
/lib/mkinitrd/bin/*
/sbin/mkinitrd
/sbin/mkinitrd_setup
+/sbin/lsinitrd
/sbin/module_upgrade
/sbin/installkernel
%doc %{_mandir}/man5/mkinitrd.5.gz
%doc %{_mandir}/man8/mkinitrd.8.gz
+%doc %{_mandir}/man8/lsinitrd.8.gz
%changelog
+* Fri Nov 21 2008 hare@xxxxxxx
+- 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 2008 hare@xxxxxxx
+- Include lsinitrd script (bnc#439103)
* Thu Oct 09 2008 agraf@xxxxxxx
- Remove rootfs module check (bnc#432766)
- Include libata drivers only if libata is used (bnc#433105)
@@ -390,9 +401,9 @@
- fix lib/lib64 detection on ia64/alpha
* Fri Jan 19 2007 hare@xxxxxxx
- Obey settings from /etc/sysconfig/bootsplash (#230839)
-* Sat Nov 25 2006 olh@xxxxxxx
+* Fri Nov 24 2006 olh@xxxxxxx
- declare variables as local in udev_discover_root/udev_discover_resume
-* Sat Nov 25 2006 olh@xxxxxxx
+* Fri Nov 24 2006 olh@xxxxxxx
- nfsroot must be passed as root=server:/directory, either via
cmdline or fstab. Just *:* as rootdev match string does not mean
nfsroot, it will also trigger for /dev/disk/ symlinks
@@ -450,9 +461,9 @@
- reduce build requires
* Sat Oct 28 2006 olh@xxxxxxx
- ldd exits early if ld.so fails on one of the passed binaries
-* Thu Oct 26 2006 olh@xxxxxxx
+* Wed Oct 25 2006 olh@xxxxxxx
- use ELF type for lib/lib64 decision
-* Thu Oct 26 2006 olh@xxxxxxx
+* Wed Oct 25 2006 olh@xxxxxxx
- do the chmod 755 in cp_bin to fix suid binaries early
* Mon Oct 16 2006 hare@xxxxxxx
- Escape 'mdadm' to avoid error messages
@@ -484,7 +495,7 @@
- Fix dmraid detection.
* Tue Sep 19 2006 hare@xxxxxxx
- Only enable dmraid when the respective binaries are installed.
-* Mon Sep 18 2006 seife@xxxxxxx
+* Sun Sep 17 2006 seife@xxxxxxx
- add missing double quotes in the detection of the userspace
resume device (found by Robert Schiele, bug #206368.
- correct the major/minor numbers for /dev/{u,}random.
@@ -501,13 +512,13 @@
- add code to detect if system time is older than build time
* Thu Aug 24 2006 olh@xxxxxxx
- remove udev version requirement to keep mkinitrd sles10 compatible
-* Thu Aug 24 2006 olh@xxxxxxx
+* Wed Aug 23 2006 olh@xxxxxxx
- remove static binary handling. ash can not deal with added array
usage and static module-init-tools are larger than shared ones.
-* Thu Aug 24 2006 olh@xxxxxxx
+* Wed Aug 23 2006 olh@xxxxxxx
- remove readlink function, binary exists since 8.2 and it breaks
syntax highlighting in vim
-* Thu Aug 24 2006 olh@xxxxxxx
+* Wed Aug 23 2006 olh@xxxxxxx
- remove special handling for init args, use the kernel provided args
* Fri Aug 11 2006 fink@xxxxxxx
- Run blogd within initramfs
@@ -594,7 +605,7 @@
- remove the requirement for expr, except for evms, bash does math
* Sat Apr 22 2006 olh@xxxxxxx
- mkinitrd does not work if /usr is unavailable, exit early
-* Sat Apr 22 2006 olh@xxxxxxx
+* Fri Apr 21 2006 olh@xxxxxxx
- remove selinux support, it references non-existant files in /usr
* Fri Apr 21 2006 olh@xxxxxxx
- remove +s bits from mount to allow mkinitrd as unprivileged user
@@ -602,11 +613,11 @@
- include fsck binary if fstab root mountpoint contains colons
* Fri Apr 21 2006 olh@xxxxxxx
- consider bootsplash only on DOS compatibles
-* Fri Apr 21 2006 olh@xxxxxxx
+* Thu Apr 20 2006 olh@xxxxxxx
- remove dead code in /init script, rootdevn serves no purpose
-* Fri Apr 21 2006 olh@xxxxxxx
+* Thu Apr 20 2006 olh@xxxxxxx
- fix typo in lvm2 detection, better lvdisplay output parsing
-* Fri Apr 21 2006 olh@xxxxxxx
+* Thu Apr 20 2006 olh@xxxxxxx
- remove hardcoded /dev/md0 to allow root on md1 and above (#164600)
* Wed Apr 19 2006 olh@xxxxxxx
- escape udev_timeout variable
@@ -774,7 +785,7 @@
* Fri Sep 02 2005 kasievers@xxxxxxx
- read DEV_ON_TMPFS from /etc/sysconfig/kernel (#114400)
with default yes.
-* Sun Aug 28 2005 cthiel@xxxxxxx
+* Sat Aug 27 2005 cthiel@xxxxxxx
- Fix splash size autodetection (#113573)
* Fri Aug 26 2005 hare@xxxxxxx
- Add modprobe and modules.dep for proper handling of modules
@@ -814,7 +825,7 @@
- module_upgrade: Add script for renaming modules in all system
config files. This is invoked from the kernel post-install
script (#47755).
-* Tue May 03 2005 schwab@xxxxxxx
+* Mon May 02 2005 schwab@xxxxxxx
- Initialize fs_modules and drv_modules in each round.
* Thu Mar 31 2005 hare@xxxxxxx
- Fix booting from DASD on S/390.
@@ -915,7 +926,7 @@
- Rearrange dhcp sections to make nfs-root work again.
- Actually include udev as it's always needed.
- Re-add hotplug.sh which is needed for initramfs.
-* Mon Dec 13 2004 olh@xxxxxxx
+* Sun Dec 12 2004 olh@xxxxxxx
- drop mkinitramfs
* Mon Nov 08 2004 agruen@xxxxxxx
- Recognize the sysrq={yes|1} kernel command-line option for
@@ -964,7 +975,7 @@
be achieved by running mkinitrd with chroot inside the real
root directory.
- Add missing -p flags to mkdirs.
-* Mon Aug 23 2004 olh@xxxxxxx
+* Sun Aug 22 2004 olh@xxxxxxx
- mkinitramfs: move mount $udev_root to avoid duplicate entries
in /proc/self/mounts
* Sun Aug 22 2004 olh@xxxxxxx
@@ -1006,7 +1017,7 @@
- #43352: dasdview was not copied into the initrd;
scsi modules were copied with no SCSI device present on S/390,
and a symlink to sed were created with sed already present.
-* Fri Jul 02 2004 agruen@xxxxxxx
+* Thu Jul 01 2004 agruen@xxxxxxx
- #42696: Lilo passes the root device number as three to four-digit
hex number. Make mkinitrd recognize the dree-digit case
correctly.
@@ -1036,7 +1047,7 @@
- Convert some back-tick quoting to $() quoting.
* Mon Jun 14 2004 olh@xxxxxxx
- mkinitramfs: mount /proc correctly
-* Fri Jun 11 2004 agruen@xxxxxxx
+* Thu Jun 10 2004 agruen@xxxxxxx
- #41896: Fix do_chroot.
* Wed Jun 09 2004 agruen@xxxxxxx
- #41821: mkinitrd / mkiniramfs vga mode scanning bug.
@@ -1056,7 +1067,7 @@
- mkinitrd: Emit warning if no disks are found (#41542).
* Wed Jun 02 2004 hare@xxxxxxx
- mkinitrd: Always activate all disks (#41484).
-* Wed Jun 02 2004 olh@xxxxxxx
+* Tue Jun 01 2004 olh@xxxxxxx
- mkinitramfs: add raid/lvm support if raid or dm-mod given with -m
* Tue Jun 01 2004 hare@xxxxxxx
- mkinitrd: Fix EVMS handling on S/390 (#40857).
@@ -1064,18 +1075,18 @@
- mkinitramfs: disable 'debug' per default in kinit.sh
* Mon May 31 2004 olh@xxxxxxx
- mkinitramfs: use modprobe.conf from -b <dir>/etc, if it exits
-* Sun May 30 2004 olh@xxxxxxx
+* Sat May 29 2004 olh@xxxxxxx
- mkinitramfs: if -m is given, expect that ALL required modules
are given on cmdline, dont do autodetection for root filesystem
type and lvm/md/dm in this case
check also if /proc is mounted, do not fail if not
this is required if the initrd is built for another host as user
-* Sun May 30 2004 olh@xxxxxxx
+* Sat May 29 2004 olh@xxxxxxx
- mkinitramfs: remove <() process substitution,
doesnt work without proc. use 'here document' instead
-* Sun May 30 2004 olh@xxxxxxx
+* Sat May 29 2004 olh@xxxxxxx
- mkinitramfs: use -b dir in default_kernel_images()
-* Sun May 30 2004 olh@xxxxxxx
+* Sat May 29 2004 olh@xxxxxxx
- mkinitramfs-kinit.sh:
remove hardcoded unconditional 42 panic timeout
* Wed May 26 2004 agruen@xxxxxxx
@@ -1130,7 +1141,7 @@
* Fri Apr 23 2004 garloff@xxxxxxx
- mkinitrd: Add support for new syntax of passing scsi_mod params
with scsi_mod. prefix. Translate old options, where possible.
-* Tue Apr 20 2004 olh@xxxxxxx
+* Mon Apr 19 2004 olh@xxxxxxx
- mkinitramfs changes:
copy raidautorun
* Mon Apr 19 2004 olh@xxxxxxx
@@ -1156,7 +1167,7 @@
raid; add fallback to scan sysfs if udev fails.
* Fri Apr 02 2004 hare@xxxxxxx
- mkinitrd: Add support for large device numbers.
-* Fri Apr 02 2004 agruen@xxxxxxx
+* Thu Apr 01 2004 agruen@xxxxxxx
- Report failure if binaries are not found.
- Add devnumber klibc binary.
- Actually include raidautorun in the initrd.
@@ -1165,7 +1176,7 @@
not a RAID, and there are RAIDs configured in the rest of the
system: Otherwise lvm may wrongly think that the RAID is multipath
attached storage, and corrupt data.
-* Wed Mar 31 2004 agruen@xxxxxxx
+* Tue Mar 30 2004 agruen@xxxxxxx
- mkinitrd:
+ Dereference symbolic link in hex_dev_number (fehr@xxxxxxx).
+ Get rid of static device numbers, clean up device number
@@ -1177,7 +1188,7 @@
- mkinitramfs: add sr_mod to initrd as a workaround for #37943
create /dev/shm earlier in /init
copy rm binary and /etc/sysconfig/hardware to initramfs
-* Mon Mar 29 2004 agruen@xxxxxxx
+* Sun Mar 28 2004 agruen@xxxxxxx
- Added support for S/390 zfcp disks with kernel 2.6
(hare@xxxxxxx).
- Fix syntax error checking for device mapper; cleanups.
@@ -1298,7 +1309,7 @@
- pass module parameters from /etc/modules.conf to linuxrc
* Wed Oct 01 2003 schwab@xxxxxxx
- new-kernel-pkg: handle elilo.
-* Tue Sep 30 2003 kukuk@xxxxxxx
+* Mon Sep 29 2003 kukuk@xxxxxxx
- Add %%defattr
* Mon Sep 29 2003 agruen@xxxxxxx
- There is no mkdir in the initrd: Create all needed directories
@@ -1337,7 +1348,7 @@
- Remove now-obsolete oem resize support.
* Mon Sep 01 2003 mls@xxxxxxx
- dhcp: allow servername in rootpath (#29791)
-* Mon Sep 01 2003 agruen@xxxxxxx
+* Sun Aug 31 2003 agruen@xxxxxxx
- Fix broken check: mount, umount and the surrounding files were
missing in initrd's.
* Wed Aug 27 2003 agruen@xxxxxxx
++++++ mkinitrd.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mkinitrd-2.4/build_rpm new/mkinitrd-2.4/build_rpm
--- old/mkinitrd-2.4/build_rpm 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/build_rpm 2008-11-21 13:26:11.000000000 +0100
@@ -36,8 +36,8 @@
VERSION=$(sed -n 's/Version: *\(.*\)/\1/p' mkinitrd.spec)
-if ! which git-archive > /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 <hare@xxxxxxx>, Alexander Graf <agraf@xxxxxxx>
+.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@xxxxxxx
+
+- 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@xxxxxxx
+
+- Include lsinitrd script (bnc#439103)
+
+-------------------------------------------------------------------
Thu Oct 9 09:12:14 CEST 2008 - agraf@xxxxxxx
- 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 <<EOF
#
@@ -96,10 +97,12 @@
/lib/mkinitrd/bin/*
/sbin/mkinitrd
/sbin/mkinitrd_setup
+/sbin/lsinitrd
/sbin/module_upgrade
/sbin/installkernel
%doc %{_mandir}/man5/mkinitrd.5.gz
%doc %{_mandir}/man8/mkinitrd.8.gz
+%doc %{_mandir}/man8/lsinitrd.8.gz
%changelog
* Tue May 29 2007 - agraf@xxxxxxx
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mkinitrd-2.4/sbin/lsinitrd
new/mkinitrd-2.4/sbin/lsinitrd
--- old/mkinitrd-2.4/sbin/lsinitrd 1970-01-01 01:00:00.000000000 +0100
+++ new/mkinitrd-2.4/sbin/lsinitrd 2008-11-21 13:26:11.000000000 +0100
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# lsinitrd - show contents of an initrd image
+#
+# Copyright (C) 2008 SuSE Linux Products GmbH, Nuernberg, Germany
+#
+# 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
+#
+
+usage() {
+ echo "Usage: lsinitrd [-l] [-h] <initrd>"
+}
+
+while [ "$1" ] ; do
+ case $1 in
+ -l|--long)
+ verbose=1
+ shift
+ ;;
+ -h)
+ usage
+ exit 1
+ ;;
+ -*)
+ echo "Unknown option $1"
+ usage
+ exit 1
+ ;;
+ *)
+ break;
+ ;;
+ esac
+done
+
+initrd=$1
+
+if [ -z "$initrd" ] ; then
+ echo "No initrd file specified"
+ usage
+ exit 1
+fi
+
+if [ "$verbose" ] ; then
+ args="-tv"
+else
+ args="-t"
+fi
+
+zcat $initrd | cpio $args
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mkinitrd-2.4/sbin/Makefile
new/mkinitrd-2.4/sbin/Makefile
--- old/mkinitrd-2.4/sbin/Makefile 2008-10-09 09:41:09.000000000 +0200
+++ new/mkinitrd-2.4/sbin/Makefile 2008-11-21 13:26:11.000000000 +0100
@@ -4,7 +4,7 @@
sbindir = /sbin
-PRGS = mkinitrd installkernel module_upgrade mkinitrd_setup
+PRGS = mkinitrd installkernel module_upgrade mkinitrd_setup lsinitrd
all: install
install: $(PRGS)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/mkinitrd-2.4/scripts/boot-mount.sh
new/mkinitrd-2.4/scripts/boot-mount.sh
--- old/mkinitrd-2.4/scripts/boot-mount.sh 2008-10-09 09:41:09.000000000
+0200
+++ new/mkinitrd-2.4/scripts/boot-mount.sh 2008-11-21 13:26:11.000000000
+0100
@@ -88,7 +88,8 @@
echo "invalid root filesystem -- exiting to /bin/sh"
cd /
PATH=$PATH PS1='$ ' /bin/sh -i
-elif [ -x "$rootfsck" ]; then
+# don't run fsck in the kdump kernel
+elif [ -x "$rootfsck" ] && ! [ -s /proc/vmcore ] ; then
# fsck is unhappy without it
echo "$rootdev / $rootfstype defaults 1 1" > /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@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |