From 7de6a7e8b04fd9c889a19acedaf92c3e58e652f0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Jul 2012 15:33:34 -0400
Subject: [PATCH] Rename time.clockLocal -> time.hardwareClockInLocalTime.

---
 modules/config/timezone.nix                | 6 ++++--
 modules/system/upstart-events/shutdown.nix | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/config/timezone.nix b/modules/config/timezone.nix
index bb03074a4ae7..38c698bc21c0 100644
--- a/modules/config/timezone.nix
+++ b/modules/config/timezone.nix
@@ -6,6 +6,7 @@ with pkgs.lib;
   options = {
 
     time = {
+    
       timeZone = mkOption {
         default = "CET";
         type = with types; uniq string;
@@ -13,10 +14,11 @@ with pkgs.lib;
         description = "The time zone used when displaying times and dates.";
       };
 
-      clockLocal = mkOption {
+      hardwareClockInLocalTime = mkOption {
         default = false;
-        description = "Keep the Hardware Clock in local time instead of UTC";
+        description = "If set, keep the hardware clock in local time instead of UTC.";
       };
+      
     };
   };
 
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index bfe8d073a823..59fbcc0d878b 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -73,7 +73,7 @@ with pkgs.lib;
 
           # Set the hardware clock to the system time.
           echo "setting the hardware clock..."
-          hwclock --systohc ${if config.time.clockLocal then "--localtime" else "--utc"}
+          hwclock --systohc ${if config.time.hardwareClockInLocalTime then "--localtime" else "--utc"}
 
 
           # Stop all swap devices.