Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2014-03-18 16:21:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11 20:31:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-03-18 16:21:46.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Mar 14 19:49:38 UTC 2014 - [email protected] + +- Add support for 70-persistent-net.rules in dracut (bnc#868375) + Add: dracut-install-persistent-rule.patch + +------------------------------------------------------------------- +Fri Mar 14 15:09:37 UTC 2014 - [email protected] + +- CRITICAL: Fix add-drivers passing from mkinitrd to dracut bnc#868397 + +------------------------------------------------------------------- +Wed Mar 12 14:50:50 UTC 2014 - [email protected] + +- Add s390 dcssblk driver and introduce rd.dcssblk= to pass mounts that should + get activated at initrd stage fate#308263 + Add: s390-dcssblk.patch + +------------------------------------------------------------------- New: ---- dracut-install-persistent-rule.patch s390-dcssblk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.aIBKp5/_old 2014-03-18 16:21:48.000000000 +0100 +++ /var/tmp/diff_new_pack.aIBKp5/_new 2014-03-18 16:21:48.000000000 +0100 @@ -47,6 +47,8 @@ Patch20: dracut-fix-whitespace-add-drivers_call.patch Patch21: wait_for_network_race_condition_fix.patch Patch22: dracut-warpclock_module.patch +Patch23: s390-dcssblk.patch +Patch24: dracut-install-persistent-rule.patch BuildRequires: asciidoc BuildRequires: bash BuildRequires: docbook-xsl-stylesheets @@ -98,6 +100,8 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 +%patch24 -p1 %build %configure\ @@ -264,6 +268,7 @@ %{dracutlibdir}/modules.d/95debug %{dracutlibdir}/modules.d/95resume %{dracutlibdir}/modules.d/95rootfs-block +%{dracutlibdir}/modules.d/95dcssblk %{dracutlibdir}/modules.d/95dasd %{dracutlibdir}/modules.d/95dasd_mod %{dracutlibdir}/modules.d/95dasd_rules ++++++ dracut-fix-whitespace-add-drivers_call.patch ++++++ --- /var/tmp/diff_new_pack.aIBKp5/_old 2014-03-18 16:21:48.000000000 +0100 +++ /var/tmp/diff_new_pack.aIBKp5/_new 2014-03-18 16:21:48.000000000 +0100 @@ -57,7 +57,7 @@ + # -> 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 ++ $dracut_cmd $dracut_args --add-drivers "${modules_all}" "$target" "$kernel" &>/dev/null + else $dracut_cmd $dracut_args "$target" "$kernel" &>/dev/null - fi @@ -71,7 +71,7 @@ - "$kernel" - else + if [ -n "${modules_all}" ];then -+ $dracut_cmd $dracut_args --add-drivers \"${modules_all}\" "$target" "$kernel" ++ $dracut_cmd $dracut_args --add-drivers "${modules_all}" "$target" "$kernel" + else $dracut_cmd $dracut_args "$target" "$kernel" - fi ++++++ dracut-install-persistent-rule.patch ++++++ Index: dracut-036/modules.d/95udev-rules/module-setup.sh =================================================================== --- dracut-036.orig/modules.d/95udev-rules/module-setup.sh +++ dracut-036/modules.d/95udev-rules/module-setup.sh @@ -32,6 +32,7 @@ install() { 60-pcmcia.rules \ 50-udev.rules 95-late.rules \ 50-firmware.rules \ + 70-persistent-net.rules \ 75-net-description.rules 80-net-name-slot.rules \ "$moddir/59-persistent-storage.rules" \ "$moddir/61-persistent-storage.rules" ++++++ s390-dcssblk.patch ++++++ Index: dracut-036/modules.d/95dcssblk/module-setup.sh =================================================================== --- /dev/null +++ dracut-036/modules.d/95dcssblk/module-setup.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh + +# called by dracut +check() { + local _arch=$(uname -m) + [ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1 + return 0 +} + +# called by dracut +installkernel() { + if [ -e /sys/devices/dcssblk/*/block/dcssblk* ];then + hostonly='' instmods dcssblk + fi +} + +# called by dracut +install() { + inst_hook cmdline 30 "$moddir/parse-dcssblk.sh" + # If there is a config file which contains avail (best only of root device) + # disks to activate add it and use it during boot -> then we do not need + # a kernel param anymore + #if [[ $hostonly ]]; then + # inst /etc/dcssblk.conf + #fi +} + Index: dracut-036/modules.d/95dcssblk/parse-dcssblk.sh =================================================================== --- /dev/null +++ dracut-036/modules.d/95dcssblk/parse-dcssblk.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh +dcssblk_arg=$(getarg rd.dcssblk=) +if [ $? == 0 ];then + info "Loading dcssblk segments=$dcssblk_arg" + modprobe dcssblk segments=$dcssblk_arg +fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
