Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at Thu May 5 10:28:01 CEST 2011.
-------- --- mkinitrd/mkinitrd.changes 2011-03-29 23:42:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2011-05-04 16:55:26.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 4 14:42:49 UTC 2011 - [email protected] + +- Do not hardcode the xenblk driver, use the xen:vbd alias instead + (bnc#558278). + +------------------------------------------------------------------- +Wed May 4 14:32:00 UTC 2011 - [email protected] + +- Fix typo in boot-devfunctions.sh (bnc#642011). + +------------------------------------------------------------------- +Tue Apr 26 19:46:08 UTC 2011 - [email protected] + +- Move lsinitrd to /bin (feature#312272). + +------------------------------------------------------------------- @@ -30,0 +47,5 @@ + +------------------------------------------------------------------- +Tue Jul 20 22:32:08 CEST 2010 - [email protected] + +- setup-block.sh: Map /dev/VxDMP* to vxdmp.ko (bnc#623776) calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.levYDN/_old 2011-05-05 10:06:08.000000000 +0200 +++ /var/tmp/diff_new_pack.levYDN/_new 2011-05-05 10:06:08.000000000 +0200 @@ -31,7 +31,7 @@ %endif AutoReqProv: on Version: 2.7.0 -Release: 1 +Release: 5 Conflicts: udev < 118 Requires: dhcpcd Summary: Creates an Initial RAM Disk Image for Preloading Modules @@ -121,9 +121,9 @@ %config /etc/rpm/macros.mkinitrd /lib/mkinitrd/scripts/*.sh /lib/mkinitrd/bin/* +/bin/lsinitrd /sbin/mkinitrd /sbin/mkinitrd_setup -/sbin/lsinitrd /sbin/module_upgrade /sbin/installkernel %doc %{_mandir}/man5/mkinitrd.5.gz ++++++ mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/hotplug.sh new/mkinitrd-2.7.0/hotplug.sh --- old/mkinitrd-2.7.0/hotplug.sh 2011-03-29 23:38:07.000000000 +0200 +++ new/mkinitrd-2.7.0/hotplug.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -#!/bin/sh -# -# /sbin/hotplug.sh -# $Id: hotplug.sh,v 1.1 2005/01/20 10:38:11 hare Exp $ -# -# Simple hotplug script for initramfs -# Records all events if requested and starts up udev -# - -# Records all events if requested -if [ -d /events -a -x /sbin/hotplugeventrecorder ] ; then - /sbin/hotplugeventrecorder $1 2>/dev/null -fi - -AGENT=/sbin/udev - -if [ -x $AGENT ]; then - exec $AGENT $@ - echo "couldn't exec $AGENT" -fi - -exit 1 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 2011-03-29 23:38:07.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.changes 2011-05-04 16:52:07.000000000 +0200 @@ -1,4 +1,20 @@ ------------------------------------------------------------------- +Wed May 4 14:42:49 UTC 2011 - [email protected] + +- Do not hardcode the xenblk driver, use the xen:vbd alias instead + (bnc#558278). + +------------------------------------------------------------------- +Wed May 4 14:32:00 UTC 2011 - [email protected] + +- Fix typo in boot-devfunctions.sh (bnc#642011). + +------------------------------------------------------------------- +Tue Apr 26 19:46:08 UTC 2011 - [email protected] + +- Move lsinitrd to /bin (feature#312272). + +------------------------------------------------------------------- Tue Mar 29 21:37:28 UTC 2011 - [email protected] - Change from /dev/.run to /run (bnc#678270#c2). @@ -30,6 +46,11 @@ - setup-modules.sh: Cleanup. ------------------------------------------------------------------- +Tue Jul 20 22:32:08 CEST 2010 - [email protected] + +- setup-block.sh: Map /dev/VxDMP* to vxdmp.ko (bnc#623776) + +------------------------------------------------------------------- Fri Jul 9 15:09:56 CEST 2010 - [email protected] - handle /sbin/init being a symlink (bnc#621147). 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 2011-03-29 23:38:07.000000000 +0200 +++ new/mkinitrd-2.7.0/mkinitrd.spec 2011-05-04 16:52:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mkinitrd (Version 2.5.10) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -121,9 +121,9 @@ %config /etc/rpm/macros.mkinitrd /lib/mkinitrd/scripts/*.sh /lib/mkinitrd/bin/* +/bin/lsinitrd /sbin/mkinitrd /sbin/mkinitrd_setup -/sbin/lsinitrd /sbin/module_upgrade /sbin/installkernel %doc %{_mandir}/man5/mkinitrd.5.gz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/sbin/Makefile new/mkinitrd-2.7.0/sbin/Makefile --- old/mkinitrd-2.7.0/sbin/Makefile 2011-03-29 23:38:07.000000000 +0200 +++ new/mkinitrd-2.7.0/sbin/Makefile 2011-05-04 16:52:07.000000000 +0200 @@ -3,10 +3,17 @@ # sbindir = /sbin +bindir = /bin -PRGS = mkinitrd installkernel module_upgrade mkinitrd_setup lsinitrd +PRGS = mkinitrd installkernel module_upgrade mkinitrd_setup +UPRGS = lsinitrd all: install +install: install_prgs install_uprgs -install: $(PRGS) +install_prgs: $(PRGS) install -d $(DESTDIR)$(sbindir) install -m 755 $^ $(DESTDIR)$(sbindir) + +install_uprgs: $(UPRGS) + install -d $(DESTDIR)$(bindir) + install -m 755 $^ $(DESTDIR)$(bindir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/boot-devfunctions.sh new/mkinitrd-2.7.0/scripts/boot-devfunctions.sh --- old/mkinitrd-2.7.0/scripts/boot-devfunctions.sh 2011-03-29 23:38:07.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/boot-devfunctions.sh 2011-05-04 16:52:07.000000000 +0200 @@ -103,7 +103,7 @@ fi done fi - if [ -x /sbin/multipath ] && [ -n "vg_root" -a -n "$vg_roots" ] ; then + if [ -x /sbin/multipath ] && [ -n "$vg_root" -a -n "$vg_roots" ] ; then echo "Resetting LVM for multipath" vgchange -a n multipath -v 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.7.0/scripts/setup-block.sh new/mkinitrd-2.7.0/scripts/setup-block.sh --- old/mkinitrd-2.7.0/scripts/setup-block.sh 2011-03-29 23:38:07.000000000 +0200 +++ new/mkinitrd-2.7.0/scripts/setup-block.sh 2011-05-04 16:52:07.000000000 +0200 @@ -34,7 +34,7 @@ tgtnum=${devpath##*/} hostnum=${tgtnum%%:*} if [ ${tgtnum%%-*} = "vbd" ] ; then - modules="xenblk" + modules="xen:vbd" else if [ ! -d /sys/class/scsi_host/host$hostnum ] ; then echo "scsi host$hostnum not found" @@ -94,7 +94,7 @@ devpath=$(cd -P "/sys/block/$blkdev/device"; echo $PWD) devname=${devpath##*/} if [ ${devname%%-*} = "vbd" ] ; then - result=xenblk + result=xen:vbd else devpath=$(cd -P "$devpath/../.."; echo $PWD) if [ -f "$devpath/modalias" ] ; then @@ -110,7 +110,7 @@ result="i2o_block i2o_config" ;; xvd*) - result=xenblk + result=xen:vbd ;; rd*) result=DAC960 @@ -118,6 +118,9 @@ ida*) result=cpqarray ;; + VxDMP*) + result=vxdmp + ;; loop*) echo "[BLOCK] WARNING: Loop device detected. Include the required drivers manually." >&2 ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
