pool/dracut
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 225030 from home:trenn:branches:Base:System

Browse Source 
- bnc#830060 - Dracut is missing warpclock/hwclock
  Add dracut-warpclock_module.patch

OBS-URL: https://build.opensuse.org/request/show/225030
OBS-URL: https://build.opensuse.org/package/show/Base:System/dracut?expand=0&rev=111
This commit is contained in:
Thomas Renninger 2014-03-07 13:20:21 +00:00 committed by Git OBS Bridge
parent 83f929a7bb
commit 6b3dbb094d
3 changed files with 60 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dracut-warpclock_module.patch Normal file
View File

@ -0,0 +1,51 @@
From bb18c6dea7727d32191fbc40c504bc1f52bcf9c3 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.
Signed-off-by: Hannes Reinecke <hare@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

6
dracut.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 7 13:14:39 UTC 2014 - trenn@suse.de
- bnc#830060 - Dracut is missing warpclock/hwclock
Add dracut-warpclock_module.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 5 15:25:32 UTC 2014 - pwieczorkiewicz@suse.com Wed Mar 5 15:25:32 UTC 2014 - pwieczorkiewicz@suse.com

3
dracut.spec
View File

@ -46,6 +46,7 @@ Patch18: 0015-add-new-s390x-specific-rule-files.patch
Patch19: change_write_ifcfg_to_suse.patch Patch19: change_write_ifcfg_to_suse.patch
Patch20: dracut-fix-whitespace-add-drivers_call.patch Patch20: dracut-fix-whitespace-add-drivers_call.patch
Patch21: wait_for_network_race_condition_fix.patch Patch21: wait_for_network_race_condition_fix.patch
Patch22: dracut-warpclock_module.patch
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: bash BuildRequires: bash
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
@ -96,6 +97,7 @@ NFS, iSCSI, NBD, FCoE with the dracut-network package.
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch22 -p1
%build %build
%configure\ %configure\
@ -223,6 +225,7 @@ ln -s %{dracutlibdir}/modules.d/45ifcfg/write-ifcfg-redhat.sh %{buildroot}/%{dra
%{dracutlibdir}/modules.d/00bash %{dracutlibdir}/modules.d/00bash
%{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh %{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh
%{dracutlibdir}/modules.d/00bootchart %{dracutlibdir}/modules.d/00bootchart
%{dracutlibdir}/modules.d/00warpclock
%{dracutlibdir}/modules.d/02caps %{dracutlibdir}/modules.d/02caps
%{dracutlibdir}/modules.d/03modsign %{dracutlibdir}/modules.d/03modsign
%{dracutlibdir}/modules.d/03rescue/module-setup.sh %{dracutlibdir}/modules.d/03rescue/module-setup.sh