From e93d7ed826431729ad458df643470b46c0a6865f Mon Sep 17 00:00:00 2001
From: Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Date: Fri, 12 Dec 2014 11:30:13 +0000
Subject: Document BOOTLOADER_INSTALL and BOOTLOADER_CONFIG_FORMAT write
 extension parameters

---
 morphlib/writeexts.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'morphlib/writeexts.py')

diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index 91936f64..068f0741 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -545,9 +545,8 @@ class WriteExtension(cliapp.Application):
         '''Does the user want to generate a bootloader config?
 
         The user may set $BOOTLOADER_CONFIG_FORMAT to the desired
-        format (u-boot or extlinux). If not set, extlinux is the
-        default but will be generated on x86-32 and x86-64, but not
-        otherwise.
+        format. 'extlinux' is the only allowed value, and is the default
+        value for x86-32 and x86-64.
 
         '''
 
-- 
cgit v1.2.1


From a23bcc6321ad8e31e277de9753fbaa98ee6d741d Mon Sep 17 00:00:00 2001
From: Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Date: Fri, 12 Dec 2014 11:31:09 +0000
Subject: Whitespace removal

---
 morphlib/writeexts.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'morphlib/writeexts.py')

diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index 068f0741..fd2f5529 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -83,14 +83,14 @@ class Fstab(object):
 class WriteExtension(cliapp.Application):
 
     '''A base class for deployment write extensions.
-    
+
     A subclass should subclass this class, and add a
     ``process_args`` method.
-    
+
     Note that it is not necessary to subclass this class for write
     extensions. This class is here just to collect common code for
     write extensions.
-    
+
     '''
 
     def setup_logging(self):
@@ -125,13 +125,13 @@ class WriteExtension(cliapp.Application):
 
     def status(self, **kwargs):
         '''Provide status output.
-        
+
         The ``msg`` keyword argument is the actual message,
         the rest are values for fields in the message as interpolated
         by %.
-        
+
         '''
-        
+
         self.output.write('%s\n' % (kwargs['msg'] % kwargs))
         self.output.flush()
 
@@ -184,9 +184,9 @@ class WriteExtension(cliapp.Application):
 
     def _parse_size(self, size):
         '''Parse a size from a string.
-        
+
         Return size in bytes.
-        
+
         '''
 
         m = re.match('^(\d+)([kmgKMG]?)$', size)
-- 
cgit v1.2.1


From 5bdb4820b0eddf1d7f3a4a25a74819844e06e7a1 Mon Sep 17 00:00:00 2001
From: Pete Fotheringham <pete.fotheringham@codethink.co.uk>
Date: Fri, 12 Dec 2014 11:36:04 +0000
Subject: Document KERNEL_ARGS write extension parameter

---
 morphlib/writeexts.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'morphlib/writeexts.py')

diff --git a/morphlib/writeexts.py b/morphlib/writeexts.py
index fd2f5529..6ab2dd55 100644
--- a/morphlib/writeexts.py
+++ b/morphlib/writeexts.py
@@ -474,6 +474,12 @@ class WriteExtension(cliapp.Application):
 
         self.status(msg='Creating extlinux.conf')
         config = os.path.join(real_root, 'extlinux.conf')
+
+        ''' Please also update the documentation in the following files
+            if you change these default kernel args:
+            - kvm.write.help
+            - rawdisk.write.help
+            - virtualbox-ssh.write.help '''
         kernel_args = (
             'rw ' # ro ought to work, but we don't test that regularly
             'init=/sbin/init ' # default, but it doesn't hurt to be explicit
-- 
cgit v1.2.1