summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Fotheringham <pete.fotheringham@codethink.co.uk>2014-12-12 11:36:04 +0000
committerPete Fotheringham <pete.fotheringham@codethink.co.uk>2014-12-15 09:16:16 +0000
commit5bdb4820b0eddf1d7f3a4a25a74819844e06e7a1 (patch)
tree491a3bdee2e61b30f4b7b007be729b91949b04f9
parenta23bcc6321ad8e31e277de9753fbaa98ee6d741d (diff)
downloadmorph-5bdb4820b0eddf1d7f3a4a25a74819844e06e7a1.tar.gz
Document KERNEL_ARGS write extension parameter
-rw-r--r--morphlib/exts/kvm.write.help9
-rw-r--r--morphlib/exts/rawdisk.write.help9
-rw-r--r--morphlib/exts/virtualbox-ssh.write.help9
-rw-r--r--morphlib/writeexts.py6
4 files changed, 33 insertions, 0 deletions
diff --git a/morphlib/exts/kvm.write.help b/morphlib/exts/kvm.write.help
index 8ddcb89c..04393b8a 100644
--- a/morphlib/exts/kvm.write.help
+++ b/morphlib/exts/kvm.write.help
@@ -63,5 +63,14 @@ help: |
allowed values =
- 'extlinux'
+ * KERNEL_ARGS=args: optional additional kernel command-line parameters to
+ be appended to the default set. The default set is:
+
+ 'rw init=/sbin/init rootfstype=btrfs \
+ rootflags=subvol=systems/default/run \
+ root=[name or UUID of root filesystem]'
+
+ (See https://www.kernel.org/doc/Documentation/kernel-parameters.txt)
+
(See `morph help deploy` for details of how to pass parameters to write
extensions)
diff --git a/morphlib/exts/rawdisk.write.help b/morphlib/exts/rawdisk.write.help
index d6c78573..54af81c4 100644
--- a/morphlib/exts/rawdisk.write.help
+++ b/morphlib/exts/rawdisk.write.help
@@ -55,5 +55,14 @@ help: |
allowed values =
- 'extlinux'
+ * KERNEL_ARGS=args: optional additional kernel command-line parameters to
+ be appended to the default set. The default set is:
+
+ 'rw init=/sbin/init rootfstype=btrfs \
+ rootflags=subvol=systems/default/run \
+ root=[name or UUID of root filesystem]'
+
+ (See https://www.kernel.org/doc/Documentation/kernel-parameters.txt)
+
(See `morph help deploy` for details of how to pass parameters to write
extensions)
diff --git a/morphlib/exts/virtualbox-ssh.write.help b/morphlib/exts/virtualbox-ssh.write.help
index 4dddd987..cb50acc0 100644
--- a/morphlib/exts/virtualbox-ssh.write.help
+++ b/morphlib/exts/virtualbox-ssh.write.help
@@ -62,6 +62,15 @@ help: |
allowed values =
- 'extlinux'
+ * KERNEL_ARGS=args: optional additional kernel command-line parameters to
+ be appended to the default set. The default set is:
+
+ 'rw init=/sbin/init rootfstype=btrfs \
+ rootflags=subvol=systems/default/run \
+ root=[name or UUID of root filesystem]'
+
+ (See https://www.kernel.org/doc/Documentation/kernel-parameters.txt)
+
* AUTOSTART=<VALUE> - boolean. If it is set, the VM will be started when
it has been deployed.
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