diff options
| author | James Cammarata <jimi@sngx.net> | 2008-12-26 20:41:43 -0600 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2008-12-26 20:41:43 -0600 |
| commit | 955d74ace3309d24adbb20c71449c15a60427f9d (patch) | |
| tree | 21c4bc83af3f15ff182c3b4815dd46721b65a63f | |
| parent | e301e7a70c91c4de9f06706fb1bf90715cbbdf32 (diff) | |
| download | cobbler-955d74ace3309d24adbb20c71449c15a60427f9d.tar.gz cobbler-955d74ace3309d24adbb20c71449c15a60427f9d.tar.xz cobbler-955d74ace3309d24adbb20c71449c15a60427f9d.zip | |
RIS patch 3
| -rw-r--r-- | cobbler/pxegen.py | 14 | ||||
| -rw-r--r-- | kickstarts/winnt.sif | 16 |
2 files changed, 23 insertions, 7 deletions
diff --git a/cobbler/pxegen.py b/cobbler/pxegen.py index 5a79dcc9..3fcc4030 100644 --- a/cobbler/pxegen.py +++ b/cobbler/pxegen.py @@ -225,8 +225,13 @@ class PXEGen: template_data = fd.read() fd.close() - blended = utils.blender(self.api, True, profile) + blended = utils.blender(self.api, False, profile) blended['next_server'] = self.settings.next_server + + ksmeta = blended.get("ks_meta",{}) + del blended["ks_meta"] + blended.update(ksmeta) # make available at top level + # this is a workaround for a dumb bug in cheetah... # a backslash before a variable is always treated as # escaping the $, so things are not rendered correctly. @@ -286,8 +291,13 @@ class PXEGen: template_data = fd.read() fd.close() - blended = utils.blender(self.api, True, system) + blended = utils.blender(self.api, False, system) blended['next_server'] = self.settings.next_server + + ksmeta = blended.get("ks_meta",{}) + del blended["ks_meta"] + blended.update(ksmeta) # make available at top level + # this is a workaround for a dumb bug in cheetah... # a backslash before a variable is always treated as # escaping the $, so things are not rendered correctly. diff --git a/kickstarts/winnt.sif b/kickstarts/winnt.sif index cb42ff52..7d993056 100644 --- a/kickstarts/winnt.sif +++ b/kickstarts/winnt.sif @@ -1,3 +1,5 @@ +#set $product_key = $getVar('product_key','') + ; More options can be found here ; http://unattended.msfn.org/unattended.xp/view/web/19/ @@ -5,7 +7,7 @@ floppyless = "1" msdosinitiated = "1" ; Needed for second stage -OriSrc = "\\192.168.1.109\REMINST\winxp-i386\i386" +OriSrc = "${bsp}${bsp}$next_server\REMINST${bsp}$name\i386" OriTyp = "4" LocalSourceOnCD = 1 ;DisableAdminAccountOnDomainJoin = 1 @@ -15,7 +17,7 @@ UnattendedInstall="Yes" [SetupData] OsLoadOptions = "/noguiboot /fastdetect" ; Needed for first stage -SetupSourceDevice = "\Device\LanmanRedirector\192.168.1.109\REMINST\winxp-i386" +SetupSourceDevice = "\Device\LanmanRedirector${bsp}$next_server\REMINST${bsp}$name" [Unattended] OemPreinstall = yes @@ -25,7 +27,7 @@ UnattendMode=FullUnattended UnattendSwitch = yes WaitForReboot = no OemSkipEula = yes -InstallFilesPath = "\\%SERVERNAME%\RemInst\%INSTALLPATH%\%MACHINETYPE%" +InstallFilesPath = "\\%SERVERNAME%\REMINST\%INSTALLPATH%\%MACHINETYPE%" LegacyNIC = 1 ;new OverwriteOemFilesOnupgrade=No @@ -33,9 +35,13 @@ DriverSigningPolicy=Ignore ConfirmHardware=No [UserData] -ComputerName = winxp-i386 +ComputerName = $name ; if needed +#if $product_key ProductID = $product_key +#else +# ProductID = +#end if FullName = "Your Name" OrgName = "Your Organization" @@ -48,7 +54,7 @@ OemSkipWelcome = 1 OemSkipRegional = 1 TimeZone = 110 AdminPassword = "password" -EncryptedAdminPassword=NO +EncryptedAdminPassword=no AutoLogon=Yes AutoLogonCount=1 |