Author: ug Date: Tue Jun 30 12:11:05 2009 New Revision: 57800 URL: http://svn.opensuse.org/viewcvs/yast?rev=57800&view=rev Log: <filename> option added to the <pxe> section Modified: trunk/autoinstallation/doc/Installation.xml trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstall.ycp Modified: trunk/autoinstallation/doc/Installation.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/doc/Installation.xml?rev=57800&r1=57799&r2=57800&view=diff ============================================================================== --- trunk/autoinstallation/doc/Installation.xml (original) +++ trunk/autoinstallation/doc/Installation.xml Tue Jun 30 12:11:05 2009 @@ -199,6 +199,7 @@ </pxelinux-config> <tftp-server>192.168.66.1</tftp-server> <pxelinux-dir>/pxelinux.cfg</pxelinux-dir> + <filename>__MAC__</filename> <!-- since openSUSE 11.2, not SLES11 --> </pxe> ]]> </screen> @@ -216,6 +217,11 @@ reboot and if you want to do another autoinstallation for that machine, you have to remove the file from the TFTP server. </para> + <para> + Since openSUSE 11.2 (not SLES11) you can configure the filename too that will be uploaded. + If you use the "magic" __MAC__ filename, the filename will be the mac address of your machine like this "01-08-00-27-79-49-ee". + A missing filename creates the IP address filename like in the past. + </para> </section> </section> Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=57800&r1=57799&r2=57800&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Tue Jun 30 12:11:05 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jun 30 11:35:23 CEST 2009 - ug@suse.de + +- <filename> option added to the <pxe> section + +------------------------------------------------------------------- Mon Jun 29 13:34:11 CEST 2009 - ug@suse.de - <pxe> schema file added Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoInstall.ycp?rev=57800&r1=57799&r2=57800&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Tue Jun 30 12:11:05 2009 @@ -199,10 +199,16 @@ string tmpdir = (string)SCR::Read(.target.tmpdir); string hexfile = sformat("%1/%2", tmpdir, AutoInstallRules::hostid ); map pxe = Profile::current["pxe"]:$[]; + string dest_file = pxe["filename"]:AutoInstallRules::hostid; + if( dest_file == "__MAC__" ) { + string mac = AutoInstallRules::mac; + dest_file = sformat ("01-%1-%2-%3-%4-%5-%6", substring(mac,0,2), substring(mac,2,2), substring(mac,4,2), + substring(mac,6,2), substring(mac,8,2), substring(mac,10,2)); + } string server = pxe["tftp-server"]:""; if (server!="" && pxe["pxe_localboot"]:false) { - y2milestone("putting pxe local boot file on server :%1", server); + y2milestone("putting pxe local boot file '%2' on server :%1", server, dest_file); string config = pxe["pxelinux-config"]:""; string dir = pxe["pxelinux-dir"]:"pxelinux.cfg"; if (config == "") @@ -212,8 +218,7 @@ SCR::Write(.target.string, hexfile, config); - return TFTP::Put(server, dir + "/" + AutoInstallRules::hostid, - hexfile ); + return TFTP::Put(server, dir + "/" + dest_file, hexfile ); } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org