Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2015-11-12 19:36:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-11-08 14:35:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-11-12 19:36:20.000000000 +0100 @@ -1,0 +2,23 @@ +Thu Nov 12 08:52:54 UTC 2015 - fvogt@localhost + +- Add 0301-include_sysconfig_language.patch: + - Include /etc/sysconfig/language instead of forcibly generating + /etc/locale.conf + - Workaround and partial fix for boo#927250 + +------------------------------------------------------------------- +Tue Nov 10 11:26:51 UTC 2015 - [email protected] + +- Add 0205-mdraid_ignore_hostonly.patch: + - Always install mdraid modules (boo#935993) + +------------------------------------------------------------------- +Tue Nov 10 10:35:05 UTC 2015 - [email protected] + +- Modify 0402-driver-fail-summary.patch + - Add notice (bsc#952491) + - Use mktemp instead of hardcoded filenames (bnc#935338) +- Modify 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch + - Use mktemp instead of hardcoded filenames (bnc#935338) + +------------------------------------------------------------------- New: ---- 0205-mdraid_ignore_hostonly.patch 0301-include_sysconfig_language.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.OiLhye/_old 2015-11-12 19:36:23.000000000 +0100 +++ /var/tmp/diff_new_pack.OiLhye/_new 2015-11-12 19:36:23.000000000 +0100 @@ -121,10 +121,13 @@ Patch202: dracut_dmraid_use_udev.patch Patch203: 0203-no-fail-builtin-module.patch Patch204: 0204-mkinitrd-fix-monster.patch +Patch205: 0205-mdraid_ignore_hostonly.patch ## fix for SUSE systems which have dpkg installed anyway Patch300: dracut_dont_use_dpkg_defaults_on_SUSE.patch +Patch301: 0301-include_sysconfig_language.patch +# New features/improvements Patch400: 0400-use_fstab_systemd.patch Patch401: 0401-mount_option_mountpoint.patch Patch402: 0402-driver-fail-summary.patch @@ -267,8 +270,10 @@ %patch202 -p1 %patch203 -p1 %patch204 -p1 +%patch205 -p1 %patch300 -p1 +%patch301 -p1 %patch400 -p1 %patch401 -p1 ++++++ 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch ++++++ --- /var/tmp/diff_new_pack.OiLhye/_old 2015-11-12 19:36:24.000000000 +0100 +++ /var/tmp/diff_new_pack.OiLhye/_new 2015-11-12 19:36:24.000000000 +0100 @@ -46,11 +46,12 @@ =================================================================== --- dracut-042.orig/modules.d/90crypt/module-setup.sh 2015-06-11 17:39:47.000000000 +0200 +++ dracut-042/modules.d/90crypt/module-setup.sh 2015-06-24 18:02:28.882483333 +0200 -@@ -63,6 +63,7 @@ install() { +@@ -63,6 +63,8 @@ install() { inst_hook cleanup 30 "$moddir/crypt-cleanup.sh" fi -+ > /tmp/dracut_block_uuid.map ++ # Have to use exit here, return value gets ignored in dracut.sh... ++ uuid_map_file=$(mktemp /tmp/dracut.XXXXXXXXXX) || exit 1 if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then # filter /etc/crypttab for the devices we need while read _mapper _dev _rest || [ -n "$_mapper" ]; do @@ -58,16 +59,17 @@ [[ $_dev == UUID=* ]] && \ _dev="/dev/disk/by-uuid/${_dev#UUID=}" -+ echo "$_dev $(blkid $_dev -s UUID -o value)" >> /tmp/dracut_block_uuid.map ++ echo "$_dev $(blkid $_dev -s UUID -o value)" >> $uuid_map_file + for _hdev in "${!host_fs_types[@]}"; do [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then -@@ -84,6 +87,7 @@ install() { +@@ -84,6 +87,8 @@ install() { fi inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh" -+ inst_simple "/tmp/dracut_block_uuid.map" "/usr/lib/dracut/modules.d/90crypt/block_uuid.map" ++ inst_simple $uuid_map_file "/usr/lib/dracut/modules.d/90crypt/block_uuid.map" ++ rm -f $uuid_map_file inst_multiple -o \ $systemdutildir/system-generators/systemd-cryptsetup-generator \ ++++++ 0205-mdraid_ignore_hostonly.patch ++++++ From: Fabian Vogt <[email protected]> Subject: [PATCH] Always install mdraid modules References: boo#935993 - Even if not currently loaded - hostonly logic seems to be broken --- modules.d/90mdraid/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: dracut-043/modules.d/90mdraid/module-setup.sh =================================================================== --- dracut-043.orig/modules.d/90mdraid/module-setup.sh +++ dracut-043/modules.d/90mdraid/module-setup.sh @@ -33,7 +33,7 @@ depends() { # called by dracut installkernel() { - instmods =drivers/md + hostonly='' instmods =drivers/md } # called by dracut ++++++ 0301-include_sysconfig_language.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Include /etc/sysconfig/language instead of generating /etc/locale.conf References: boo#927250 - There's a bug in systemd's locale-setup code, ignoring /etc/locale.conf - Work around it by providing /etc/sysconfig/language directly - May be the best way to support ROOT_USES_LANG in the initrd properly anyway, so this patch can be kept even after the original systemd bug is fixed --- modules.d/10i18n/module-setup.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Index: dracut-043/modules.d/10i18n/module-setup.sh =================================================================== --- dracut-043.orig/modules.d/10i18n/module-setup.sh +++ dracut-043/modules.d/10i18n/module-setup.sh @@ -25,6 +25,7 @@ install() { KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}" I18N_CONF="/etc/locale.conf" + I18N_CONF_SUSE="/etc/sysconfig/language" VCONFIG_CONF="/etc/vconsole.conf" # This is from 10redhat-i18n. @@ -211,9 +212,10 @@ install() { if dracut_module_included "systemd" && [[ -f ${I18N_CONF} ]]; then inst_simple ${I18N_CONF} - else - mksubdirs ${initdir}${I18N_CONF} - print_vars LC_ALL LANG >> ${initdir}${I18N_CONF} + fi + + if dracut_module_included "systemd" && [[ -f ${I18N_CONF_SUSE} ]]; then + inst_simple ${I18N_CONF_SUSE} fi if dracut_module_included "systemd" && [[ -f ${VCONFIG_CONF} ]]; then ++++++ 0402-driver-fail-summary.patch ++++++ --- /var/tmp/diff_new_pack.OiLhye/_old 2015-11-12 19:36:24.000000000 +0100 +++ /var/tmp/diff_new_pack.OiLhye/_new 2015-11-12 19:36:24.000000000 +0100 @@ -46,7 +46,7 @@ inst1mod "${_mod%.ko*}" || { if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then - dfatal "Failed to install module $_mod" -+ echo $_mod >> /tmp/dracut_failed_drivers ++ echo $_mod >> $tmp_dracut_failed_drivers fi } done @@ -55,7 +55,7 @@ inst1mod ${1%.ko*} || { if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then - dfatal "Failed to install module $1" -+ echo $1 >> /tmp/dracut_failed_drivers ++ echo $1 >> $tmp_dracut_failed_drivers fi } shift @@ -63,25 +63,31 @@ =================================================================== --- dracut-043.orig/dracut.sh +++ dracut-043/dracut.sh -@@ -420,6 +420,8 @@ verbosity_mod_l=0 +@@ -420,6 +420,12 @@ verbosity_mod_l=0 unset kernel unset outfile -+> /tmp/dracut_failed_drivers ++if ! tmp_dracut_failed_drivers=$(mktemp /tmp/dracut.XXXXXXXXXX); then ++ echo "Could not create temporary file" ++ exit 1 ++fi ++export tmp_dracut_failed_drivers + rearrange_params "$@" eval set -- "$TEMP" -@@ -1789,6 +1791,13 @@ if ! ( +@@ -1789,6 +1795,15 @@ if ! ( fi dinfo "*** Creating initrd image file '$outfile' done ***" -+if [[ -s /tmp/dracut_failed_drivers ]]; then -+ dwarn "Some kernel modules could not be included: " ++if [[ -s $tmp_dracut_failed_drivers ]]; then ++ dwarn "Some kernel modules could not be included" ++ dwarn "This is not necessarily an error:" + while read line; do + dwarn "$line" -+ done < /tmp/dracut_failed_drivers ++ done < $tmp_dracut_failed_drivers +fi ++rm $tmp_dracut_failed_drivers + if (( maxloglvl >= 5 )); then if [[ $allowlocal ]]; then
