Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-03-01 07:46:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-16 19:47:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-03-01 07:46:58.000000000 +0100 @@ -1,0 +2,36 @@ +Thu Feb 27 14:08:56 UTC 2014 - [email protected] + +- Make sure that --add-drivers is not called with whitespace string which + will lead to a "read line" user input request and things may get stuck at + installation. + - Add: dracut-fix-whitespace-add-drivers_call.patch +- Remove s390 grub module again -> this will go into grub2 package + (ask [email protected] for details) + Delete/remove: s390_add-user-space-grub-rule.patch +- Add installkernel script which installs the kernel when: + make install + is invoked. The script from mkinitrd has been taken over and adopted. + Added source: dracut-installkernel + bnc#862990 + +------------------------------------------------------------------- +Fri Feb 21 14:56:20 UTC 2014 - [email protected] + +- Fix syntax error -> missing then +- Correct path, it is /usr/bin/grub2-emu + +------------------------------------------------------------------- +Mon Feb 17 18:51:58 UTC 2014 - [email protected] + +- autofs4 is always included since mainline git commit: 314929920f27448b45bfd + systemd: ensure autofs4 and ipv6 are included +- Always add network and iscsi dracut module, so that ibft, iscsi, nfsroot + work as expected. + +------------------------------------------------------------------- +Fri Feb 14 14:02:52 UTC 2014 - [email protected] + +- change_write_ifcfg_to_suse.patch: + Detect the system flavor and write the ifcfg files accordingly. + +------------------------------------------------------------------- Old: ---- s390_add-user-space-grub-rule.patch New: ---- change_write_ifcfg_to_suse.patch dracut-fix-whitespace-add-drivers_call.patch dracut-installkernel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.jjHpWD/_old 2014-03-01 07:47:00.000000000 +0100 +++ /var/tmp/diff_new_pack.jjHpWD/_new 2014-03-01 07:47:00.000000000 +0100 @@ -33,6 +33,7 @@ Source3: mkinitrd_setup_dummy Source4: purge-kernels Source5: purge-kernels.service +Source6: dracut-installkernel Patch10: 0006-Install-bin-mount.patch Patch11: 0013-Correct-paths-for-openSUSE.patch Patch12: 0014-Check-for-plymouth-lib-directories.patch @@ -41,8 +42,9 @@ Patch15: replace_dhclient_with_wickedd_dhcp_supplicants.patch Patch16: fix-iscsi-firmware.patch Patch17: remove-iscsiuio.patch -Patch18: s390_add-user-space-grub-rule.patch -Patch19: 0015-add-new-s390x-specific-rule-files.patch +Patch18: 0015-add-new-s390x-specific-rule-files.patch +Patch19: change_write_ifcfg_to_suse.patch +Patch20: dracut-fix-whitespace-add-drivers_call.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -65,9 +67,6 @@ Requires: udev > 166 Requires: util-linux >= 2.21 Requires: xz -%ifarch s390x -Requires: grub2 -%endif Recommends: binutils Recommends: logrotate Obsoletes: mkinitrd < 2.8.2 @@ -123,6 +122,7 @@ %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build %configure\ @@ -164,7 +164,7 @@ touch %{buildroot}%{_localstatedir}/log/dracut.log install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf -echo 'add_drivers+="autofs4"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf +echo 'add_dracutmodules+="network iscsi"' >> %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf %ifarch %ix86 x86_64 echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf @@ -182,7 +182,13 @@ install -D -m 0755 %{SOURCE4} %{buildroot}/sbin/purge-kernels install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/purge-kernels.service -chmod 755 %{buildroot}/%{dracutlibdir}/modules.d/95grub2/* +install -D -m 0755 %{SOURCE6} %{buildroot}/sbin/installkernel + +%if 0%{?suse_version} +ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-suse.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh +%else +ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dracutlibdir}/modules.d/45ifcfg/write-ifcfg.sh +%endif %pre %service_add_pre purge-kernels.service @@ -195,6 +201,7 @@ %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg %{_bindir}/dracut /sbin/purge-kernels +/sbin/installkernel /sbin/mkinitrd /sbin/mkinitrd_setup %{_bindir}/lsinitrd @@ -269,7 +276,6 @@ %{dracutlibdir}/modules.d/95dasd_mod %{dracutlibdir}/modules.d/95dasd_rules %{dracutlibdir}/modules.d/95fstab-sys -%{dracutlibdir}/modules.d/95grub2 %{dracutlibdir}/modules.d/95zfcp %{dracutlibdir}/modules.d/95zfcp_rules %{dracutlibdir}/modules.d/95terminfo ++++++ change_write_ifcfg_to_suse.patch ++++++ ++++ 769 lines (skipped) ++++++ dracut-fix-whitespace-add-drivers_call.patch ++++++ Index: dracut-036/mkinitrd-suse.sh =================================================================== --- dracut-036.orig/mkinitrd-suse.sh +++ dracut-036/mkinitrd-suse.sh @@ -70,10 +70,7 @@ usage () { $cmd " -j device Journal device" $cmd " -D interface Run dhcp on the specified interface." $cmd " -I interface Configure the specified interface statically." - $cmd " -a acpi_dsdt Attach compiled ACPI DSDT (Differentiated" - $cmd " System Description Table) to initrd. This" - $cmd " replaces the DSDT of the BIOS. Defaults to" - $cmd " the ACPI_DSDT variable in /etc/sysconfig/kernel." + $cmd " -a acpi_dsdt Obsolete, do not use." $cmd " -s size Add splash animation and bootscreen to initrd." [[ $1 = '-n' ]] && exit 0 @@ -310,11 +307,10 @@ if [ -f /etc/sysconfig/kernel ] ; then . /etc/sysconfig/kernel fi [[ $module_list ]] || module_list="${INITRD_MODULES}" -basicmodules="$basicmodules ${module_list}" [[ $domu_module_list ]] || domu_module_list="${DOMU_INITRD_MODULES}" -[[ $acpi_dsdt ]] || acpi_dsdt="${ACPI_DSDT}" +shopt -s extglob -echo "Creating: target|kernel|dracut args|basicmodules " +echo "Creating: target|kernel|dracut args " for ((i=0 ; $i<${#targets[@]} ; i++)); do if [[ $img_vers ]];then @@ -324,28 +320,30 @@ for ((i=0 ; $i<${#targets[@]} ; i++)); d fi kernel="${kernels[$i]}" + if is_xen_kernel $kernel $rootfs ; then + modules_all="${module_list} ${domu_module_list}" + else + modules_all="${module_list}" + fi + + # 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 [[ $basicmodules ]]; then - $dracut_cmd $dracut_args --add-drivers "$basicmodules" "$target" \ - "$kernel" &>/dev/null - else - $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null - fi + $dracut_cmd $dracut_args_all "$target" "$kernel" &>/dev/null else - 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" - else - $dracut_cmd $dracut_args "$target" "$kernel" - fi + $dracut_cmd $dracut_args_all "$target" "$kernel" fi done ++++++ dracut-installkernel ++++++ #! /bin/sh # # /sbin/installkernel - written by [email protected] # # May 21, 2003 - [email protected] # * Adapted for SuSE and cleaned up. # # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/installkernel,v $ # $Revision: 1.8 $ # : ${INSTALL_PATH:=/boot} KERNEL_VERSION=$1 BOOTIMAGE=$2 MAPFILE=$3 case "$(uname -m)" in s390|s390x) BOOTFILE=image ;; ppc|ppc64) BOOTFILE=vmlinux ;; *) BOOTFILE=vmlinuz ;; esac # # Move away files from versions up to SuSE Linux 8.2 # if [ -f $INSTALL_PATH/$BOOTFILE -a ! -L $INSTALL_PATH/$BOOTFILE ]; then mv $INSTALL_PATH/$BOOTFILE $INSTALL_PATH/$BOOTFILE.old fi if [ -L $INSTALL_PATH/System.map ]; then rm -f $INSTALL_PATH/System.map elif [ -f $INSTALLPATH/System.map ]; then mv $INSTALL_PATH/System.map $INSTALL_PATH/System.map.old fi # # Move away files from after SuSE Linux 8.2 # if [ -f $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION ]; then mv $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION \ $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION.old; fi if [ -f $INSTALL_PATH/System.map-$KERNEL_VERSION ]; then mv $INSTALL_PATH/System.map-$KERNEL_VERSION \ $INSTALL_PATH/System.map-$KERNEL_VERSION.old; fi # # Install new files # cp -fp $BOOTIMAGE $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION cp -fp $MAPFILE $INSTALL_PATH/System.map-$KERNEL_VERSION KERNTYPES=$(dirname $MAPFILE)/init/kerntypes.o if [ -e $KERNTYPES ]; then cp -fp $KERNTYPES $INSTALL_PATH/Kerntypes-$KERNEL_VERSION fi case "$(uname -m)" in i?86 | x86_64) KERNBIN=$(dirname $MAPFILE)/vmlinux if [ -e $KERNBIN ]; then if [ -f $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz ]; then mv $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz \ $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz.old; fi gzip -c $KERNBIN > $INSTALL_PATH/vmlinux-$KERNEL_VERSION.gz fi ;; esac if [ ! -d /lib/modules/$KERNEL_VERSION ];then make modules_install fi # # Generate initial ramdisk # if [ -x /usr/bin/dracut -a -d /lib/modules/$KERNEL_VERSION ]; then /usr/bin/dracut --hostonly --force $INSTALL_PATH/initrd-$KERNEL_VERSION else echo "You may need to create an initial ramdisk now." fi # # Update boot loader # if [ -x /sbin/update-bootloader ]; then opt_initrd= [ -e $INSTALL_PATH/initrd-$KERNEL_VERSION ] \ && opt_initrd="--initrd $INSTALL_PATH/initrd-$KERNEL_VERSION" /sbin/update-bootloader --name $KERNEL_VERSION \ --image $INSTALL_PATH/$BOOTFILE-$KERNEL_VERSION \ $opt_initrd --add --force fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
