Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at 2012-02-03 10:24:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
and /work/SRC/openSUSE:Factory/.mkinitrd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "mma...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2012-01-25
15:02:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-02-03
10:24:34.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Feb 1 16:14:25 UTC 2012 - oher...@suse.de
+
+- Include PV drivers even if running on emulated hardware, to
+ be able to boot when the virtualization setup changes (bnc#710035).
+
+-------------------------------------------------------------------
+Wed Feb 1 10:50:46 UTC 2012 - mma...@suse.cz
+
+- Add support for xz compressed initrd and use it on PPC
+ (bnc#742328).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.spec ++++++
--- /var/tmp/diff_new_pack.geBgec/_old 2012-02-03 10:24:35.000000000 +0100
+++ /var/tmp/diff_new_pack.geBgec/_new 2012-02-03 10:24:35.000000000 +0100
@@ -24,6 +24,7 @@
#!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop
BuildRequires: asciidoc libxslt
Requires: coreutils modutils util-linux grep gzip sed cpio udev file
perl-Bootloader
+Requires: xz
%if 0%{?suse_version} > 1120
Requires: sysvinit-tools sbin_init
%else
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.changes
new/mkinitrd-2.7.0/mkinitrd.changes
--- old/mkinitrd-2.7.0/mkinitrd.changes 2012-01-23 13:57:12.000000000 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.changes 2012-02-01 17:18:20.000000000 +0100
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Wed Feb 1 16:14:25 UTC 2012 - oher...@suse.de
+
+- Include PV drivers even if running on emulated hardware, to
+ be able to boot when the virtualization setup changes (bnc#710035).
+
+-------------------------------------------------------------------
+Wed Feb 1 10:50:46 UTC 2012 - mma...@suse.cz
+
+- Add support for xz compressed initrd and use it on PPC
+ (bnc#742328).
+
+-------------------------------------------------------------------
Fri Jan 20 16:18:20 UTC 2012 - mma...@suse.cz
- Load all scsi_dh_* modules early during boot (bnc#727428).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/mkinitrd.spec
new/mkinitrd-2.7.0/mkinitrd.spec
--- old/mkinitrd-2.7.0/mkinitrd.spec 2012-01-23 13:57:12.000000000 +0100
+++ new/mkinitrd-2.7.0/mkinitrd.spec 2012-02-01 17:18:20.000000000 +0100
@@ -24,6 +24,7 @@
#!BuildIgnore: module-init-tools e2fsprogs udev reiserfs fop
BuildRequires: asciidoc libxslt
Requires: coreutils modutils util-linux grep gzip sed cpio udev file
perl-Bootloader
+Requires: xz
%if 0%{?suse_version} > 1120
Requires: sysvinit-tools sbin_init
%else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/lsinitrd
new/mkinitrd-2.7.0/sbin/lsinitrd
--- old/mkinitrd-2.7.0/sbin/lsinitrd 2012-01-23 13:57:12.000000000 +0100
+++ new/mkinitrd-2.7.0/sbin/lsinitrd 2012-02-01 17:18:20.000000000 +0100
@@ -54,6 +54,17 @@
esac
done
+use_gzip=true
+uncomp()
+{
+ if $use_gzip && gzip -cd "$1" 2>/dev/null; then
+ return
+ fi
+ use_gzip=false
+ xz -cd "$1"
+}
+
+
initrd=$1
if [ -z "$initrd" ] ; then
@@ -70,11 +81,11 @@
if [ "$config" -eq 1 ] ; then
# yes, that's snow, but doesn't use any temporary files :)
- for configfile in $(zcat $initrd | cpio $args --quiet | grep '^config/') ;
do
+ for configfile in $(uncomp $initrd | cpio $args --quiet | grep '^config/')
; do
echo "=========> $configfile <============"
- zcat $initrd | cpio --quiet -i --to-stdout $configfile
+ uncomp $initrd | cpio --quiet -i --to-stdout $configfile
echo
done
else
- zcat $initrd | cpio --quiet $args
+ uncomp $initrd | cpio --quiet $args
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-fv_guest.sh
new/mkinitrd-2.7.0/scripts/boot-fv_guest.sh
--- old/mkinitrd-2.7.0/scripts/boot-fv_guest.sh 1970-01-01 01:00:00.000000000
+0100
+++ new/mkinitrd-2.7.0/scripts/boot-fv_guest.sh 2012-02-01 17:18:20.000000000
+0100
@@ -0,0 +1,5 @@
+#!/bin/bash
+#%stage: boot
+#%modules: $fv_guest_modules
+#%if: -n "$fv_guest_modules"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-done.sh
new/mkinitrd-2.7.0/scripts/setup-done.sh
--- old/mkinitrd-2.7.0/scripts/setup-done.sh 2012-01-23 13:57:12.000000000
+0100
+++ new/mkinitrd-2.7.0/scripts/setup-done.sh 2012-02-01 17:18:20.000000000
+0100
@@ -4,15 +4,21 @@
#%depends: progs sharedlibs
#
+COMPRESS="gzip -9"
+
+if [[ $(uname -m) =~ ppc ]]
+then
+ COMPRESS="xz --check=crc32"
+fi
pushd . > /dev/null 2>&1
cd $tmp_mnt
find bin sbin -type f -print0 | xargs -0 chmod 0755
-if ! find . ! -name "*~" | cpio --quiet -H newc --create | gzip -9 >
$tmp_initrd.gz
+if ! find . ! -name "*~" | cpio --quiet -H newc --create | $COMPRESS >
$tmp_initrd
then
oops 8 "Failed to build initrd"
fi
popd > /dev/null 2>&1
-if ! cp -f $tmp_initrd.gz $initrd_image ; then
+if ! cp -f $tmp_initrd $initrd_image ; then
oops 8 "Failed to install initrd"
fi
rm -rf $tmp_mnt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-fv_guest.sh
new/mkinitrd-2.7.0/scripts/setup-fv_guest.sh
--- old/mkinitrd-2.7.0/scripts/setup-fv_guest.sh 1970-01-01
01:00:00.000000000 +0100
+++ new/mkinitrd-2.7.0/scripts/setup-fv_guest.sh 2012-02-01
17:18:20.000000000 +0100
@@ -0,0 +1,49 @@
+#!/bin/bash
+#
+#%stage: setup
+#
+# Include paravirtualized drivers for fully virtualized guests even if
+# the guest is currently booted with emulated hardware.
+#
+
+check_hyperv_guest() {
+ local board_vendor
+ local product_name
+ local dmi=/sys/class/dmi/id
+ if test -r "${dmi}/board_vendor" -a -r "${dmi}/product_name"
+ then
+ read board_vendor < "${dmi}/board_vendor"
+ read product_name < "${dmi}/product_name"
+ if test "${product_name}" = "Virtual Machine" -a "${board_vendor}" =
"Microsoft Corporation"
+ then
+ return 0
+ fi
+ fi
+ return 1
+}
+
+check_xen_PVonHVM() {
+ local product_name
+ local sys_vendor
+ local dmi=/sys/class/dmi/id
+ if test -r "${dmi}/product_name" -a -r "${dmi}/sys_vendor"
+ then
+ read product_name < "${dmi}/product_name"
+ read sys_vendor < "${dmi}/sys_vendor"
+ if test "${sys_vendor}" = "Xen" -a "${product_name}" = "HVM domU"
+ then
+ return 0
+ fi
+ fi
+ return 1
+}
+
+if check_hyperv_guest ; then
+ fv_guest_modules="hv_storvsc hv_netvsc"
+elif check_xen_PVonHVM ; then
+ # Use aliases because the module names differ in xenlinux and pv_ops kernel:
+ # xen:vbd xen-vbd xen-blkfront
+ # xen:vif xen-vnif xen-netfront
+ fv_guest_modules="xen:vbd xen:vif"
+fi
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
