Hello community, here is the log from the commit of package libguestfs for openSUSE:Factory checked in at 2015-08-10 09:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libguestfs (Old) and /work/SRC/openSUSE:Factory/.libguestfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libguestfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libguestfs/libguestfs.changes 2015-05-20 23:57:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libguestfs.new/libguestfs.changes 2015-08-10 09:16:00.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Jul 28 13:53:53 UTC 2015 - [email protected] + +- Make sure gpg-agent isn't blocking unmount operations for + fedora 22+ images. boo#939105 + +------------------------------------------------------------------- +Fri Jul 24 12:33:51 UTC 2015 - [email protected] + +- Add rpmlintrc to surpress binaryinfo-readelf-failed to reduce + build-compare noise + +------------------------------------------------------------------- +Mon Jul 20 07:38:45 UTC 2015 - [email protected] + +- Refresh libguestfs.mkinitrd.1310.patch + +------------------------------------------------------------------- New: ---- libguestfs.rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libguestfs.spec ++++++ --- /var/tmp/diff_new_pack.0EGou6/_old 2015-08-10 09:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.0EGou6/_new 2015-08-10 09:16:02.000000000 +0200 @@ -178,6 +178,7 @@ Patch0: 0000-hotfix.patch Patch1000: 1000-force-virtio_blk-in-old-guest-kernel.patch Source0: %{name}-%{version}.tar.xz +Source1: libguestfs.rpmlintrc Source42: libguestfs.mkinitrd.tar.bz2 Source789653: Pod-Simple-3.23.tar.xz Source10: libguestfs.mkinitrd.boot.sh ++++++ 0000-hotfix.patch ++++++ --- /var/tmp/diff_new_pack.0EGou6/_old 2015-08-10 09:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.0EGou6/_new 2015-08-10 09:16:02.000000000 +0200 @@ -28,13 +28,18 @@ ADD_ARG (argv, i, fs_buf); ADD_ARG (argv, i, NULL); -Index: libguestfs-1.26.9/customize/customize_run.ml +Index: libguestfs-1.26.10/customize/customize_run.ml =================================================================== ---- libguestfs-1.26.9.orig/customize/customize_run.ml -+++ libguestfs-1.26.9/customize/customize_run.ml -@@ -105,8 +105,7 @@ exec >>%s 2>&1 +--- libguestfs-1.26.10.orig/customize/customize_run.ml ++++ libguestfs-1.26.10/customize/customize_run.ml +@@ -103,10 +103,11 @@ exec >>%s 2>&1 + | "urpmi" -> + sprintf "urpmi %s" quoted_args | "yum" -> - sprintf "yum -y install %s" quoted_args +- sprintf "yum -y install %s" quoted_args ++ sprintf " ++ yum -y install %s ++ pkill gpg-agent" quoted_args | "zypper" -> - (* XXX Should we use -n option? *) - sprintf "zypper in %s" quoted_args ++++++ libguestfs.mkinitrd.1310.patch ++++++ --- /var/tmp/diff_new_pack.0EGou6/_old 2015-08-10 09:16:02.000000000 +0200 +++ /var/tmp/diff_new_pack.0EGou6/_new 2015-08-10 09:16:02.000000000 +0200 @@ -8,9 +8,8 @@ =================================================================== --- 1310.orig/mkinitrd/scripts/setup-ibft.sh +++ 1310/mkinitrd/scripts/setup-ibft.sh -@@ -21,22 +21,22 @@ ibft_set_iface() { - interface=$iface - drvlink=$(get_network_module $interface) +@@ -22,22 +22,22 @@ ibft_set_iface() { + drvlink="$drvlink $(get_network_module $interface)" if [ ! "$nettype" -a -e $ibft_nic/dhcp ]; then nettype=dhcp read ibft_dhcp < $ibft_nic/dhcp @@ -22,6 +21,7 @@ } ibft_nic=/sys/firmware/ibft/ethernet0 + ibft_nic2=/sys/firmware/ibft/ethernet1 -ibft_hostname=$(hostname) +ibft_hostname=localhost ++++++ libguestfs.mkinitrd.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/CONTRIBUTING new/mkinitrd-2.8.1/CONTRIBUTING --- old/mkinitrd-2.8.1/CONTRIBUTING 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.8.1/CONTRIBUTING 2015-06-19 10:28:09.000000000 +0200 @@ -0,0 +1,49 @@ + +This project embraces the Developer Certificate of Origin (DCO) for +contributions. This means you must agree to the following prior to submitting +patches, if you agree with this developer certificate you acknowledge this by +adding a Signed-off-by tag to your patch commit log. Every submitted patch +must have this. + +The source for the DCO: + +http://developercertificate.org/ + +----------------------------------------------------------------------- + +Developer Certificate of Origin +Version 1.1 + +Copyright (C) 2004, 2006 The Linux Foundation and its contributors. +660 York Street, Suite 102, +San Francisco, CA 94110 USA + +Everyone is permitted to copy and distribute verbatim copies of this +license document, but changing it is not allowed. + + +Developer's Certificate of Origin 1.1 + +By making a contribution to this project, I certify that: + +(a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + +(b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + +(c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + +(d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including all + personal information I submit with it, including my sign-off) is + maintained indefinitely and may be redistributed consistent with + this project or the open source license(s) involved. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/LICENSE new/mkinitrd-2.8.1/LICENSE --- old/mkinitrd-2.8.1/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.8.1/LICENSE 2015-06-19 10:28:09.000000000 +0200 @@ -0,0 +1,17 @@ +gpl-2.0.txt has the full license. +---------------------------------------- +Copyright (c) 2011-2014 SUSE LINUX Products GmbH, Nuernberg, Germany. + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/gpl-2.0.txt new/mkinitrd-2.8.1/gpl-2.0.txt --- old/mkinitrd-2.8.1/gpl-2.0.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/mkinitrd-2.8.1/gpl-2.0.txt 2015-06-19 10:28:09.000000000 +0200 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/mkinitrd.changes new/mkinitrd-2.8.1/mkinitrd.changes --- old/mkinitrd-2.8.1/mkinitrd.changes 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/mkinitrd.changes 2015-06-19 10:28:09.000000000 +0200 @@ -1,4 +1,49 @@ ------------------------------------------------------------------- +Fri Jun 19 07:49:06 UTC 2015 - [email protected] + +- Start emergency shell if fsck left filesystem errors uncorrected + instead of booting into the system (bnc#873919) +- Handle all fsck exit codes + +------------------------------------------------------------------- +Fri Jan 30 14:46:26 CET 2015 - [email protected] + +- Remove patches which should have been placed into git + fix-purge-kernel-with-git-versioning.patch + mkinitrd-check_for_bcache_block_device.patch + mkinitrd-add_bcache_udev_rule.patch + +------------------------------------------------------------------- +Mon Oct 6 22:35:35 UTC 2014 - [email protected] + +- Added fix-purge-kernel-with-git-versioning.patch: + fix purge-kernels for Tumbleweed and Kernel:xxx repos (boo#820367) + +------------------------------------------------------------------- +Tue Jul 8 16:52:47 UTC 2014 - [email protected] + +- Make booting from bcache devices possible + bnc#880846 + Add mkinitrd-check_for_bcache_block_device.patch + bnc#880845 + Add mkinitrd-add_bcache_udev_rule.patch + +------------------------------------------------------------------- +Tue Jan 14 12:25:42 CET 2014 - [email protected] + +- Add cciss compat rules to mkinitrd (bnc#858663) + +------------------------------------------------------------------- +Thu Dec 19 18:55:23 UTC 2013 - [email protected] + +- Support second ibft iscsi interface (bnc#830968) + +------------------------------------------------------------------- +Fri Nov 29 13:58:34 CET 2013 - [email protected] + +- Wait for multipath devices when MD is active (bnc#848293). + +------------------------------------------------------------------- Tue Oct 29 18:25:41 CET 2013 - [email protected] - Fix code which handles missing or incomplete fstab (bnc#848038) @@ -203,6 +248,11 @@ - Package 61-msft.rules and sg_inq (bnc#805059) ------------------------------------------------------------------- +Mon May 13 19:10:09 UTC 2013 - [email protected] + +- Do not overwrite the drvlink variable (bnc#803760) + +------------------------------------------------------------------- Fri May 10 12:28:01 UTC 2013 - [email protected] - s390x: add support for scm devices (bnc#814540) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/sbin/installkernel new/mkinitrd-2.8.1/sbin/installkernel --- old/mkinitrd-2.8.1/sbin/installkernel 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/sbin/installkernel 2015-06-19 10:28:09.000000000 +0200 @@ -15,6 +15,7 @@ KERNEL_VERSION=$1 BOOTIMAGE=$2 MAPFILE=$3 +CONFIGFILE=config-$KERNEL_VERSION case "$(uname -m)" in s390|s390x) @@ -56,12 +57,19 @@ $INSTALL_PATH/System.map-$KERNEL_VERSION.old; fi + +if [ -f $INSTALL_PATH/$CONFIGFILE ]; then + mv $INSTALL_PATH/$CONFIGFILE \ + $INSTALL_PATH/$CONFIGFILE.old; +fi + # # Install new files # cp -fp $BOOTIMAGE $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION cp -fp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION +cp -fp .config $INSTALL_PATH/$CONFIGFILE KERNTYPES=$(dirname $MAPFILE)/init/kerntypes.o if [ -e $KERNTYPES ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/sbin/purge-kernels new/mkinitrd-2.8.1/sbin/purge-kernels --- old/mkinitrd-2.8.1/sbin/purge-kernels 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/sbin/purge-kernels 2015-06-19 10:28:09.000000000 +0200 @@ -144,11 +144,15 @@ return @versions; } -# return true if VER1 is a prefix of VER2 (to handle the .x rebuild counter) +# return true if VER1 == VER2 or VER1 == (VER2 minus rebuild counter) sub version_match { my ($ver1, $ver2) = @_; - return ($ver1 eq substr($ver2, 0, length($ver1))); + return 1 if $ver1 eq $ver2; + + # copied from kernel-source/rpm/kernel-spec-macros + $ver2 =~ s/\.[0-9]+($|\.[^.]*[^.0-9][^.]*$)/$1/; + return $ver1 eq $ver2; } sub list_old_versions { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-devfunctions.sh new/mkinitrd-2.8.1/scripts/boot-devfunctions.sh --- old/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/boot-devfunctions.sh 2015-06-19 10:28:09.000000000 +0200 @@ -100,6 +100,10 @@ retval=0 break; fi + elif [ -x "$(type -p multipath)" -a -z "$cmd_root_no_mpath" ] ; then + echo -n "!" + multipath -v 0 + wait_for_events fi usleep 25000 ((timeout % 40 == 1)) && echo -n "." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-ibft.sh new/mkinitrd-2.8.1/scripts/boot-ibft.sh --- old/mkinitrd-2.8.1/scripts/boot-ibft.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/boot-ibft.sh 2015-06-19 10:28:09.000000000 +0200 @@ -13,22 +13,24 @@ load_modules ibft_get_att() { - if [ -f $ibft_nic/$1 ]; then - cat $ibft_nic/$1 + local attr=$1 nic=$2 + + if [ -f $nic/$attr ]; then + cat $nic/$attr else echo "" fi } ibft_get_ethdev() { - local iface + local iface nic=$1 - if test -d "$ibft_nic/device/net" ; then - for iface in $ibft_nic/device/net/*/addr_len; do + if test -d "$nic/device/net" ; then + for iface in $nic/device/net/*/addr_len; do break done else - for iface in $ibft_nic/device/*/*/addr_len; do + for iface in $nic/device/*/*/addr_len; do break done fi @@ -51,32 +53,39 @@ done } -if [ -d $ibft_nic ]; then - if [ -s $ibft_nic/dhcp ]; then +setup_ibft_nic() { + local nic=$1 + + if [ -s $nic/dhcp ]; then nettype='dhcp' - read ibft_dhcp < $ibft_nic/dhcp + read ibft_dhcp < $nic/dhcp [ "$ibft_dhcp" = "0.0.0.0" ] && nettype='static' else nettype='static' fi - ipaddr="$(ibft_get_att ip-addr)" + ipaddr="$(ibft_get_att ip-addr $nic)" case "$ipaddr" in *:*) netmask=64 ipaddr="[$ipaddr]" ;; *) - netmask="$(ibft_get_att subnet-mask)" + netmask="$(ibft_get_att subnet-mask $nic)" ;; esac - ip="$ipaddr::$(ibft_get_att gateway):$netmask:$ibft_hostname:$(ibft_get_ethdev):$nettype" + ip="$ipaddr::$(ibft_get_att gateway $nic):$netmask:$ibft_hostname:$(ibft_get_ethdev):$nettype" interface=$(ibft_get_ethdev) - macaddress=$(ibft_get_att mac) - InitiatorName=$(ibft_get_initiatorname) + macaddress=$(ibft_get_att mac $nic) if [ $nettype = 'dhcp' ] ; then dhcp_macaddresses="$interface:$macaddress $dhcp_macaddresses" else static_macaddresses="$interface:$macaddress $static_macaddresses" static_ips="$ip $static_ips" fi +} + +if [ -d $ibft_nic ]; then + setup_ibft_nic $ibft_nic + InitiatorName=$(ibft_get_initiatorname) + [ -d $ibft_nic2 ] && setup_ibft_nic $ibft_nic2 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/boot-mount.sh new/mkinitrd-2.8.1/scripts/boot-mount.sh --- old/mkinitrd-2.8.1/scripts/boot-mount.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/boot-mount.sh 2015-06-19 10:28:09.000000000 +0200 @@ -116,14 +116,29 @@ echo $ROOTFS_FSCK >/run/initramfs/root-fsck ROOTFS_FSTYPE=$rootfstype export ROOTFS_FSTYPE - if [ $ROOTFS_FSCK -gt 1 -a $ROOTFS_FSCK -lt 4 ]; then - # reboot needed - echo "fsck succeeded, but reboot is required." - echo "Rebooting system." - reboot -d -f - elif [ $ROOTFS_FSCK -gt 3 ] ; then - echo "fsck failed. Mounting root device read-only." - read_only=1 + fsck_corrected=$(( $ROOTFS_FSCK & 1 )) + fsck_reboot=$(( $ROOTFS_FSCK & 2 )) + fsck_uncorrected=$(( $ROOTFS_FSCK & 4 )) + fsck_other=$(( $ROOTFS_FSCK & (255 << 3) )) + if [ $ROOTFS_FSCK -gt 1 ]; then + if [ $fsck_other -gt 0 ]; then + echo "fsck reported unhandled exit code: $ROOTFS_FSCK" + echo "Mounting root device read-only." + read_only=1 + fi + if [ $fsck_corrected -gt 0 ]; then + echo "Filesystem errors corrected." + fi + if [ $fsck_reboot -gt 0 ]; then + echo "System should be rebooted." + fi + if [ $fsck_uncorrected -gt 0 ]; then + emergency "Filesystem errors left uncorrected." + fi + if [ $fsck_reboot -gt 0 ]; then + echo "Rebooting system." + reboot -d -f + fi else if [ "$read_only" ]; then echo "fsck succeeded. Mounting root device read-only." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-block.sh new/mkinitrd-2.8.1/scripts/setup-block.sh --- old/mkinitrd-2.8.1/scripts/setup-block.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-block.sh 2015-06-19 10:28:09.000000000 +0200 @@ -157,7 +157,10 @@ scm*) result="scm_block eadm_sch" ;; - *) + bcache*) + result="bcache" + ;; + *) if [ ! -d /sys/block/$blkdev/device ] ; then echo "Device $blkdev not handled" >&2 return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-done.sh new/mkinitrd-2.8.1/scripts/setup-done.sh --- old/mkinitrd-2.8.1/scripts/setup-done.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-done.sh 2015-06-19 10:28:09.000000000 +0200 @@ -4,7 +4,13 @@ #%depends: progs sharedlibs # -COMPRESS="gzip" +# Use parallel compressing tool if installed +if [ -x /usr/bin/pigz ];then + COMPRESS="pigz" +else + COMPRESS="gzip" +fi + if [[ $(uname -m) =~ ppc ]] then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-ibft.sh new/mkinitrd-2.8.1/scripts/setup-ibft.sh --- old/mkinitrd-2.8.1/scripts/setup-ibft.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-ibft.sh 2015-06-19 10:28:09.000000000 +0200 @@ -19,7 +19,7 @@ iface=${iface##*/} if test -n "$iface"; then interface=$iface - drvlink=$(get_network_module $interface) + drvlink="$drvlink $(get_network_module $interface)" if [ ! "$nettype" -a -e $ibft_nic/dhcp ]; then nettype=dhcp read ibft_dhcp < $ibft_nic/dhcp @@ -31,6 +31,7 @@ } ibft_nic=/sys/firmware/ibft/ethernet0 +ibft_nic2=/sys/firmware/ibft/ethernet1 ibft_hostname=$(hostname) if [ "$root_iscsi" = 1 -a -d $ibft_nic ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-network.sh new/mkinitrd-2.8.1/scripts/setup-network.sh --- old/mkinitrd-2.8.1/scripts/setup-network.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-network.sh 2015-06-19 10:28:09.000000000 +0200 @@ -141,7 +141,7 @@ get_network_module() { - local interface=$1 + local interface=$1 drvlink ifpath=$(cd -P /sys/class/net/$interface/device; echo $PWD) if [ -f /sys/class/net/$interface/device/modalias ] ; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mkinitrd-2.8.1/scripts/setup-udev.sh new/mkinitrd-2.8.1/scripts/setup-udev.sh --- old/mkinitrd-2.8.1/scripts/setup-udev.sh 2013-10-29 18:31:03.000000000 +0100 +++ new/mkinitrd-2.8.1/scripts/setup-udev.sh 2015-06-19 10:28:09.000000000 +0200 @@ -21,6 +21,7 @@ accelerometer) continue ;; ata_id) ;; bluetooth_serial) continue ;; + bcache-register) ;; cdrom_id) ;; collect) ;; collect_lvm) ;; @@ -47,6 +48,7 @@ openct_usb) continue ;; pcmcia-check-broken-cis) continue ;; pcmcia-socket-startup) continue ;; + probe-bcache) ;; scsi_id) ;; udev-acl) continue ;; udev-add-printer) continue ;; @@ -79,7 +81,8 @@ 61-msft.rules \ 62-dm_linear.rules \ 64-device-mapper.rules \ - 75-net-description.rules \ + 65-cciss-compat.rules \ + 69-bcache.rules \ 79-kms.rules \ 80-drivers.rules \ 80-net-name-slot.rules \ ++++++ libguestfs.rpmlintrc ++++++ addFilter("binaryinfo-readelf-failed")
