This changes up the commands used based on VMware osversion. Stores the cobbler.ks in /var/log for esxi which has no /root.
diff --git a/snippets/kickstart_done b/snippets/kickstart_done index 4ff408d..23180a3 100644 --- a/snippets/kickstart_done +++ b/snippets/kickstart_done @@ -1,6 +1,7 @@ #set system_name = $getVar('system_name','') #set profile_name = $getVar('profile_name','') #set breed = $getVar('breed','') +#set os_version = $getVar('os_version','') #set srv = $getVar('http_server','') #set kickstart = $getVar('kickstart','') #set run_install_triggers = $str($getVar('run_install_triggers','')) @@ -15,8 +16,10 @@ #if $pxe_just_once in [ "1", "true", "yes", "y" ] #if $breed == 'redhat' #set nopxe = "\nwget "http://%s/cblr/svc/op/nopxe/system/%s%5C" -O /dev/null" % (srv, system_name) - #else if $breed == 'vmware' + #else if $breed == 'vmware' and $os_version == 'esx4' #set nopxe = "\ncurl "http://%s/cblr/svc/op/nopxe/system/%s%5C" -o /dev/null" % (srv, system_name) + #else if $breed == 'vmware' and $os_version == 'esxi4' + #set nopxe = "\nwget "http://%s/cblr/svc/op/nopxe/system/%s%5C" -O /dev/null" % (srv, system_name) #end if #end if
@@ -24,8 +27,10 @@ #if $kickstart != '' #if $breed == 'redhat' #set saveks = "\nwget "http://%s/cblr/svc/op/ks/%s/%s%5C" -O /root/cobbler.ks" % (srv, "system", system_name) - #else if $breed == 'vmware' + #else if $breed == 'vmware' and $os_version == 'esx4' #set saveks = "\ncurl "http://%s/cblr/svc/op/ks/%s/%s%5C" -o /root/cobbler.ks" % (srv, "system", system_name) + #else if $breed == 'vmware' and $os_version == 'esxi4' + #set saveks = "\nwget "http://%s/cblr/svc/op/ks/%s/%s%5C" -O /var/log/cobbler.ks" % (srv, "system", system_name) #end if #end if
@@ -33,8 +38,10 @@ #if $run_install_triggers in [ "1", "true", "yes", "y" ] #if $breed == 'redhat' #set runpost = "\nwget "http://%s/cblr/svc/op/trig/mode/post/%s/%s%5C" -O /dev/null" % (srv, "system", system_name) - #else if $breed == 'vmware' + #else if $breed == 'vmware' and $os_version == 'esx4' #set runpost = "\ncurl "http://%s/cblr/svc/op/trig/mode/post/%s/%s%5C" -o /dev/null" % (srv, "system", system_name) + #else if $breed == 'vmware' and $os_version == 'esxi4' + #set runpost = "\nwget "http://%s/cblr/svc/op/trig/mode/post/%s/%s%5C" -O /dev/null" % (srv, "system", system_name) #end if #end if
@@ -44,8 +51,10 @@ #if $kickstart != '' #if $breed == 'redhat' #set saveks = "\nwget "http://%s/cblr/svc/op/ks/%s/%s%5C" -O /root/cobbler.ks" % (srv, "profile", profile_name) - #else if $breed == 'vmware' + #else if $breed == 'vmware' and $os_version == 'esx4' #set saveks = "\ncurl "http://%s/cblr/svc/op/ks/%s/%s%5C" -o /root/cobbler.ks" % (srv, "profile", profile_name) + #else if $breed == 'vmware' and $os_version == 'esxi4' + #set saveks = "\nwget "http://%s/cblr/svc/op/ks/%s/%s%5C" -O /var/log/cobbler.ks" % (srv, "profile", profile_name) #end if #end if
@@ -53,8 +62,10 @@ #if $run_install_triggers in [ "1", "true", "yes", "y" ] #if $breed == 'redhat' #set runpost = "\nwget "http://%s/cblr/svc/op/trig/mode/post/%s/%s%5C" -O /dev/null" % (srv, "profile", profile_name) - #else if $breed == 'vmware' + #else if $breed == 'vmware' and $os_version == 'esx4' #set runpost = "\ncurl "http://%s/cblr/svc/op/trig/mode/post/%s/%s%5C" -o /dev/null" % (srv, "profile", profile_name) + #else if $breed == 'vmware' and $os_version == 'esxi4' + #set runpost = "\nwget "http://%s/cblr/svc/op/trig/mode/post/%s/%s%5C" -O /dev/null" % (srv, "profile", profile_name) #end if #end if
On Tue, 22 Feb 2011 17:30:18 -0500, Jonathan Sabo jsabo@criminal.org wrote:
This changes up the commands used based on VMware osversion. Stores the cobbler.ks in /var/log for esxi which has no /root.
Something is eating your patches and making them unusable to git am. Can you attach them or give me a hash on your github? This applies to the image one you sent earlier as well. Thanks.
Scott Henson wrote:
On Tue, 22 Feb 2011 17:30:18 -0500, Jonathan Sabo jsabo@criminal.org wrote:
This changes up the commands used based on VMware osversion. Stores the cobbler.ks in /var/log for esxi which has no /root.
Something is eating your patches and making them unusable to git am. Can you attach them or give me a hash on your github? This applies to the image one you sent earlier as well. Thanks.
Gmail strikes again. Perhaps the submittingPatches file from git's documentation will help.
http://git.kernel.org/?p=git/git.git;a=blob;f=Documentation/SubmittingPatche...
On Tue, Feb 22, 2011 at 4:42 PM, Scott Henson shenson@redhat.com wrote:
On Tue, 22 Feb 2011 17:30:18 -0500, Jonathan Sabo jsabo@criminal.org wrote:
This changes up the commands used based on VMware osversion. Stores the cobbler.ks in /var/log for esxi which has no /root.
Something is eating your patches and making them unusable to git am. Can you attach them or give me a hash on your github? This applies to the image one you sent earlier as well. Thanks.
Been meaning to ask, are all these patches against the 2.1 tree? Just want to make sure these patches are against the new import modules and not the existing code base, which will go away with 2.1.
On Tue, Feb 22, 2011 at 7:11 PM, James Cammarata jimi@sngx.net wrote:
On Tue, Feb 22, 2011 at 4:42 PM, Scott Henson shenson@redhat.com wrote:
On Tue, 22 Feb 2011 17:30:18 -0500, Jonathan Sabo jsabo@criminal.org wrote:
This changes up the commands used based on VMware osversion. Stores the cobbler.ks in /var/log for esxi which has no /root.
Something is eating your patches and making them unusable to git am. Can you attach them or give me a hash on your github? This applies to the image one you sent earlier as well. Thanks.
Been meaning to ask, are all these patches against the 2.1 tree? Just want to make sure these patches are against the new import modules and not the existing code base, which will go away with 2.1.
Yeah it's against the git master. I pushed the changes to the branch below...
On Wed, 23 Feb 2011 11:22:10 -0500, Jonathan Sabo jsabo@criminal.org wrote:
On Tue, Feb 22, 2011 at 7:11 PM, James Cammarata jimi@sngx.net wrote:
On Tue, Feb 22, 2011 at 4:42 PM, Scott Henson shenson@redhat.com wrote:
On Tue, 22 Feb 2011 17:30:18 -0500, Jonathan Sabo jsabo@criminal.org wrote:
This changes up the commands used based on VMware osversion. Stores the cobbler.ks in /var/log for esxi which has no /root.
Something is eating your patches and making them unusable to git am. Can you attach them or give me a hash on your github? This applies to the image one you sent earlier as well. Thanks.
Been meaning to ask, are all these patches against the 2.1 tree? Just want to make sure these patches are against the new import modules and not the existing code base, which will go away with 2.1.
Yeah it's against the git master. I pushed the changes to the branch below...
Thanks, merged.
cobbler-devel@lists.fedorahosted.org