summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McCarty <patrick.mccarty@linux.intel.com>2013-05-03 12:13:11 -0700
committerPatrick McCarty <patrick.mccarty@linux.intel.com>2013-05-03 12:16:22 -0700
commitba42c753402683056a7de4fefefa88795ef2d3cd (patch)
tree355f3549ac93c05ab6665f99d2bfd6a9cfdbd15b
parent8350ebe07ed3303ced20ce52bce39700b4109e28 (diff)
downloadkickstarter-ba42c753402683056a7de4fefefa88795ef2d3cd.tar.gz
kickstarter-ba42c753402683056a7de4fefefa88795ef2d3cd.tar.bz2
kickstarter-ba42c753402683056a7de4fefefa88795ef2d3cd.zip
Change-Id: I6f52a49d3d7b0bca9f7c09ac8231af3fc11182c8
-rw-r--r--kickstart/kickstart.tmpl2
-rw-r--r--packaging/kickstarter.changes3
2 files changed, 5 insertions, 0 deletions
diff --git a/kickstart/kickstart.tmpl b/kickstart/kickstart.tmpl
index 78830bf..703f970 100644
--- a/kickstart/kickstart.tmpl
+++ b/kickstart/kickstart.tmpl
@@ -15,7 +15,9 @@ part / --size ${metadata.PartSize} --ondisk sda --fstype=${metadata.FileSystem}
#else
${metadata.Part}
#end if
+#if $metadata.has_key("RootPass")
rootpw ${metadata.RootPass}
+#end if
#if $metadata.has_key("StartX")
xconfig --startxonboot
#end if
diff --git a/packaging/kickstarter.changes b/packaging/kickstarter.changes
index df0ccc5..f6a9af4 100644
--- a/packaging/kickstarter.changes
+++ b/packaging/kickstarter.changes
@@ -1,3 +1,6 @@
+* Fri May 03 2013 Patrick McCarty <patrick.mccarty@linux.intel.com> 6f55a1a
+- Remove requirement for a default root password
+
* Wed Apr 10 2013 Anas Nashif <anas.nashif@intel.com> 0.17@1986de5
- Support ks files without default user