![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Mon Jan 11 16:36:33 CET 2010. -------- --- mkinitrd/mkinitrd.changes 2009-10-28 00:36:56.000000000 +0100 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2009-12-17 13:01:59.000000000 +0100 @@ -1,0 +2,27 @@ +Thu Dec 17 12:54:44 CET 2009 - mvancura@suse.cz + +- Change handling of upper<>lower case matching for SLE-11. +- Add KMS support. + +------------------------------------------------------------------- +Tue Dec 15 14:32:24 CET 2009 - mvancura@suse.cz + +- don't run fsck if on batteries (bnc#521419) + +------------------------------------------------------------------- +Mon Dec 14 16:10:50 CET 2009 - mvancura@suse.cz + +- set number of inodes in /dev to unlimited (bnc#529839) + +------------------------------------------------------------------- + +Mon Nov 23 15:13:01 CET 2009 - mvancura@suse.cz + +- store the git repo URL in the package metadata + +------------------------------------------------------------------- +Fri Oct 30 14:39:03 CET 2009 - mmarek@suse.cz + +- restart mdmon before switching to the new root (fate#306823). + +------------------------------------------------------------------- @@ -7,0 +35,16 @@ +Thu Oct 22 16:54:45 CEST 2009 - ro@suse.de + +- add any required firmware to the initrd + +------------------------------------------------------------------- +Thu Oct 22 16:13:21 CEST 2009 - mmarek@suse.cz + +- Add support for compressed modules (bnc#458525) + +------------------------------------------------------------------- +Thu Oct 22 14:34:46 CEST 2009 - mvancura@suse.cz + +- scripts/setup-blockpartition.sh: fix sed regexp converting a + partition device name to the disk name (bnc#531663) + +------------------------------------------------------------------- @@ -44,0 +88,6 @@ + +------------------------------------------------------------------- +Fri Aug 21 16:26:00 CEST 2009 - mmarek@suse.cz + +- sbin/module_upgrade: update to new modprobe config layout + (bnc#532069). calling whatdependson for head-i586 Old: ---- mkinitrd-include_firmware.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.WfrqzH/_old 2010-01-11 16:33:36.000000000 +0100 +++ /var/tmp/diff_new_pack.WfrqzH/_new 2010-01-11 16:33:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd (Version 2.5.10) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,20 +19,20 @@ Name: mkinitrd -License: GPL v2 or later +License: GPLv2+ Group: System/Base #!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop BuildRequires: asciidoc libxslt Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: 2.5.10 -Release: 5 +Release: 6 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 -Patch0: mkinitrd-include_firmware.patch +Url: http://git.opensuse.org/?p=projects/mkinitrd.git %description Mkinitrd creates file system images for use as initial RAM disk @@ -62,7 +62,6 @@ %prep %setup -%patch0 %build gcc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/lib/mkinitrd/bin/ipconfig.sh new/mkinitrd-2.5.10/lib/mkinitrd/bin/ipconfig.sh --- old/mkinitrd-2.5.10/lib/mkinitrd/bin/ipconfig.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/lib/mkinitrd/bin/ipconfig.sh 2009-12-17 12:59:57.000000000 +0100 @@ -1,5 +1,5 @@ #!/bin/bash -# +# # <client-ip>:<server-ip>:<gw-ip>:<netmask>:<hostname>:<device>:<autoconf> # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc new/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc --- old/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/lib/mkinitrd/bin/linuxrc 2009-12-17 12:59:57.000000000 +0100 @@ -2,7 +2,7 @@ ################################################## # add_module_param $kernelmodule $value -# remembers parameters for the given kernel module +# remembers parameters for the given kernel module # e.g. add_module_param rtl8193too debug=1 ################################################## add_module_param() { @@ -10,15 +10,50 @@ } ################################################## +# mod_opt $kernelmodule +# get module parameter from kernel command line +################################################## +mod_opt() +{ + local module=$1 + local name=${module%%.ko} + local param + + test -e /proc/cmdline || return 1 + + name=$(eval echo $name | sed "s/[-_]/\*/g") + for i in `cat /proc/cmdline` + do + case $i in + ${name}.*=*) + param="${param}${param:+ }${i##${name}.}" + ;; + esac + done + echo $param +} + +################################################## # load_modules -# loads all kernelmodules that belong to the +# loads all kernelmodules that belong to the # current init module # this is also done automatically when the # init module is done # e.g. load_modules ################################################## load_modules() { - for file in $(eval echo $modules); do + local option + local i + for file in $(eval echo $modules) + do + options=$(mod_opt $file) + if [ "n" != "n$options" ] + then + for i in $options + do + add_module_param ${file%%.ko} $i + done + fi modprobe $file done modules="" @@ -68,7 +103,7 @@ # run the module [ "$debug" ] && echo "running $file" source $file - + # if the module did not load its modules, we do [ "$modules" ] && load_modules done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.changes new/mkinitrd-2.5.10/mkinitrd.changes --- old/mkinitrd-2.5.10/mkinitrd.changes 2009-10-21 16:20:57.000000000 +0200 +++ new/mkinitrd-2.5.10/mkinitrd.changes 2009-12-17 12:59:57.000000000 +0100 @@ -1,4 +1,58 @@ ------------------------------------------------------------------- +Thu Dec 17 12:54:44 CET 2009 - mvancura@suse.cz + +- Change handling of upper<>lower case matching for SLE-11. +- Add KMS support. + +------------------------------------------------------------------- +Tue Dec 15 14:32:24 CET 2009 - mvancura@suse.cz + +- don't run fsck if on batteries (bnc#521419) + +------------------------------------------------------------------- +Mon Dec 14 16:10:50 CET 2009 - mvancura@suse.cz + +- set number of inodes in /dev to unlimited (bnc#529839) + +------------------------------------------------------------------- +Mon Nov 23 15:13:01 CET 2009 - mvancura@suse.cz + +- store the git repo URL in the package metadata + +------------------------------------------------------------------- +Fri Oct 30 14:39:03 CET 2009 - mmarek@suse.cz + +- restart mdmon before switching to the new root (fate#306823). + +------------------------------------------------------------------- +Thu Oct 22 16:54:45 CEST 2009 - ro@suse.de + +- add any required firmware to the initrd + +------------------------------------------------------------------- +Fri Aug 21 16:26:00 CEST 2009 - mmarek@suse.cz + +- sbin/module_upgrade: update to new modprobe config layout + (bnc#532069). + +------------------------------------------------------------------- +Thu Oct 22 16:13:21 CEST 2009 - mmarek@suse.cz + +- Add support for compressed modules (bnc#458525) + +------------------------------------------------------------------- +Thu Oct 22 14:34:46 CEST 2009 - mvancura@suse.cz + +- scripts/setup-blockpartition.sh: fix sed regexp converting a + partition device name to the disk name (bnc#531663) + +------------------------------------------------------------------- +Wed Oct 28 00:35:44 CET 2009 - ro@suse.de + +- remove hack for qlogic and aix and use modinfo -F firmware to + find out and copy if a module requires firmware files + +------------------------------------------------------------------- Fri Oct 16 11:46:11 UTC 2009 - aj@suse.de - Fix scripts/boot-remount.sh syntax. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/mkinitrd.spec new/mkinitrd-2.5.10/mkinitrd.spec --- old/mkinitrd-2.5.10/mkinitrd.spec 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/mkinitrd.spec 2009-12-14 16:57:08.000000000 +0100 @@ -1,10 +1,17 @@ # -# spec file for package mkinitrd (Version 2.4) +# spec file for package mkinitrd (Version 2.5.10) # -# 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. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -19,12 +26,13 @@ Requires: coreutils modutils util-linux grep gzip sed cpio udev sysvinit file perl-Bootloader AutoReqProv: on Version: @@VERSION@@ -Release: 1 +Release: 3 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd.tar.bz2 +Url: http://git.opensuse.org/?p=projects/mkinitrd.git %description Mkinitrd creates file system images for use as initial RAM disk @@ -118,4 +126,3 @@ %doc %{_mandir}/man8/lsinitrd.8.gz %changelog - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/sbin/installkernel new/mkinitrd-2.5.10/sbin/installkernel --- old/mkinitrd-2.5.10/sbin/installkernel 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/sbin/installkernel 2009-12-17 12:59:57.000000000 +0100 @@ -53,7 +53,7 @@ if [ -f $INSTALL_PATH/System.map-$KERNEL_VERSION ]; then mv $INSTALL_PATH/System.map-$KERNEL_VERSION \ - $INSTALL_PATH/System.map-$KERNEL_VERSION.old; + $INSTALL_PATH/System.map-$KERNEL_VERSION.old; fi # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/sbin/module_upgrade new/mkinitrd-2.5.10/sbin/module_upgrade --- old/mkinitrd-2.5.10/sbin/module_upgrade 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/sbin/module_upgrade 2009-12-14 16:57:08.000000000 +0100 @@ -82,7 +82,7 @@ return script $rename, ['MODULE'], $_; } -# A file sourced by modprobe (/etc/modprobe.conf and friends). +# A file sourced by modprobe sub modprobe_conf($) { if (/^(\s*alias\s+\S+\s+)(\S+)(.*)/ && exists $rename->{$2}) { @@ -95,17 +95,11 @@ my $errors = 0; -# Update all modprobe.conf files +# Update local modprobe config eval { - update_file \&modprobe_conf, '/etc/modprobe.conf'; -}; -if ($@) { - warn $@; - $errors++; -} - -eval { - update_file \&modprobe_conf, '/etc/modprobe.conf.local'; + if (-e '/etc/modprobe.d/99-local.conf') { + update_file \&modprobe_conf, '/etc/modprobe.d/99-local.conf'; + } }; if ($@) { warn $@; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-boot.sh new/mkinitrd-2.5.10/scripts/boot-boot.sh --- old/mkinitrd-2.5.10/scripts/boot-boot.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/boot-boot.sh 2009-12-14 16:57:08.000000000 +0100 @@ -29,6 +29,12 @@ ROOTFS_BLKDEV="$rootdev" export ROOTFS_BLKDEV +# restart mdmon in the new root (exits silently if there are no arrays with +# external metadata) +if test -x /sbin/mdmon; then + /sbin/mdmon /proc/mdstat /root +fi + exec /bin/run-init -c ./dev/console /root $init ${kernel_cmdline[@]} echo could not exec run-init! die 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-clock.sh new/mkinitrd-2.5.10/scripts/boot-clock.sh --- old/mkinitrd-2.5.10/scripts/boot-clock.sh 2009-09-17 13:35:59.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/boot-clock.sh 2009-12-17 12:59:57.000000000 +0100 @@ -10,6 +10,6 @@ . /etc/sysconfig/clock case "$HWCLOCK" in *-l*) /bin/warpclock - > /dev/shm/warpclock + > /dev/shm/warpclock esac fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-mount.sh new/mkinitrd-2.5.10/scripts/boot-mount.sh --- old/mkinitrd-2.5.10/scripts/boot-mount.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/boot-mount.sh 2009-12-17 12:59:57.000000000 +0100 @@ -3,7 +3,7 @@ #%stage: filesystem #%depends: resume # -#%programs: /sbin/fsck $rootfsck +#%programs: /sbin/fsck $rootfsck /bin/on_ac_power #%if: ! "$root_already_mounted" #%dontshow # @@ -88,6 +88,9 @@ echo "invalid root filesystem -- exiting to /bin/sh" cd / PATH=$PATH PS1='$ ' /bin/sh -i +# skip fsck if running on battery +elif [ -x /bin/on_ac_power ] && ! /bin/on_ac_power -q ; then + echo skipping fsck because running on batteries # don't run fsck in the kdump kernel elif [ -x "$rootfsck" ] && ! [ -s /proc/vmcore ] ; then # fsck is unhappy without it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/boot-start.sh new/mkinitrd-2.5.10/scripts/boot-start.sh --- old/mkinitrd-2.5.10/scripts/boot-start.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/boot-start.sh 2009-12-14 16:57:08.000000000 +0100 @@ -33,7 +33,7 @@ mount -t proc proc /proc mount -t sysfs sysfs /sys -mount -t tmpfs -o mode=0755 udev /dev +mount -t tmpfs -o mode=0755,nr_inodes=0 udev /dev mknod -m 0666 /dev/tty c 5 0 mknod -m 0600 /dev/console c 5 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-block.sh new/mkinitrd-2.5.10/scripts/setup-block.sh --- old/mkinitrd-2.5.10/scripts/setup-block.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-block.sh 2009-12-14 16:57:08.000000000 +0100 @@ -153,7 +153,8 @@ if [ "$create_monster_initrd" ]; then for d in $root_dir/lib/modules/$kernel_version/kernel/drivers/{ata,ide,scsi,s390/block,s390/scsi}; do if [ -d "$d" ]; then - for i in $(find "$d" -name "*.ko"); do + for i in $(find "$d" -name "*.ko" -o -name "*.ko.gz"); do + i="${i%*.gz}" i=${i%*.ko} block_modules="$block_modules ${i##*/}" done @@ -181,7 +182,8 @@ # but do that only once if [ "$all_libata_modules_included" -eq 0 ] ; then - for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/ata -name "*.ko"); do + for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/ata -name "*.ko" -o -name "*.ko.gz"); do + i="${i%*.gz}" i=${i%*.ko} block_modules="$block_modules ${i##*/}" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-blockpartition.sh new/mkinitrd-2.5.10/scripts/setup-blockpartition.sh --- old/mkinitrd-2.5.10/scripts/setup-blockpartition.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-blockpartition.sh 2009-12-14 16:57:08.000000000 +0100 @@ -12,7 +12,7 @@ # are partitionable if [ "$blkpart" ]; then blkpart=$(echo ${blkpart#/dev/} | sed 's./.!.g') - blkdev=$(echo $blkpart | sed 's/\([a-z]\)[0-9]*$/\1/;s/p$//') + blkdev=$(echo $blkpart | sed -r '/[0-9][a-z][0-9]+$/{s/p[0-9]+$//;b};s/[0-9]+$//') if [ -d /sys/block/$blkdev/$blkpart ] ; then blkdev=$(echo $blkdev | sed 's.!./.g') bd="/dev/$blkdev" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-modules.sh new/mkinitrd-2.5.10/scripts/setup-modules.sh --- old/mkinitrd-2.5.10/scripts/setup-modules.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-modules.sh 2009-12-14 16:57:08.000000000 +0100 @@ -287,6 +287,7 @@ fi for module in "$@"; do + module="${module%.gz}" module=${module%.o} # strip trailing ".o" just in case. module=${module%.ko} # strip trailing ".ko" just in case. @@ -351,6 +352,14 @@ fi done +# iscsi_ibft module is listed in the $INITRD_PATH/boot/*iscsi.sh script +# but is not valid on some archs. There should be a better way to handle +# this, but just remove it on such archs for now. +if [ ! -d /sys/firmware/ibft -a "${modules//iscsi_ibft/}" != "$modules" ] ; then + modules=${modules//iscsi_ibft/} + verbose "[MODULES]\tiscsi_ibft not present on this architecture, deleted from the list" +fi + # parsing of '# SUSE INITRD' lines load_additional_dependencies resolved_modules="$(resolve_modules $kernel_version $modules)" @@ -376,6 +385,7 @@ echo -ne "Kernel Modules:\t" for mod in $resolved_modules ; do modname=${mod##*/} + modname="${modname%.gz}" echo -n "${modname%%.ko} " done echo @@ -392,6 +402,14 @@ rm -rf $tmp_mnt return 1 fi + for fwl in $(modinfo -F firmware $module) ; do + bmod=$(basename $module) + bfwl=$(basename $fwl) + for fw in $(find /lib/firmware -name "$bfwl") ; do + cp -p --parents $fw $tmp_mnt + echo -n "(module $bmod firmware $fw) " + done + done done if [ "$resolved_modules" ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-network.sh new/mkinitrd-2.5.10/scripts/setup-network.sh --- old/mkinitrd-2.5.10/scripts/setup-network.sh 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-network.sh 2009-12-14 16:57:08.000000000 +0100 @@ -188,7 +188,8 @@ if [ "$create_monster_initrd" ]; then # include all network card modules - for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/net -name "*.ko"); do + for i in $(find $root_dir/lib/modules/$kernel_version/kernel/drivers/net -name "*.ko" -o -name "*.ko.gz"); do + i="${i%*.gz}" i=${i%*.ko} drvlink="$drvlink ${i##*/}" done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-prepare.sh new/mkinitrd-2.5.10/scripts/setup-prepare.sh --- old/mkinitrd-2.5.10/scripts/setup-prepare.sh 2009-10-21 16:08:33.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-prepare.sh 2009-12-14 16:57:08.000000000 +0100 @@ -172,11 +172,3 @@ # Store the commandline echo $build_cmdline > $tmp_mnt/mkinitrd.config - -# HBA firmware -mkdir -p $tmp_mnt/lib/firmware -for fw in /lib/firmware/ql*.bin /lib/firmware/aic94xx* ; do - if [ -f "$fw" ] ; then - cp -a $fw $tmp_mnt/lib/firmware - fi -done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/scripts/setup-storage.sh new/mkinitrd-2.5.10/scripts/setup-storage.sh --- old/mkinitrd-2.5.10/scripts/setup-storage.sh 2009-09-17 13:36:30.000000000 +0200 +++ new/mkinitrd-2.5.10/scripts/setup-storage.sh 2009-12-14 16:57:08.000000000 +0100 @@ -194,18 +194,13 @@ local x="$2" local realrootdev="$2" - # root device was already checked and non-existing - # non-root device is not fatal, but may not be - # shown to the following block resolver modules - [ -b "$realrootdev" ] || exit 0 - case "$realrootdev" in LABEL=*|UUID=*) # get real root via fsck hack realrootdev=$(fsck -N "$rootdev" \ | sed -ne '2s/.* \/dev/\/dev/p' \ | sed -e 's/ *//g') - if [ -z "$realrootdev" ] ; then + if [ -z "$realrootdev" -o ! -b "$realrootdev" ] ; then echo "Could not expand $x to real device" >&2 exit 1 fi @@ -219,6 +214,11 @@ ;; esac + # root device was already checked and non-existing + # non-root device is not fatal, but may not be + # shown to the following block resolver modules + [ -b "$realrootdev" ] || exit 0 + [ "$x" != "$realrootdev" ] && x="$x ($realrootdev)" # FIXME: we should really print this to stdout @@ -335,7 +335,7 @@ # Check if we have to load a module for the rootfs type # XXX: This check should happen more generically for all modules -if [ ! "$(find $root_dir/lib/modules/$kernel_version/ -name $rootfstype.ko)" ]; then +if [ ! "$(find $root_dir/lib/modules/$kernel_version/ -name $rootfstype.ko -o -name $rootfstype.ko.gz)" ]; then if grep -q ${rootfstype}_fs_type $map ; then # No need to load a module, since this is compiled in rootfsmod= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.5.10/src/run-init.c new/mkinitrd-2.5.10/src/run-init.c --- old/mkinitrd-2.5.10/src/run-init.c 2009-08-11 11:59:50.000000000 +0200 +++ new/mkinitrd-2.5.10/src/run-init.c 2009-12-17 12:59:57.000000000 +0100 @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- * - * + * * Copyright 2004 H. Peter Anvin - All Rights Reserved * * Permission is hereby granted, free of charge, to any person @@ -10,10 +10,10 @@ * sell copies of the Software, and to permit persons to whom * the Software is furnished to do so, subject to the following * conditions: - * + * * The above copyright notice and this permission notice shall * be included in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -107,7 +107,7 @@ if ( lstat(what, &st) ) return errno; - + if ( !S_ISDIR(st.st_mode) ) return ENOTDIR; @@ -116,21 +116,21 @@ if not, the rmdir() in nuke() will trigger an error. */ return (errno == EACCES) ? 0 : errno; } - + while ( (d = readdir(dir)) ) { /* Skip . and .. */ if ( d->d_name[0] == '.' && (d->d_name[1] == '\0' || (d->d_name[1] == '.' && d->d_name[2] == '\0')) ) continue; - + err = nuke_dirent(len, what, d->d_name, st.st_dev); if ( err ) { closedir(dir); return err; } } - + closedir(dir); return 0; @@ -216,7 +216,7 @@ if ( rst.st_dev == cst.st_dev ) die("current directory on the same filesystem as the root"); - + /* The initramfs should have /init */ if ( stat("/init", &ist) || !S_ISREG(ist.st_mode) ) die("can't find /init on initramfs"); @@ -236,7 +236,7 @@ /* Overmount the root */ if ( mount(".", "/", NULL, MS_MOVE, NULL) ) die("overmounting root"); - + /* chroot, chdir */ if ( chroot(".") || chdir("/") ) die("chroot"); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org