summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--instdata.py12
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e6009ff89..ac49242fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12 Chris Lumens <clumens@redhat.com>
+
+ * instdata.py (InstallData.writeKS): Write out user and services
+ commands and scripts to anaconda-ks.cfg if doing a kickstart install.
+
2007-09-12 Peter Jones <pjones@redhat.com>
* isys/nl.c (netlink_init_interfaces_list): Rework recvmsg code to
diff --git a/instdata.py b/instdata.py
index 53066edf5..620845425 100644
--- a/instdata.py
+++ b/instdata.py
@@ -252,6 +252,13 @@ class InstallData:
f.write("rootpw %s\n" % args)
+ # Some kickstart commands do not correspond to any anaconda UI
+ # component. If this is a kickstart install, we need to make sure
+ # the information from the input file ends up in the output file.
+ if self.anaconda.isKickstart:
+ f.write(self.ksdata.user.__str__())
+ f.write(self.ksdata.services.__str__())
+
self.firewall.writeKS(f)
if self.auth.strip() != "":
f.write("authconfig %s\n" % self.auth)
@@ -264,6 +271,11 @@ class InstallData:
self.backend.writeKS(f)
self.backend.writePackagesKS(f, self.anaconda)
+ # Also write out any scripts from the input ksfile.
+ if self.anaconda.isKickstart:
+ for s in self.ksdata.scripts:
+ f.write(s.__str__())
+
# make it so only root can read, could have password
os.chmod(filename, 0600)