a4aac89e0e
- Allow multiple configurations per network interface (bnc#887906) Add 0133-Allow-multiple-configurations-per-network-interface-.patch - Remove bootdev warning (bnc#881112) Add 0134-Remove-bootdev-warning-bnc-881112.patch - check for existance of 69-dm-lvm-metad.rules in modules_setup.sh, lvm module (bnc#891791) Add 0135-lvm-Fix-12819a579900b9691e2-check-for-existance-of-6.patch - Moved persistent network rule revert to another file (was not in github): Delete: 0133-Remove-70-persistent-net.rules.patch Add: 0136-Revert-95udev-rules-add-persistent-network-rule.patch - dracut-use-fipscheck-openssl.patch: Switch from Mozilla NSS sha256hmac checking to fipscheck as recommended Add: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch - warpclock: Do not use warpclock module on S390(x), hwclock does not exist there (bnc#884513) Add 0138-warpclock-Do-not-use-warpclock-module-on-S390-x-hwcl.patch OBS-URL: https://build.opensuse.org/request/show/244813 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=178
32 lines
943 B
Diff
32 lines
943 B
Diff
From 56b5871a7336b1d90c76a282fa3d7f76e7f10769 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Renninger <trenn@suse.de>
|
|
Date: Thu, 14 Aug 2014 16:59:16 +0200
|
|
Subject: warpclock: Do not use warpclock module on S390(x), hwclock does not
|
|
exist there
|
|
|
|
bnc#884513
|
|
|
|
Signed-off-by: Thomas Renninger <trenn@suse.de>
|
|
---
|
|
modules.d/00warpclock/module-setup.sh | 4 ++++
|
|
1 files changed, 4 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/modules.d/00warpclock/module-setup.sh b/modules.d/00warpclock/module-setup.sh
|
|
index 5aec4eb..9af1ee7 100755
|
|
--- a/modules.d/00warpclock/module-setup.sh
|
|
+++ b/modules.d/00warpclock/module-setup.sh
|
|
@@ -4,6 +4,10 @@
|
|
|
|
# called by dracut
|
|
check() {
|
|
+ # hwclock does not exist on S390(x), bail out silently then
|
|
+ local _arch=$(uname -m)
|
|
+ [ "$_arch" = "s390" -o "$_arch" = "s390x" ] && return 1
|
|
+
|
|
[ -e /etc/localtime -a -e /etc/adjtime ] || return 1
|
|
require_binaries /sbin/hwclock || return 1
|
|
}
|
|
--
|
|
1.7.6.1
|
|
|