Hello community,
here is the log from the commit of package mkinitrd
checked in at Mon May 5 00:57:39 CEST 2008.
--------
--- mkinitrd/mkinitrd.changes 2008-04-29 09:25:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2008-05-02 12:52:54.000000000 +0200
@@ -1,0 +2,7 @@
+Fri May 2 09:57:57 CEST 2008 - hare@suse.de
+
+- Fixup boot from multipath (bnc#385240)
+- Add 'mkinitrd.config' file to the initrd (bnc#380687)
+- Warn user if non-english keyboard layout was used (bnc#331351)
+
+-------------------------------------------------------------------
@@ -18,0 +26,6 @@
+Wed Apr 9 15:41:33 CEST 2008 - agraf@suse.de
+
+- Use dynamic cmdline parsing
+- Add CIFS support
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.X32300/_old 2008-05-05 00:57:17.000000000 +0200
+++ /var/tmp/diff_new_pack.X32300/_new 2008-05-05 00:57:17.000000000 +0200
@@ -18,7 +18,7 @@
Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl
AutoReqProv: on
Version: 2.2
-Release: 8
+Release: 11
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd.tgz
@@ -100,6 +100,10 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog
+* Fri May 02 2008 hare@suse.de
+- Fixup boot from multipath (bnc#385240)
+- Add 'mkinitrd.config' file to the initrd (bnc#380687)
+- Warn user if non-english keyboard layout was used (bnc#331351)
* Tue Apr 29 2008 hare@suse.de
- Remove obsolete mk_initrd link
* Mon Apr 28 2008 hare@suse.de
@@ -108,6 +112,9 @@
* Wed Apr 23 2008 hare@suse.de
- Clean up build dependencies
- Replace awk with sed statements
+* Wed Apr 09 2008 agraf@suse.de
+- Use dynamic cmdline parsing
+- Add CIFS support
* Tue Apr 01 2008 hare@suse.de
- Cleanup save_var statements
- Match network interface by MAC address
++++++ mkinitrd.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/lib/mkinitrd/bin/linuxrc new/mkinitrd-2.2/lib/mkinitrd/bin/linuxrc
--- old/mkinitrd-2.2/lib/mkinitrd/bin/linuxrc 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/lib/mkinitrd/bin/linuxrc 2008-05-02 12:51:48.000000000 +0200
@@ -19,8 +19,7 @@
##################################################
load_modules() {
for file in $(eval echo $modules); do
- opt=$(eval echo \${opt_${file/-/_}})
- modprobe $file $opt
+ modprobe $file
done
modules=""
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/mkinitrd.changes new/mkinitrd-2.2/mkinitrd.changes
--- old/mkinitrd-2.2/mkinitrd.changes 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/mkinitrd.changes 2008-05-02 12:51:48.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Fri May 2 09:57:57 CEST 2008 - hare@suse.de
+
+- Fixup boot from multipath (bnc#385240)
+- Add 'mkinitrd.config' file to the initrd (bnc#380687)
+- Warn user if non-english keyboard layout was used (bnc#331351)
+
+-------------------------------------------------------------------
+Tue Apr 29 09:42:58 CEST 2008 - hare@suse.de
+
+- Remove obsolete mk_initrd link
+
+-------------------------------------------------------------------
Mon Apr 28 16:54:07 CEST 2008 - hare@suse.de
- Update symlinks automatically
@@ -11,6 +23,12 @@
- Replace awk with sed statements
-------------------------------------------------------------------
+Wed Apr 9 15:41:33 CEST 2008 - agraf@suse.de
+
+- Use dynamic cmdline parsing
+- Add CIFS support
+
+-------------------------------------------------------------------
Tue Apr 1 15:03:02 CEST 2008 - hare@suse.de
- Cleanup save_var statements
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/mkinitrd.spec new/mkinitrd-2.2/mkinitrd.spec
--- old/mkinitrd-2.2/mkinitrd.spec 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/mkinitrd.spec 2008-05-02 12:51:48.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package mkinitrd (Version 2.1)
+# spec file for package mkinitrd (Version 2.2)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,6 +10,7 @@
# norootforbuild
+
Name: mkinitrd
License: GPL v2 or later
Group: System/Base
@@ -17,7 +18,7 @@
Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl
AutoReqProv: on
Version: 2.2
-Release: 12
+Release: 1
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd.tgz
@@ -46,6 +47,7 @@
Bernhard Kaindl
Andreas Gruenbacher
Hannes Reinecke
+ Alexander Graf
%prep
%setup
@@ -91,7 +93,6 @@
/lib/mkinitrd/scripts/*
/lib/mkinitrd/bin/*
/sbin/mkinitrd
-/sbin/mk_initrd
/sbin/mkinitrd_setup
/sbin/module_upgrade
/sbin/installkernel
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/sbin/mkinitrd new/mkinitrd-2.2/sbin/mkinitrd
--- old/mkinitrd-2.2/sbin/mkinitrd 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/sbin/mkinitrd 2008-05-02 12:51:48.000000000 +0200
@@ -20,58 +20,117 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
# USA.
-# This file is kept in the following CVS repository:
+# This file is kept in the following git repository:
#
-# $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $
-# $Revision: 1.386 $
+# git://git.kernel.org/pub/linux/kernel/scm/hare/mkinitrd.git
+#
+
+declare -a cmd_option
+declare cmd_option_name cmd_option_desc cmd_option_param cmd_param_desc cmd_param_name
+
+read_options_eval() {
+ [ "$#" = 0 ] && return
+ for p in "$@"; do
+ echo -en "$p~"
+ done
+}
+
+read_options() {
+ egrep -h '%param_' $INITRD_PATH/setup/*.sh | sed 's/^.*_\(.\): \(.*\)$/ tmp_option=\$(read_options_eval \1 \2); [ \"$tmp_option\" ] \&\& cmd_option[\${#cmd_option[@]}]=\"\$tmp_option\"/' > /tmp/$$.params
+ . /tmp/$$.params
+ rm -f /tmp/$$.params
+}
+
+parse_option() {
+ OLDIFS="$IFS"
+ IFS="~"
+ set -- $1
+ cmd_option_name="$1"
+ cmd_option_desc="$2"
+ shift
+ shift
+ cmd_option_param="$*"
+ IFS="$OLDIFS"
+}
+
+next_param() {
+ OLDIFS="$IFS"
+ IFS="~"
+ set -- $cmd_option_param
+ cmd_param_desc="$1"
+ cmd_param_name="$2"
+ shift
+ shift
+ cmd_option_param="$*"
+ IFS="$OLDIFS"
+ [ "$cmd_param_name" ]
+}
+
+cmd_docmd() {
+ for i in "${cmd_option[@]}"; do
+ if [ "${i%%~*}" = "$1" ]; then
+ parse_option "$i"
+ return 0
+ fi
+ done
+ return 1
+}
+
+cmd_getopts() {
+ for i in "${cmd_option[@]}"; do
+ parse_option "$i"
+ echo -n $cmd_option_name
+ next_param && echo -n :
+ done
+}
+
+beautify() {
+ if [ "$nroff" ]; then
+ nroff -man | grep -v removeme
+ else
+ cat
+ fi
+}
+
+[ -x /usr/bin/nroff ] && nroff=1
usage() {
+
+(
+
+if [ "$nroff" ]; then
+ cat < $tmp_mnt/mkinitrd.config
+
# HBA firmware
mkdir -p $tmp_mnt/lib/firmware
for fw in /lib/firmware/ql*.bin /lib/firmware/aic94xx* ; do
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/scripts/setup-splash.sh new/mkinitrd-2.2/scripts/setup-splash.sh
--- old/mkinitrd-2.2/scripts/setup-splash.sh 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/scripts/setup-splash.sh 2008-05-02 12:51:48.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/bash
#
#%stage: boot
+#%param_s: "Add splash animation and bootscreen to initrd." size splash
#
# architecture dependend changes from default:
if [ "$splash" = "offbydefault" ]; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/scripts/setup-start.sh new/mkinitrd-2.2/scripts/setup-start.sh
--- old/mkinitrd-2.2/scripts/setup-start.sh 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/scripts/setup-start.sh 2008-05-02 12:51:48.000000000 +0200
@@ -2,6 +2,9 @@
#
#%stage: setup
#%depends: prepare
+#%param_m: "Modules to include in initrd. Defaults to the INITRD_MODULES variable in /etc/sysconfig/kernel" "\"module list\"" modules
+#%param_u: "Modules to include in initrd. Defaults to the DOMU_INITRD_MODULES variable in /etc/sysconfig/kernel." "\"DomU module list\"" domu_modules
+#%param_d: "Root device. Defaults to the device from which / is mounted. Overrides the rootdev enviroment variable if set." root_device rootdev
#
shebang=/bin/bash
@@ -19,21 +22,34 @@
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
-if [ -z "$modules_set" ]; then
+if [ -z "$param_m" ]; then
# get INITRD_MODULES from system configuration
. $root_dir/etc/sysconfig/kernel
modules="$INITRD_MODULES"
fi
-if [ -z "$domu_modules_set" ]; then
+if [ -z "$param_u" ]; then
# get DOMU_INITRD_MODULES from system configuration
. $root_dir/etc/sysconfig/kernel
domu_modules="$DOMU_INITRD_MODULES"
fi
+# Activate features which are eqivalent to modules
+if has_module dm-multipath; then
+ ADDITIONAL_FEATURES="$ADDITIONAL_FEATURES multipath"
+fi
+
save_var rootdev
root="$rootdev"
save_var root
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/scripts/setup-storage.sh new/mkinitrd-2.2/scripts/setup-storage.sh
--- old/mkinitrd-2.2/scripts/setup-storage.sh 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/scripts/setup-storage.sh 2008-05-02 12:51:48.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/bash
#
#%stage: filesystem
+#%param_j: "Journal device" device journaldev
#
# usage: update_list <id> <list>
update_list() {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.2/scripts/setup-vendor.sh new/mkinitrd-2.2/scripts/setup-vendor.sh
--- old/mkinitrd-2.2/scripts/setup-vendor.sh 2008-04-28 16:54:53.000000000 +0200
+++ new/mkinitrd-2.2/scripts/setup-vendor.sh 2008-05-02 12:51:48.000000000 +0200
@@ -1,6 +1,7 @@
#!/bin/bash
#
#%stage: boot
+#%param_V: "Vendor specific script to run in linuxrc (deprecated)." script vendor_init_script
#
if [ "$vendor_init_script" ] ; then
cp_bin $vendor_init_script $vendor_script
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org