Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-03-05 15:36:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2014-03-01 07:46:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-03-05 15:36:49.000000000 +0100 @@ -1,0 +2,17 @@ +Mon Mar 3 16:51:30 UTC 2014 - [email protected] + +- Merge all dracut-* packages to one dracut.rpm package. + Subpackages only had one or two minor files not worth splitting a package + or dracut-network had important modules which should (like former main + dracut package) always get installed +- libcap does not exist and libcap2 or friends are not needed + -> remove Requires: libcap +- Reorder (sort) the files section a bit + +------------------------------------------------------------------- +Mon Mar 3 16:30:48 UTC 2014 - [email protected] + +- Fix bug introduced with last commit: Bad whitespace logic when + INITRD_MODULES contain more than one module. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.3Ag8Ke/_old 2014-03-05 15:36:50.000000000 +0100 +++ /var/tmp/diff_new_pack.3Ag8Ke/_new 2014-03-05 15:36:50.000000000 +0100 @@ -81,35 +81,6 @@ event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as NFS, iSCSI, NBD, FCoE with the dracut-network package. -%package network -Summary: Dracut modules to build a dracut initramfs with network support -Group: System/Base -Requires: %{name} = %{version} -Obsoletes: dracut-generic < 008 -Provides: dracut-generic = %{version} - -%description network -This package requires everything which is needed to build a generic -all purpose initramfs with network support with dracut. - -%package caps -Summary: Dracut modules to build a dracut initramfs which drops capabilities -Group: System/Base -Requires: %{name} = %{version} -Requires: libcap - -%description caps -This package requires everything which is needed to build an -all purpose initramfs with dracut, which drops capabilities. - -%package tools -Summary: Dracut tools to build the local initramfs -Group: System/Base -Requires: %{name} = %{version} - -%description tools -This package contains tools to assemble the local initrd and host configuration. - %prep %setup -q %patch10 -p1 @@ -200,11 +171,12 @@ %defattr(-,root,root,0755) %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg %{_bindir}/dracut +%{_bindir}/dracut-catimages +%{_bindir}/lsinitrd /sbin/purge-kernels /sbin/installkernel /sbin/mkinitrd /sbin/mkinitrd_setup -%{_bindir}/lsinitrd %config %{_sysconfdir}/bash_completion.d/lsinitrd %dir %{dracutlibdir} %dir %{dracutlibdir}/modules.d @@ -239,23 +211,31 @@ %{_mandir}/man8/dracut-pre-mount.service.8.* %{_mandir}/man8/dracut-shutdown.service.8.* %{_mandir}/man5/dracut.conf.5* +%{_mandir}/man8/dracut-catimages.8* %dir %{_libexecdir}/kernel %dir %{_libexecdir}/kernel/install.d %{_libexecdir}/kernel/install.d/50-dracut.install %{_libexecdir}/kernel/install.d/51-dracut-rescue.install %dir %{dracutlibdir}/modules.d/00systemd-bootchart %dir %{dracutlibdir}/modules.d/03rescue +%{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh -%{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/00bootchart +%{dracutlibdir}/modules.d/02caps +%{dracutlibdir}/modules.d/03modsign +%{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/05busybox %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/30convertfs +%{dracutlibdir}/modules.d/40network %{dracutlibdir}/modules.d/45url-lib +%{dracutlibdir}/modules.d/45ifcfg %{dracutlibdir}/modules.d/50drm %{dracutlibdir}/modules.d/50plymouth %{dracutlibdir}/modules.d/80cms +%{dracutlibdir}/modules.d/90livenet +%{dracutlibdir}/modules.d/90qemu-net %{dracutlibdir}/modules.d/90btrfs %{dracutlibdir}/modules.d/90crypt %{dracutlibdir}/modules.d/90dm @@ -268,6 +248,13 @@ %{dracutlibdir}/modules.d/90qemu %{dracutlibdir}/modules.d/91crypt-gpg %{dracutlibdir}/modules.d/91crypt-loop +%{dracutlibdir}/modules.d/95znet +%{dracutlibdir}/modules.d/95fcoe-uefi +%{dracutlibdir}/modules.d/95nbd +%{dracutlibdir}/modules.d/95nfs +%{dracutlibdir}/modules.d/95ssh-client +%{dracutlibdir}/modules.d/95fcoe +%{dracutlibdir}/modules.d/95iscsi %{dracutlibdir}/modules.d/95cifs %{dracutlibdir}/modules.d/95debug %{dracutlibdir}/modules.d/95resume @@ -298,11 +285,7 @@ %{dracutlibdir}/modules.d/99img-lib %{dracutlibdir}/modules.d/99shutdown %{dracutlibdir}/modules.d/99suse -%dir %{dracutlibdir}/modules.d/03modsign -%{dracutlibdir}/modules.d/03modsign/load-modsign-keys.sh -%{dracutlibdir}/modules.d/03modsign/module-setup.sh -%dir %{dracutlibdir}/modules.d/00bash -%{dracutlibdir}/modules.d/00bash/module-setup.sh +%{dracutlibdir}/modules.d/99uefi-lib %config(noreplace) %{_sysconfdir}/logrotate.d/dracut %attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %if %{defined _unitdir} @@ -311,30 +294,6 @@ %{_unitdir}/*/*.service %endif %config %{_sysconfdir}/bash_completion.d/dracut - -%files network -%defattr(-,root,root,0755) -%{dracutlibdir}/modules.d/40network -%{dracutlibdir}/modules.d/95fcoe -%{dracutlibdir}/modules.d/95iscsi -%{dracutlibdir}/modules.d/90livenet -%{dracutlibdir}/modules.d/90qemu-net -%{dracutlibdir}/modules.d/95nbd -%{dracutlibdir}/modules.d/95nfs -%{dracutlibdir}/modules.d/95ssh-client -%{dracutlibdir}/modules.d/45ifcfg -%{dracutlibdir}/modules.d/95znet -%{dracutlibdir}/modules.d/95fcoe-uefi -%{dracutlibdir}/modules.d/99uefi-lib - -%files caps -%defattr(-,root,root,0755) -%{dracutlibdir}/modules.d/02caps - -%files tools -%defattr(-,root,root,0755) -%{_mandir}/man8/dracut-catimages.8* -%{_bindir}/dracut-catimages %dir /boot/dracut %dir %{_localstatedir}/lib/dracut %dir %{_localstatedir}/lib/dracut/overlay ++++++ dracut-fix-whitespace-add-drivers_call.patch ++++++ --- /var/tmp/diff_new_pack.3Ag8Ke/_old 2014-03-05 15:36:50.000000000 +0100 +++ /var/tmp/diff_new_pack.3Ag8Ke/_new 2014-03-05 15:36:50.000000000 +0100 @@ -28,7 +28,7 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); do if [[ $img_vers ]];then -@@ -324,28 +320,30 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d +@@ -324,28 +320,33 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d fi kernel="${kernels[$i]}" @@ -41,26 +41,27 @@ + # Remove leading and trailing spaces needs (set above): shopt -s extglob + modules_all=${modules_all%%+([[:space:]])} + modules_all=${modules_all##+([[:space:]])} -+ if [ -n "${modules_all}" ];then -+ dracut_args_all="$dracut_args --add-drivers \"${modules_all}\"" -+ else -+ dracut_args_all="$dracut_args" -+ fi + # Duplicate code: No way found how to redirect output based on $quiet if [[ $quiet == 1 ]];then - echo "$target|$kernel|$dracut_args|$basicmodules" -+ echo "$target|$kernel|$dracut_args_all" - if is_xen_kernel $kernel $rootfs ; then - basicmodules="$basicmodules ${domu_module_list}" - fi +- if is_xen_kernel $kernel $rootfs ; then +- basicmodules="$basicmodules ${domu_module_list}" +- fi - if [[ $basicmodules ]]; then - $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ - "$kernel" &>/dev/null - else -- $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null ++ echo "$target|$kernel|$dracut_args_all" ++ # Duplicate code: --add-drivers must not be called with empty string ++ # -> dracut bug workarounded ugly, because of complex whitespace ++ # expansion magics ++ if [ -n "${modules_all}" ];then ++ $dracut_cmd $dracut_args --add-drivers \"${modules_all}\" "$target" "$kernel" &>/dev/null ++ else + $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null - fi -+ $dracut_cmd $dracut_args_all "$target" "$kernel" &>/dev/null ++ fi else - if is_xen_kernel $kernel $rootfs ; then - basicmodules="$basicmodules ${domu_module_list}" @@ -69,9 +70,12 @@ - $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ - "$kernel" - else -- $dracut_cmd $dracut_args "$target" "$kernel" ++ if [ -n "${modules_all}" ];then ++ $dracut_cmd $dracut_args --add-drivers \"${modules_all}\" "$target" "$kernel" ++ else + $dracut_cmd $dracut_args "$target" "$kernel" - fi -+ $dracut_cmd $dracut_args_all "$target" "$kernel" ++ fi fi done -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
