Thomas Renninger
9f28177407
- Update to dracut mainline version 041. Half of the patches got integrated mainline. Some others have been merged together when it made sense some have been left out, but are still in the repository as they need some special treating and mainline discussion whether/how they get added. These are also not urgently needed, but are debugging patches. I broke the rule here to mention every added/deleted/modified patch as every patch is touched and every 2nd got removed (mainline integrated). I also re-ordered the patches in the PatchXY: area for easier merging them and get them discussed and posted mainline easier, topic by topic. OBS-URL: https://build.opensuse.org/request/show/293267 OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=214
64 lines
1.9 KiB
Diff
64 lines
1.9 KiB
Diff
From 8792c2c46d3841ea11b9bd30e388eaeb64549fdc Mon Sep 17 00:00:00 2001
|
|
From: Hannes Reinecke <hare@suse.de>
|
|
Date: Thu, 5 Dec 2013 09:29:28 +0100
|
|
Subject: [PATCH] 00warpclock: Set correct timezone
|
|
|
|
Add module for setting correct timezone.
|
|
|
|
References: bnc#830060
|
|
|
|
Signed-off-by: Hannes Reinecke <hare@suse.de>
|
|
---
|
|
modules.d/00warpclock/module-setup.sh | 22 ++++++++++++++++++++++
|
|
modules.d/00warpclock/warpclock.sh | 9 +++++++++
|
|
2 files changed, 31 insertions(+)
|
|
create mode 100755 modules.d/00warpclock/module-setup.sh
|
|
create mode 100755 modules.d/00warpclock/warpclock.sh
|
|
|
|
Index: dracut-041/modules.d/00warpclock/module-setup.sh
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ dracut-041/modules.d/00warpclock/module-setup.sh 2015-03-24 15:18:51.564135423 +0100
|
|
@@ -0,0 +1,27 @@
|
|
+#!/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() {
|
|
+ # 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
|
|
+}
|
|
+
|
|
+# 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-041/modules.d/00warpclock/warpclock.sh
|
|
===================================================================
|
|
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
+++ dracut-041/modules.d/00warpclock/warpclock.sh 2015-03-24 15:07:47.762852198 +0100
|
|
@@ -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
|