Hello community,
here is the log from the commit of package mkinitrd
checked in at Tue Jun 5 12:49:26 CEST 2007.
--------
--- mkinitrd/mkinitrd.changes 2007-06-01 15:39:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2007-06-05 11:39:11.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jun 4 13:53:53 CEST 2007 - agraf@suse.de
+
+- Made missing modules a warning. This may happen on custom kernels. (#279516)
+- Added: If a kernel module preceding a minus sign was given, this module is
+ excluded from the initrd
+
+-------------------------------------------------------------------
@@ -16 +23 @@
-- Fix module detection
+- Fix module detection (#279611)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.h24998/_old 2007-06-05 12:47:53.000000000 +0200
+++ /var/tmp/diff_new_pack.h24998/_new 2007-06-05 12:47:53.000000000 +0200
@@ -18,7 +18,7 @@
Requires: coreutils modutils util-linux grep gzip sed gawk cpio udev pciutils sysvinit file
Autoreqprov: on
Version: 2.0
-Release: 16
+Release: 18
Summary: Creates an Initial RAM Disk Image for Preloading Modules
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: mkinitrd.tgz
@@ -47,6 +47,7 @@
Bernhard Kaindl
Andreas Gruenbacher
Hannes Reinecke
+ Alexander Graf
%prep
%setup
@@ -85,6 +86,10 @@
%doc %{_mandir}/man8/mkinitrd.8.gz
%changelog
+* Mon Jun 04 2007 - agraf@suse.de
+- Made missing modules a warning. This may happen on custom kernels. (#279516)
+- Added: If a kernel module preceding a minus sign was given, this module is
+ excluded from the initrd
* Fri Jun 01 2007 - hare@suse.de
- Handle built-in filesystems correctly (#278981)
- Fixup handling of xfs (#278192)
@@ -95,7 +100,7 @@
- Fixup error paths
- Fix cciss detection
- Fix typo in lvm2 setup
-- Fix module detection
+- Fix module detection (#279611)
* Tue May 29 2007 - agraf@suse.de
- Include optional busybox support (activate with -f busybox)
(#276555)
++++++ mkinitrd.tgz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/00-prepare.sh new/mkinitrd-2.0/lib/mkinitrd/setup/00-prepare.sh
--- old/mkinitrd-2.0/lib/mkinitrd/setup/00-prepare.sh 2007-06-01 15:39:32.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/setup/00-prepare.sh 2007-06-04 16:41:36.000000000 +0200
@@ -98,6 +98,19 @@
return
fi
+ # And run depmod to ensure proper loading
+ if [ "$sysmap" ] ; then
+ map="$sysmap"
+ else
+ map=$root_dir/boot/System.map-$kernel_version
+ fi
+ if [ ! -f $map ]; then
+ map=$root_dir/boot/System.map
+ fi
+ if [ ! -f $map ]; then
+ oops 9 "Could not find map $map, please specify a correct file with -M."
+ fi
+
# create an empty initrd
if ! mkdir $tmp_mnt ; then
error 1 "could not create temporary directory"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh
--- old/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-06-01 15:39:32.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/setup/070-storage.sh 2007-06-04 16:41:36.000000000 +0200
@@ -245,8 +245,8 @@
fi
# Check if we have to load a module for the rootfs type
-if ! modprobe --set-version $kernel_version -q $rootfstype; then
- if ! grep -q $rootfstype /proc/filesystems ; then
+if [ ! "$(find $root_dir/lib/modules/$kernel_version/ -name $rootfstype.ko)" ]; then
+ if ! grep -q ${rootfstype}_fs_type $map ; then
error 1 "Could not find the filesystem module for root device $rootdev ($rootfstype)"
else
rootfsmod=
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/lib/mkinitrd/setup/50-modules.sh new/mkinitrd-2.0/lib/mkinitrd/setup/50-modules.sh
--- old/mkinitrd-2.0/lib/mkinitrd/setup/50-modules.sh 2007-06-01 15:39:32.000000000 +0200
+++ new/mkinitrd-2.0/lib/mkinitrd/setup/50-modules.sh 2007-06-04 16:41:36.000000000 +0200
@@ -43,9 +43,10 @@
--set-version $kernel_version --ignore-install \
--show-depends $module 2> /dev/null \
| sed -ne 's:.*insmod /\?::p' )
- if [ "$module" != "af_packet" ] && [ -z "$module_list" ]; then
- oops 7 "Cannot determine dependencies of module $module." \
- "Is modules.dep up to date?"
+ if [ ! "$module_list" ]; then
+ echo \
+"WARNING Cannot determine dependencies of kernel module '$module'.
+ Does it exist? If it does, try depmod -a. Continuing without $module." >&2
fi
for mod in $module_list ; do
if ! $(echo $resolved_modules | grep -q $mod) ; then
@@ -82,6 +83,20 @@
return 1
fi
+# cut out all modules which have a minus preceding them
+modules=$(
+for module in $modules; do
+ skip=
+ for m2 in $modules; do
+ if [ "-$module" = "$m2" ]; then
+ skip=1
+ fi
+ done
+ [ ${module:0:1} = "-" ] && continue
+ [ "$skip" ] || echo "$module"
+done
+)
+
echo -ne "Kernel Modules:\t"
for mod in $resolved_modules ; do
modname=${mod##*/}
@@ -102,21 +117,6 @@
fi
done
-# And run depmod to ensure proper loading
-if [ "$sysmap" ] ; then
- map="$sysmap"
-else
- map=$root_dir/boot/System.map-$kernel_version
-fi
-if [ ! -f $map ]; then
- map=$root_dir/boot/System.map
-fi
-if [ ! -f $map ]; then
- oops 9 "Could not find map $map, please specify a correct file with -M."
- rm -rf $tmp_mnt
- return 1
-fi
-
if [ "$resolved_modules" ] ; then
[ ! -d $tmp_mnt/lib/modules/$kernel_version ] && oops 10 "No modules have been installed"
( cd $tmp_mnt; /sbin/depmod -b $tmp_mnt -e -F $map $kernel_version )
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/mkinitrd-2.0/mkinitrd.changes new/mkinitrd-2.0/mkinitrd.changes
--- old/mkinitrd-2.0/mkinitrd.changes 2007-06-01 15:39:32.000000000 +0200
+++ new/mkinitrd-2.0/mkinitrd.changes 2007-06-04 16:41:36.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Jun 4 13:53:53 CEST 2007 - agraf@suse.de
+
+- Made missing modules a warning. This may happen on custom kernels. (#279516)
+- Added: If a kernel module preceding a minus sign was given, this module is
+ excluded from the initrd
+
+-------------------------------------------------------------------
Fri Jun 1 15:34:27 CEST 2007 - hare@suse.de
- Handle built-in filesystems correctly (#278981)
@@ -13,7 +20,7 @@
- Fixup error paths
- Fix cciss detection
- Fix typo in lvm2 setup
-- Fix module detection
+- Fix module detection (#279611)
-------------------------------------------------------------------
Tue May 29 17:33:51 CEST 2007 - agraf@suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org