Hello community,
here is the log from the commit of package dracut for openSUSE:Factory checked
in at 2014-03-11 20:31:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-05
15:36:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2014-03-11
20:31:31.000000000 +0100
@@ -1,0 +2,18 @@
+Fri Mar 7 13:14:39 UTC 2014 - tr...@suse.de
+
+- bnc#830060 - Dracut is missing warpclock/hwclock
+ Add dracut-warpclock_module.patch
+
+-------------------------------------------------------------------
+Wed Mar 5 15:25:32 UTC 2014 - pwieczorkiew...@suse.com
+
+- wait_for_network_race_condition_fix.patch:
+ * In case of no network related params are specified, but rd.neednet=1
+ is set, default initqueue action is to wait until one of the network
+ interfaces is marked as set up properly. (bnc#866771)
+ * It also helps with initqueue's race condition when network interface
+ shows up late.
+- replace_dhclient_with_wickedd_dhcp_supplicants.patch:
+ Add a missing network setup flag. (bnc#866771)
+
+-------------------------------------------------------------------
New:
----
dracut-warpclock_module.patch
wait_for_network_race_condition_fix.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut.spec ++++++
--- /var/tmp/diff_new_pack.UiYYBH/_old 2014-03-11 20:31:32.000000000 +0100
+++ /var/tmp/diff_new_pack.UiYYBH/_new 2014-03-11 20:31:32.000000000 +0100
@@ -45,6 +45,8 @@
Patch18: 0015-add-new-s390x-specific-rule-files.patch
Patch19: change_write_ifcfg_to_suse.patch
Patch20: dracut-fix-whitespace-add-drivers_call.patch
+Patch21: wait_for_network_race_condition_fix.patch
+Patch22: dracut-warpclock_module.patch
BuildRequires: asciidoc
BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets
@@ -94,6 +96,8 @@
%patch18 -p1
%patch19 -p1
%patch20 -p1
+%patch21 -p1
+%patch22 -p1
%build
%configure\
@@ -221,6 +225,7 @@
%{dracutlibdir}/modules.d/00bash
%{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh
%{dracutlibdir}/modules.d/00bootchart
+%{dracutlibdir}/modules.d/00warpclock
%{dracutlibdir}/modules.d/02caps
%{dracutlibdir}/modules.d/03modsign
%{dracutlibdir}/modules.d/03rescue/module-setup.sh
++++++ change_write_ifcfg_to_suse.patch ++++++
--- /var/tmp/diff_new_pack.UiYYBH/_old 2014-03-11 20:31:32.000000000 +0100
+++ /var/tmp/diff_new_pack.UiYYBH/_new 2014-03-11 20:31:32.000000000 +0100
@@ -1,7 +1,7 @@
Index: dracut-036/modules.d/45ifcfg/module-setup.sh
===================================================================
---- dracut-036.orig/modules.d/45ifcfg/module-setup.sh 2014-01-29
08:35:47.000000000 +0100
-+++ dracut-036/modules.d/45ifcfg/module-setup.sh 2014-02-14
14:40:06.851658347 +0100
+--- dracut-036.orig/modules.d/45ifcfg/module-setup.sh 2014-03-04
18:09:39.084659676 +0100
++++ dracut-036/modules.d/45ifcfg/module-setup.sh 2014-03-04
18:10:43.641663629 +0100
@@ -4,7 +4,13 @@
# called by dracut
@@ -19,7 +19,7 @@
Index: dracut-036/modules.d/45ifcfg/write-ifcfg.sh
===================================================================
---- dracut-036.orig/modules.d/45ifcfg/write-ifcfg.sh 2014-01-29
08:35:47.000000000 +0100
+--- dracut-036.orig/modules.d/45ifcfg/write-ifcfg.sh 2014-03-04
18:09:39.084659676 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,270 +0,0 @@
-#!/bin/sh
@@ -295,7 +295,7 @@
Index: dracut-036/modules.d/45ifcfg/write-ifcfg-redhat.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-036/modules.d/45ifcfg/write-ifcfg-redhat.sh 2014-02-14
12:45:19.558236609 +0100
++++ dracut-036/modules.d/45ifcfg/write-ifcfg-redhat.sh 2014-03-04
18:10:43.643663629 +0100
@@ -0,0 +1,270 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -570,7 +570,7 @@
Index: dracut-036/modules.d/45ifcfg/write-ifcfg-suse.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ dracut-036/modules.d/45ifcfg/write-ifcfg-suse.sh 2014-02-14
17:48:33.209350683 +0100
++++ dracut-036/modules.d/45ifcfg/write-ifcfg-suse.sh 2014-03-04
18:10:43.643663629 +0100
@@ -0,0 +1,183 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@@ -757,13 +757,13 @@
+} > /dev/null 2>&1
Index: dracut-036/modules.d/40network/ifup.sh
===================================================================
---- dracut-036.orig/modules.d/40network/ifup.sh 2014-02-14
12:45:19.487236605 +0100
-+++ dracut-036/modules.d/40network/ifup.sh 2014-02-14 14:40:29.587659739
+0100
-@@ -174,6 +174,7 @@ do_dhcp() {
- info "Starting DHCP on interface $netif"
+--- dracut-036.orig/modules.d/40network/ifup.sh 2014-03-04
18:10:35.440663127 +0100
++++ dracut-036/modules.d/40network/ifup.sh 2014-03-04 18:11:02.536664786
+0100
+@@ -175,6 +175,7 @@ do_dhcp() {
$dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
dhcp_apply $1 || return $?
-+ echo $netif > /tmp/net.${netif}.did-setup
++ echo $netif > /tmp/net.${netif}.did-setup
+ echo $netif > /tmp/setup_net_${netif}.ok
return 0
}
++++++ dracut-warpclock_module.patch ++++++
>From bb18c6dea7727d32191fbc40c504bc1f52bcf9c3 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Thu, 5 Dec 2013 09:29:28 +0100
Subject: [PATCH] 00warpclock: Set correct timezone
Add module for setting correct timezone.
Signed-off-by: Hannes Reinecke <h...@suse.de>
Index: dracut-036/modules.d/00warpclock/module-setup.sh
===================================================================
--- /dev/null
+++ dracut-036/modules.d/00warpclock/module-setup.sh
@@ -0,0 +1,23 @@
+#!/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() {
+ [ -e /etc/localtime -a -e /etc/adjtime ]
+}
+
+# called by dracut
+depends() {
+ return 0
+}
+
+# called by dracut
+install() {
+ inst /usr/share/zoneinfo/UTC
+ inst /etc/localtime
+ inst /etc/adjtime
+ inst_hook pre-trigger 00 "$moddir/warpclock.sh"
+ inst /sbin/hwclock
+}
+
Index: dracut-036/modules.d/00warpclock/warpclock.sh
===================================================================
--- /dev/null
+++ dracut-036/modules.d/00warpclock/warpclock.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if test -e /etc/adjtime ; then
+ while read line ; do
+ if test "$line" = LOCAL ; then
+ hwclock --systz
+ fi
+ done < /etc/adjtime
+fi
++++++ replace_dhclient_with_wickedd_dhcp_supplicants.patch ++++++
--- /var/tmp/diff_new_pack.UiYYBH/_old 2014-03-11 20:31:32.000000000 +0100
+++ /var/tmp/diff_new_pack.UiYYBH/_new 2014-03-11 20:31:32.000000000 +0100
@@ -118,8 +118,8 @@
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
++++ dracut-036/modules.d/40network/ifup.sh 2014-03-04 18:10:35.440663127
+0100
+@@ -82,18 +82,101 @@ fi
[ -z "$netroot" ] && [ -z "$manualup" ] && exit 0
[ -n "$manualup" ] && >/tmp/net.$netif.manualup
@@ -225,11 +225,12 @@
+ $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1}
+ dhcp_apply $1 || return $?
+
++ echo $netif > /tmp/setup_net_${netif}.ok
+ return 0
}
load_ipv6() {
-@@ -217,8 +299,6 @@ if [ -e /tmp/team.info ]; then
+@@ -217,8 +300,6 @@ if [ -e /tmp/team.info ]; then
fi
fi
@@ -263,7 +264,7 @@
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
++++ dracut-036/modules.d/40network/module-setup.sh 2014-03-04
18:09:28.687659039 +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
++++++ wait_for_network_race_condition_fix.patch ++++++
Index: dracut-036/modules.d/40network/net-genrules.sh
===================================================================
--- dracut-036.orig/modules.d/40network/net-genrules.sh 2014-01-29
08:35:47.000000000 +0100
+++ dracut-036/modules.d/40network/net-genrules.sh 2014-03-05
16:21:32.119553089 +0100
@@ -98,6 +98,9 @@ command -v fix_bootif >/dev/null || . /l
cond='ACTION=="add", SUBSYSTEM=="net"'
# if you change the name of "91-default-net.rules", also change
modules.d/80cms/cmssetup.sh
echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules
+ if [ "$NEEDNET" = "1" ]; then
+ echo "[ -f /tmp/net.*.did-setup ]"
>$hookdir/initqueue/finished/wait-network.sh
+ fi
fi
# if you change the name of "90-net.rules", also change
modules.d/80cms/cmssetup.sh
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
