From c3e070de802ebc0f44722d4238f5447b93cc9fac Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Tue, 3 Sep 2013 23:51:51 -0700
Subject: Review adjustments.

---
 cloudinit/distros/__init__.py | 8 +++++---
 cloudinit/distros/debian.py   | 1 -
 cloudinit/distros/rhel.py     | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'cloudinit/distros')

diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
index 8cffb0ee..5642b529 100644
--- a/cloudinit/distros/__init__.py
+++ b/cloudinit/distros/__init__.py
@@ -52,7 +52,7 @@ class Distro(object):
     ci_sudoers_fn = "/etc/sudoers.d/90-cloud-init-users"
     hostname_conf_fn = "/etc/hostname"
     tz_zone_dir = "/usr/share/zoneinfo"
-    random_seed_fn = None
+    random_seed_fn = '/dev/urandom'
 
     def __init__(self, name, cfg, paths):
         self._paths = paths
@@ -171,11 +171,13 @@ class Distro(object):
         return distros
 
     def set_random_seed(self, seed):
-        if not self.random_seed_fn:
+        if not self.random_seed_fn or not os.path.exists(self.random_seed_fn):
             raise IOError("No random seed filename provided for %s"
                           % (self.name))
+        if not seed:
+            raise IOError("Unable to set empty random seed")
         # Ensure we only write 512 bytes worth
-        util.write_file(self.random_seed_fn, seed[0:512], mode=0600)
+        util.append_file(self.random_seed_fn, seed[0:512])
 
     def update_hostname(self, hostname, fqdn, prev_hostname_fn):
         applying_hostname = hostname
diff --git a/cloudinit/distros/debian.py b/cloudinit/distros/debian.py
index db4afc76..8fe49cbe 100644
--- a/cloudinit/distros/debian.py
+++ b/cloudinit/distros/debian.py
@@ -44,7 +44,6 @@ class Distro(distros.Distro):
     network_conf_fn = "/etc/network/interfaces"
     tz_conf_fn = "/etc/timezone"
     tz_local_fn = "/etc/localtime"
-    random_seed_fn = "/var/lib/urandom/random-seed"
 
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
diff --git a/cloudinit/distros/rhel.py b/cloudinit/distros/rhel.py
index 96df9ae2..30195384 100644
--- a/cloudinit/distros/rhel.py
+++ b/cloudinit/distros/rhel.py
@@ -49,7 +49,6 @@ class Distro(distros.Distro):
     network_script_tpl = '/etc/sysconfig/network-scripts/ifcfg-%s'
     resolve_conf_fn = "/etc/resolv.conf"
     tz_local_fn = "/etc/localtime"
-    random_seed_fn = "/var/lib/random-seed"
 
     def __init__(self, name, cfg, paths):
         distros.Distro.__init__(self, name, cfg, paths)
-- 
cgit v1.2.3