--pxe-hostname should be "--pxe-address"

6 files changed, 16 insertions, 14 deletions

diff --git a/CHANGELOG b/CHANGELOG
index f3af6b9..e8f5f1e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 Cobbler CHANGELOG
 
+NEXT:
+- bugfix: "--pxe-hostname" is "--pxe-address"
+
 * Thr Sep 28 2006 - 0.2.1-1
 - New ability to "enchant" remote systems (see NEWS)
 - Misc. bugfixes
diff --git a/TODO b/TODO
index d10cb1f..e4367f4 100644
--- a/TODO
+++ b/TODO
@@ -5,4 +5,4 @@ cobbler TODO list
   -  Integration with stonnith or other up/down devices?
   -  Locking
   -  For "enchant", try to verify that syslinux and mkinitrd are installed on the remote.     
-  
+  -  Allow pinning the IP in dhcp.conf?
diff --git a/cobbler.pod b/cobbler.pod
index 3de9a76..801181a 100644
--- a/cobbler.pod
+++ b/cobbler.pod
@@ -131,12 +131,12 @@ When using this setting, be sure the "--name" given to the "system add" command
 
 Example: --pxe-arch=ia64
 
-=item pxe-hostname
+=item pxe-address
 
 Advanced feature.  Applies only if manage-dhcp is set to 1 in /var/lib/cobbler/settings and only for PXE provisioning.
 
 If cobbler is configured to generate the dhcpd.conf file, use this
-setting to pin a certain MAC address to a specific dhcp hostname.
+setting to pin a certain MAC address to a specific dhcp hostname.  This corresponds to the "fixed-address" field in dhcpd.conf.
 
 When using this setting, be sure that the "--name" given to the "system add" command is a MAC address or no per-system record in dhcpd.conf can be generated.
 
diff --git a/cobbler/action_sync.py b/cobbler/action_sync.py
index 2b3e23a..c87650f 100644
--- a/cobbler/action_sync.py
+++ b/cobbler/action_sync.py
@@ -130,8 +130,8 @@ class BootSync:
                 # can't use pxelinux.0 anymore
                 systxt = systxt + "    filename \"/%s\";\n" % elilo
             systxt = systxt + "    hardware ethernet %s;\n" % system.name
-            if system.pxe_hostname != "":
-                systxt = systxt + "    fixed-address %s;\n" % system.pxe_hostname
+            if system.pxe_address != "":
+                systxt = systxt + "    fixed-address %s;\n" % system.pxe_address
             systxt = systxt + "}\n"
             system_definitions = system_definitions + systxt
 
diff --git a/cobbler/cobbler.py b/cobbler/cobbler.py
index 198a0d3..8a57a62 100755
--- a/cobbler/cobbler.py
+++ b/cobbler/cobbler.py
@@ -130,7 +130,7 @@ class BootCLI:
            '--kopts'        :  lambda(a) : sys.set_kernel_options(a),
            '--ksmeta'       :  lambda(a) : sys.set_ksmeta(a),
            '--pxe-arch'     :  lambda(a) : sys.set_pxe_arch(a),
-           '--pxe-hostname' :  lambda(a) : sys.set_pxe_hostname(a)
+           '--pxe-address'  :  lambda(a) : sys.set_pxe_address(a)
            # FIXME: surface a way to pin the IP.
         }
         on_ok = lambda: self.api.systems().add(sys)
diff --git a/cobbler/item_system.py b/cobbler/item_system.py
index 2279c91..7c584b5 100644
--- a/cobbler/item_system.py
+++ b/cobbler/item_system.py
@@ -28,7 +28,7 @@ class System(item.Item):
         self.kernel_options = ""
         self.ks_meta = ""
         self.pxe_arch = "standard"
-        self.pxe_hostname = ""
+        self.pxe_address = ""
 
     def from_datastruct(self,seed_data):
         self.name = seed_data['name']
@@ -36,7 +36,7 @@ class System(item.Item):
         self.kernel_options = seed_data['kernel_options']
         self.ks_meta = seed_data['ks_meta']
         self.pxe_arch = seed_data['pxe_arch']
-        self.pxe_hostname = seed_data['pxe_hostname']
+        self.pxe_address = seed_data['pxe_address']
         return self
 
     def set_name(self,name):
@@ -54,10 +54,9 @@ class System(item.Item):
         self.name = name  # we check it add time, but store the original value.
         return True
 
-    def set_pxe_hostname(self,hostname):
-        # we allow this to be set to anything
-        # though we probably should check to see if it looks like a FQDN
-        self.pxe_hostname = hostname
+    def set_pxe_address(self,hostname):
+        # we allow this to be set to anything and should restrict it
+        self.pxe_address = hostname
         return True
 
     def set_profile(self,profile_name):
@@ -103,7 +102,7 @@ class System(item.Item):
            'kernel_options' : self.kernel_options,
            'ks_meta'  : self.ks_meta,
            'pxe_arch' : self.pxe_arch,
-           'pxe_hostname' : self.pxe_hostname
+           'pxe_address' : self.pxe_address
         }
 
     def printable(self,id):
@@ -112,6 +111,6 @@ class System(item.Item):
         buf = buf + "kernel options  : %s\n" % self.kernel_options
         buf = buf + "ks metadata     : %s\n" % self.ks_meta
         buf = buf + "pxe arch        : %s\n" % self.pxe_arch
-        buf = buf + "pxe hostname    : %s\n" % self.pxe_hostname
+        buf = buf + "pxe address     : %s\n" % self.pxe_address
         return buf