Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-02-16 19:47:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11
10:27:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-02-16
19:47:31.000000000 +0100
@@ -1,0 +2,54 @@
+Fri Feb 14 13:10:28 UTC 2014 - tr...@suse.de
+
+Originally by Hannes Reinecke (h...@suse.de):
+- Install new s390x specific udev rules (bnc#856585)
+ - Add: 0015-add-new-s390x-specific-rule-files.patch
+- Do not check for non-existing dasd_configure for s390x (bnc#856585)
+
+-------------------------------------------------------------------
+Thu Feb 13 21:38:38 UTC 2014 - jjo...@suse.com
+
+- Added 95grub2 module for s390x
+
+-------------------------------------------------------------------
+Thu Feb 13 14:10:16 UTC 2014 - pwieczorkiew...@suse.com
+
+- remove-iscsiuio.patch:
+ Remove iscsiuio references as this one is not present in SLE-12.
+
+-------------------------------------------------------------------
+Thu Feb 13 14:10:08 UTC 2014 - pwieczorkiew...@suse.com
+
+- fix-iscsi-firmware.patch:
+ Fix iSCSI iBFT boot up problem introduced with mainline changes
+
+-------------------------------------------------------------------
+Thu Feb 13 14:09:55 UTC 2014 - pwieczorkiew...@suse.com
+
+- replace_dhclient_with_wickedd_dhcp_supplicants.patch:
+ Replace dhclient with wickedd-dhcp4 and wickedd-dhcp6. Script up dhcp
+ functionality in ifup.sh.
+
+-------------------------------------------------------------------
+Thu Feb 13 06:28:01 UTC 2014 - sfal...@opensuse.org
+
+-Added bug number to previous changelog entry
+
+-------------------------------------------------------------------
+Thu Feb 13 05:40:32 UTC 2014 - sfal...@opensuse.org
+
+-Updated suse_grub_manpage.patch to further correct for incorrect grub
configuration paths
+ bnc#858448
+-------------------------------------------------------------------
+Wed Feb 12 21:42:55 UTC 2014 - sfal...@opensuse.org
+
+-Updated suse_grub_manpage.patch for dracut-036
+
+-------------------------------------------------------------------
+Wed Feb 12 12:48:16 UTC 2014 - sfal...@opensuse.org
+
+-Added patch to fix manpage to reflect openSUSE GRUB Legacy and GRUB2
+
+- removed patches:
+ * dracut_git_v034_to_head.patch
+-------------------------------------------------------------------
New:
----
0015-add-new-s390x-specific-rule-files.patch
fix-iscsi-firmware.patch
remove-iscsiuio.patch
replace_dhclient_with_wickedd_dhcp_supplicants.patch
s390_add-user-space-grub-rule.patch
suse_grub_manpage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.pw6uMW/_old 2014-02-16 19:47:32.000000000 +0100
+++ /var/tmp/diff_new_pack.pw6uMW/_new 2014-02-16 19:47:32.000000000 +0100
@@ -17,6 +17,7 @@
%define dracutlibdir %{_libexecdir}/dracut
+
Name: dracut
Version: 036
Release: 0
@@ -36,6 +37,12 @@
Patch11: 0013-Correct-paths-for-openSUSE.patch
Patch12: 0014-Check-for-plymouth-lib-directories.patch
Patch13: dracut_do_not_update_booloader_if_no_kernel_is_found.patch
+Patch14: suse_grub_manpage.patch
+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
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@@ -58,6 +65,9 @@
Requires: udev > 166
Requires: util-linux >= 2.21
Requires: xz
+%ifarch s390x
+Requires: grub2
+%endif
Recommends: binutils
Recommends: logrotate
Obsoletes: mkinitrd < 2.8.2
@@ -107,6 +117,12 @@
%patch11 -p1
%patch12 -p1
%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
%build
%configure\
@@ -166,6 +182,8 @@
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/*
+
%pre
%service_add_pre purge-kernels.service
@@ -251,6 +269,7 @@
%{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
++++++ 0015-add-new-s390x-specific-rule-files.patch ++++++
>From 9b76077d6e70d1ae37273a587277ccef467e698b Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Tue, 21 Jan 2014 14:32:09 +0100
Subject: [PATCH] Add new s390x-specific rule files
With the new s390x configuration tool the naming of the udev
rules files have changed. So add these to the existing ones
to be compatible with existing and new installations.
References: bnc#856585
Signed-off-by: Hannes Reinecke <h...@suse.de>
diff --git a/modules.d/95dasd_rules/module-setup.sh
b/modules.d/95dasd_rules/module-setup.sh
index d313171..78ab2d0 100755
--- a/modules.d/95dasd_rules/module-setup.sh
+++ b/modules.d/95dasd_rules/module-setup.sh
@@ -5,7 +5,6 @@
# called by dracut
check() {
local _arch=$(uname -m)
- [ -x /sbin/dasd_configure ] || return 1
[ "$_arch" = "s390" -o "$_arch" = "s390x" ] || return 1
return 0
}
@@ -18,10 +17,10 @@ depends() {
# called by dracut
install() {
- inst_multiple /usr/lib/udev/collect
inst_hook cmdline 30 "$moddir/parse-dasd.sh"
if [[ $hostonly ]] ; then
inst_rules_wildcard 51-dasd-*.rules
+ inst_rules_wildcard 41-s390x-dasd-*.rules
fi
inst_rules 59-dasd.rules
}
diff --git a/modules.d/95zfcp_rules/module-setup.sh
b/modules.d/95zfcp_rules/module-setup.sh
index 9a1ab20..40c62a1 100755
--- a/modules.d/95zfcp_rules/module-setup.sh
+++ b/modules.d/95zfcp_rules/module-setup.sh
@@ -21,5 +21,6 @@ install() {
inst_hook cmdline 30 "$moddir/parse-zfcp.sh"
if [[ $hostonly ]] ; then
inst_rules_wildcard 51-zfcp-*.rules
+ inst_rules_wildcard 41-s390x-zfcp-*.rules
fi
}
++++++ fix-iscsi-firmware.patch ++++++
Index: dracut-036/modules.d/95iscsi/parse-iscsiroot.sh
===================================================================
--- dracut-036.orig/modules.d/95iscsi/parse-iscsiroot.sh 2014-01-29
08:35:47.000000000 +0100
+++ dracut-036/modules.d/95iscsi/parse-iscsiroot.sh 2014-02-12
18:11:51.627855039 +0100
@@ -61,10 +61,9 @@ fi
# iscsi_firmware does not need argument checking
if [ -n "$iscsi_firmware" ] ; then
- netroot=${netroot:-iscsi:}
+ netroot=${netroot:-iscsi}
modprobe -q iscsi_boot_sysfs 2>/dev/null
modprobe -q iscsi_ibft
- initqueue --onetime --timeout "/sbin/iscsiroot dummy '$netroot' '$NEWROOT'"
fi
# If it's not iscsi we don't continue
@@ -88,7 +87,7 @@ fi
if [ -n "$netroot" ] && [ "$root" != "/dev/root" ] && [ "$root" != "dhcp" ];
then
if ! getargbool 1 rd.neednet >/dev/null || ! getarg "ip="; then
- initqueue --onetime --settled "/sbin/iscsiroot dummy '$netroot'
'$NEWROOT'"
+ initqueue --settled /sbin/iscsiroot dummy "$netroot" "$NEWROOT"
fi
fi
++++++ remove-iscsiuio.patch ++++++
Index: dracut-036/modules.d/95iscsi/cleanup-iscsi.sh
===================================================================
--- dracut-036.orig/modules.d/95iscsi/cleanup-iscsi.sh 2014-01-29
08:35:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-[ -e /sys/module/bnx2i ] && killproc iscsiuio
-
Index: dracut-036/modules.d/95iscsi/iscsiroot.sh
===================================================================
--- dracut-036.orig/modules.d/95iscsi/iscsiroot.sh 2014-01-29
08:35:47.000000000 +0100
+++ dracut-036/modules.d/95iscsi/iscsiroot.sh 2014-02-12 18:15:20.665867839
+0100
@@ -38,11 +38,6 @@ iroot=${iroot#:}
# figured out a way how to check whether this is built-in or not
modprobe crc32c 2>/dev/null
-if [ -e /sys/module/bnx2i ] && ! [ -e /tmp/iscsiuio-started ]; then
- iscsiuio
- > /tmp/iscsiuio-started
-fi
-
handle_firmware()
{
if ! [ -e /tmp/iscsistarted-firmware ]; then
Index: dracut-036/modules.d/95iscsi/module-setup.sh
===================================================================
--- dracut-036.orig/modules.d/95iscsi/module-setup.sh 2014-01-29
08:35:47.000000000 +0100
+++ dracut-036/modules.d/95iscsi/module-setup.sh 2014-02-13
12:02:51.466789941 +0100
@@ -81,9 +81,7 @@ installkernel() {
# called by dracut
install() {
inst_multiple umount iscsistart hostname iscsi-iname
- inst_multiple -o iscsiuio
inst_hook cmdline 90 "$moddir/parse-iscsiroot.sh"
- inst_hook cleanup 90 "$moddir/cleanup-iscsi.sh"
inst "$moddir/iscsiroot.sh" "/sbin/iscsiroot"
if ! dracut_module_included "systemd"; then
inst "$moddir/mount-lun.sh" "/bin/mount-lun.sh"
++++++ replace_dhclient_with_wickedd_dhcp_supplicants.patch ++++++
Index: dracut-036/modules.d/40network/dhclient-script.sh
===================================================================
--- dracut-036.orig/modules.d/40network/dhclient-script.sh 2014-01-29
08:35:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-setup_interface() {
- ip=$new_ip_address
- mtu=$new_interface_mtu
- mask=$new_subnet_mask
- bcast=$new_broadcast_address
- gw=${new_routers%%,*}
- domain=$new_domain_name
- search=$(printf -- "$new_domain_search")
- namesrv=$new_domain_name_servers
- hostname=$new_host_name
- lease_time=$new_dhcp_lease_time
-
- [ -f /tmp/net.$netif.override ] && . /tmp/net.$netif.override
-
- # Taken from debian dhclient-script:
- # The 576 MTU is only used for X.25 and dialup connections
- # where the admin wants low latency. Such a low MTU can cause
- # problems with UDP traffic, among other things. As such,
- # disallow MTUs from 576 and below by default, so that broken
- # MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
- if [ -n "$mtu" ] && [ $mtu -gt 576 ] ; then
- if ! ip link set $netif mtu $mtu ; then
- ip link set $netif down
- ip link set $netif mtu $mtu
- linkup $netif
- fi
- fi
-
- ip addr add $ip${mask:+/$mask} ${bcast:+broadcast $bcast} \
- valid_lft ${lease_time} preferred_lft ${lease_time} \
- dev $netif
-
- [ -n "$gw" ] && echo ip route add default via $gw dev $netif >
/tmp/net.$netif.gw
-
- [ -n "${search}${domain}" ] && echo "search $search $domain" >
/tmp/net.$netif.resolv.conf
- if [ -n "$namesrv" ] ; then
- for s in $namesrv; do
- echo nameserver $s
- done
- fi >> /tmp/net.$netif.resolv.conf
-
- # Note: hostname can be fqdn OR short hostname, so chop off any
- # trailing domain name and explicity add any domain if set.
- [ -n "$hostname" ] && echo "echo ${hostname%.$domain}${domain:+.$domain} >
/proc/sys/kernel/hostname" > /tmp/net.$netif.hostname
-}
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-export PS4="dhclient.$interface.$$ + "
-[ -e /run/initramfs/loginit.pipe ] && exec >>/run/initramfs/loginit.pipe
2>>/run/initramfs/loginit.pipe
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-type ip_to_var >/dev/null 2>&1 || . /lib/net-lib.sh
-
-# We already need a set netif here
-netif=$interface
-
-# Huh? Interface configured?
-[ -f "/tmp/net.$netif.up" ] && exit 0
-
-case $reason in
- PREINIT)
- echo "dhcp: PREINIT $netif up"
- linkup $netif
- ;;
- BOUND)
- echo "dhcp: BOND setting $netif"
- unset layer2
- if [ -f /sys/class/net/$netif/device/layer2 ]; then
- read layer2 < /sys/class/net/$netif/device/layer2
- fi
- if [ "$layer2" != "0" ]; then
- if ! arping -q -D -c 2 -I $netif $new_ip_address ; then
- warn "Duplicate address detected for $new_ip_address while
doing dhcp. retrying"
- exit 1
- fi
- fi
- unset layer2
- setup_interface
- set | while read line; do
- [ "${line#new_}" = "$line" ] && continue
- echo "$line"
- done >/tmp/dhclient.$netif.dhcpopts
-
- {
- echo '. /lib/net-lib.sh'
- echo "setup_net $netif"
- echo "source_hook initqueue/online $netif"
- [ -e /tmp/net.$netif.manualup ] || echo "/sbin/netroot $netif"
- echo "> /tmp/setup_net_$netif.ok"
- echo "> /tmp/setup_net_\$(cat /sys/class/net/$netif/address).ok"
- echo "rm -f -- $hookdir/initqueue/setup_net_$netif.sh"
- } > $hookdir/initqueue/setup_net_$netif.sh
-
- echo "[ -f /tmp/setup_net_$netif.ok ]" >
$hookdir/initqueue/finished/dhclient-$netif.sh
- >/tmp/net.$netif.up
- ;;
- *) echo "dhcp: $reason";;
-esac
-
-exit 0
Index: dracut-036/modules.d/40network/dhclient.conf
===================================================================
--- dracut-036.orig/modules.d/40network/dhclient.conf 2014-01-29
08:35:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-request subnet-mask, broadcast-address, time-offset, routers,
- domain-name, domain-name-servers, domain-search, host-name,
- root-path, interface-mtu;
Index: dracut-036/modules.d/40network/ifup.sh
===================================================================
--- dracut-036.orig/modules.d/40network/ifup.sh 2014-01-29 08:35:47.000000000
+0100
+++ dracut-036/modules.d/40network/ifup.sh 2014-02-13 14:33:22.990342979
+0100
@@ -82,18 +82,100 @@ fi
[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
[ -n "$manualup" ] && >/tmp/net.$netif.manualup
-# Run dhclient
+dhcp_apply() {
+ if [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ]; then
+ . /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
+ else
+ warn "DHCP failed";
+ return 1
+ fi
+
+ if [ -z "${IPADDR}" ] || [ -z "${INTERFACE}" ]; then
+ warn "Missing crucial DHCP variables"
+ return 1
+ fi
+
+ # Assign IP address
+ ip $1 addr add "$IPADDR" ${BROADCAST:+broadcast $BROADCAST} dev
"$INTERFACE"
+
+ # Assign network route the interface is attached to
+ if [ -n "${NETWORK}" ]; then
+ ip $1 route add "$NETWORK"/"$PREFIXLEN" dev "$INTERFACE"
+ fi
+
+ # Assign provided routes
+ local r route=()
+ if [ -n "${ROUTES}" ]; then
+ for r in ${ROUTES}; do
+ route=(${r//,/ })
+ ip $1 route add "$route[0]"/"$route[1]" via "$route[2]" dev
"$INTERFACE"
+ done
+ fi
+
+ # Assign provided routers
+ local g
+ if [ -n "${GATEWAYS}" ]; then
+ for g in ${GATEWAYS}; do
+ ip $1 route add default via "$g" dev "$INTERFACE" && break
+ done
+ fi
+
+ # Setup hostname
+ [ -n "${HOSTNAME}" ] && hostname "$HOSTNAME"
+
+ # If nameserver= has not been specified, use what dhcp provides
+ if [ ! -s /tmp/net.$netif.resolv.conf ]; then
+ if [ -n "${DNSDOMAIN}" ]; then
+ echo domain "${DNSDOMAIN}"
+ fi >> /tmp/net.$netif.resolv.conf
+
+ if [ -n "${DNSSEARCH}" ]; then
+ echo search "${DNSSEARCH}"
+ fi >> /tmp/net.$netif.resolv.conf
+
+ if [ -n "${DNSSERVERS}" ] ; then
+ for s in ${DNSSERVERS}; do
+ echo nameserver "$s"
+ done
+ fi >> /tmp/net.$netif.resolv.conf
+ fi
+ [ -e /tmp/net.$netif.resolv.conf ] && \
+ cp -f /tmp/net.$netif.resolv.conf /etc/resolv.conf
+
+ info "DHCP is finished successfully"
+ return 0
+}
+
do_dhcp() {
- # dhclient-script will mark the netif up and generate the online
- # event for nfsroot
- # XXX add -V vendor class and option parsing per kernel
+ [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ] && return 0
+
+ info "Preparation for DHCP transaction"
+
+ local dhclient=''
+ if [ "$1" = "-4" ] ; then
+ dhclient="wickedd-dhcp4"
+ elif [ "$1" = "-6" ] ; then
+ dhclient="wickedd-dhcp6"
+ fi
+
+ # Address changed
+ ip $1 addr flush dev "$netif"
+
if ! iface_has_link $netif; then
- echo "No carrier detected"
- return 1
+ warn "No carrier detected"
+ warn "Trying to set $netif up..."
+ ip $1 link set dev "$netif" up
+ if ! iface_has_link $netif; then
+ warn "Failed..."
+ return 1
+ fi
fi
- echo "Starting dhcp for interface $netif"
- dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid
-lf /tmp/dhclient.$netif.lease $netif \
- || echo "dhcp failed"
+
+ info "Starting DHCP on interface $netif"
+ $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
+ dhcp_apply $1 || return $?
+
+ return 0
}
load_ipv6() {
@@ -217,8 +299,6 @@ if [ -e /tmp/team.info ]; then
fi
fi
-# XXX need error handling like dhclient-script
-
if [ -e /tmp/bridge.info ]; then
. /tmp/bridge.info
# start bridge if necessary
Index: dracut-036/modules.d/40network/kill-dhclient.sh
===================================================================
--- dracut-036.orig/modules.d/40network/kill-dhclient.sh 2014-01-29
08:35:47.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-for f in /tmp/dhclient.*.pid; do
- [ -e $f ] || continue
- read PID < $f;
- kill $PID >/dev/null 2>&1
-done
-
-sleep 0.1
-
-for f in /tmp/dhclient.*.pid; do
- [ -e $f ] || continue
- read PID < $f;
- kill -9 $PID >/dev/null 2>&1
-done
Index: dracut-036/modules.d/40network/module-setup.sh
===================================================================
--- dracut-036.orig/modules.d/40network/module-setup.sh 2014-01-29
08:35:47.000000000 +0100
+++ dracut-036/modules.d/40network/module-setup.sh 2014-02-13
14:33:06.353341961 +0100
@@ -2,11 +2,14 @@
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh
+WICKEDD_DHCP_PATH="/usr/lib/wicked/bin"
+WICKED_EXT_PATH="/etc/wicked/extensions"
+
# called by dracut
check() {
local _program
- for _program in ip arping dhclient ; do
+ for _program in ip arping $WICKEDD_DHCP_PATH/wickedd-dhcp4
$WICKEDD_DHCP_PATH/wickedd-dhcp6 ; do
if ! type -P $_program >/dev/null; then
derror "Could not find program \"$_program\" required by network."
return 1
@@ -77,16 +80,18 @@ installkernel() {
# called by dracut
install() {
local _arch _i _dir
- inst_multiple ip arping dhclient sed
+ inst_multiple ip arping hostname sed
inst_multiple -o ping ping6
inst_multiple -o brctl
inst_multiple -o teamd teamdctl teamnl
inst_simple /etc/libnl/classid
+ inst_simple "$WICKEDD_DHCP_PATH/wickedd-dhcp4" "/usr/sbin/wickedd-dhcp4"
+ inst_simple "$WICKEDD_DHCP_PATH/wickedd-dhcp6" "/usr/sbin/wickedd-dhcp6"
+ inst_libdir_file "libwicked*.so.*"
+ inst_libdir_file "libdbus-1.so.*"
inst_script "$moddir/ifup.sh" "/sbin/ifup"
inst_script "$moddir/netroot.sh" "/sbin/netroot"
- inst_script "$moddir/dhclient-script.sh" "/sbin/dhclient-script"
inst_simple "$moddir/net-lib.sh" "/lib/net-lib.sh"
- inst_simple "$moddir/dhclient.conf" "/etc/dhclient.conf"
inst_hook pre-udev 50 "$moddir/ifname-genrules.sh"
inst_hook pre-udev 60 "$moddir/net-genrules.sh"
inst_hook cmdline 91 "$moddir/dhcp-root.sh"
@@ -97,7 +102,6 @@ install() {
inst_hook cmdline 97 "$moddir/parse-bridge.sh"
inst_hook cmdline 98 "$moddir/parse-ip-opts.sh"
inst_hook cmdline 99 "$moddir/parse-ifname.sh"
- inst_hook cleanup 10 "$moddir/kill-dhclient.sh"
_arch=$(uname -m)
++++++ s390_add-user-space-grub-rule.patch ++++++
Index: dracut-036/modules.d/95grub2/module-setup.sh
===================================================================
--- /dev/null
+++ dracut-036/modules.d/95grub2/module-setup.sh
@@ -0,0 +1,17 @@
+#!/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
+install() {
+ inst_hook cmdline 30 "$moddir/s390-grub2.sh"
+ inst_multiple grub-emu kexec
+}
+
Index: dracut-036/modules.d/95grub2/s390-grub2.sh
===================================================================
--- /dev/null
+++ dracut-036/modules.d/95grub2/s390-grub2.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
+if getargbool 0 initgrub ; then
+ if [ -e /usr/bin/grub-emu ]
+ /boot/grub2/grub-emu
+ fi
+fi
++++++ suse_grub_manpage.patch ++++++
diff -rupN dracut-036.old/dracut.8 dracut-036/dracut.8
--- dracut-036.old/dracut.8 2014-01-29 07:36:45.000000000 +0000
+++ dracut-036/dracut.8 2014-02-13 05:39:56.965246846 +0000
@@ -189,7 +189,7 @@ If you need a special kernel module in t
.sp
An initramfs generated without the "hostonly" mode, does not contain any
system configuration files (except for some special exceptions), so the
configuration has to be done on the kernel command line\&. With this
flexibility, you can easily boot from a changed root partition, without the
need to recompile the initramfs image\&. So, you could completly change your
root partition (move it inside a md raid with encryption and LVM on top), as
long as you specify the correct filesystem LABEL or UUID on the kernel command
line for your root device, dracut will find it and boot from it\&.
.sp
-The kernel command line usually can be configured in
\fI/boot/grub/grub\&.conf\fR, if grub is your bootloader and it also can be
edited in the real boot process in the grub menu\&.
+The kernel command line usually can be configured in
\fI/boot/grub/menu\&.lst\fR, for GRUB Legacy, and \fI/boot/grub2/grub\&.cfg\fR,
for GRUB2 if grub is your bootloader and it also can be edited in the real boot
process in the grub menu\&.
.sp
The kernel command line can also be provided by the dhcp server with the
root\-path option\&. See the section called \(lqNetwork Boot\(rq\&.
.sp
diff -rupN dracut-036.old/dracut.html dracut-036/dracut.html
--- dracut-036.old/dracut.html 2014-01-29 07:36:45.000000000 +0000
+++ dracut-036/dracut.html 2014-02-12 21:41:37.988588041 +0000
@@ -1277,7 +1277,7 @@ boot from a changed root partition, with
image. So, you could completly change your root partition (move it inside a md
raid with encryption and LVM on top), as long as you specify the correct
filesystem LABEL or UUID on the kernel command line for your root device,
dracut
-will find it and boot from it.</p><p>The kernel command line usually can be
configured in <span class="emphasis"><em>/boot/grub/grub.conf</em></span>, if
+will find it and boot from it.</p><p>The kernel command line usually can be
configured in <span class="emphasis"><em>/boot/grub/menu.lst</em></span>, for
GRUB Legacy, or <span class="emphasis"><em>/boot/grub2/grub.cfg</em></span>,
for GRUB2 if
grub is your bootloader and it also can be edited in the real boot process in
the grub menu.</p><p>The kernel command line can also be provided by the dhcp
server with the
root-path option. See <a class="xref" href="#NetworkBoot" title="Network
Boot">the section called “Network Boot”</a>.</p><p>For a full reference of all
kernel command line parameters,
@@ -3228,4 +3228,4 @@ local-fs-pre.target dracu
switch-root</pre></div><div
class="section"><div class="titlepage"><div><div><h2 class="title"
style="clear: both"><a
id="_author_4"></a>AUTHOR</h2></div></div></div><p>Harald Hoyer</p></div><div
class="section"><div class="titlepage"><div><div><h2 class="title"
style="clear: both"><a id="_see_also_7"></a>SEE
ALSO</h2></div></div></div><p><span
class="strong"><strong>dracut</strong></span>(8) <span
class="strong"><strong>bootup</strong></span>(7)</p></div></div><div
class="appendix"><div class="titlepage"><div><div><h2 class="title"><a
id="_license"></a>Appendix A. License</h2></div></div></div><p>This work is
licensed under the Creative Commons Attribution/Share-Alike
License. To view a copy of this license, visit
<a class="ulink" href="http://creativecommons.org/licenses/by-sa/3.0/";
target="_top">http://creativecommons.org/licenses/by-sa/3.0/</a> or send a
letter to Creative
-Commons, 559 Nathan Abbott Way, Stanford, California 94305,
USA.</p></div></div></div></body></html>
\ No newline at end of file
+Commons, 559 Nathan Abbott Way, Stanford, California 94305,
USA.</p></div></div></div></body></html>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
