[systemimager-commits] r3820 - trunk/initrd_source/skel/etc

[Andrea R. <ar...@sy...>]

Author: arighi
Date: 2006-11-27 16:43:20 -0600 (Mon, 27 Nov 2006)
New Revision: 3820

Modified:
   trunk/initrd_source/skel/etc/dhclient-script.systemimager-prefix
   trunk/initrd_source/skel/etc/dhclient.conf
Log:
- fix: (Justin Thiessen's patch) removed conflict between systemimager
  and pxelinux option-208


Modified: trunk/initrd_source/skel/etc/dhclient-script.systemimager-prefix
===================================================================
--- trunk/initrd_source/skel/etc/dhclient-script.systemimager-prefix	2006-11-27 22:35:51 UTC (rev 3819)
+++ trunk/initrd_source/skel/etc/dhclient-script.systemimager-prefix	2006-11-27 22:43:20 UTC (rev 3820)
@@ -18,8 +18,9 @@
 #   option-142  ->  SSH_DOWNLOAD_URL
 #   option-143  ->  FLAMETHROWER_DIRECTORY_PORTBASE
 #   option-144  ->  TMPFS_STAGING
-#   option-208  ->  SSH_DOWNLOAD_URL (depricated)
-#
+#   option-208  ->  SSH_DOWNLOAD_URL (deprecated)
+#                   disabled by JRT 2006-10-11
+#                   see dhclient.conf for commentary
 
 ### BEGIN SystemImager stuff part 0 ###
 FILE="/tmp/dhcp_info.$interface"
@@ -76,9 +77,10 @@
 if [ ! -z $new_option_142 ]; then
     SSH_DOWNLOAD_URL=$new_option_142
 
-elif [ ! -z $new_option_208 ]; then
-    SSH_DOWNLOAD_URL=$new_option_208
-
+#elif [ ! -z $new_option_208 ]; then
+#    SSH_DOWNLOAD_URL=$new_option_208
+#   disabled by JRT 2006-10-11 (see dhclient.conf for commentary)
+#
 fi
 echo "SSH_DOWNLOAD_URL=$SSH_DOWNLOAD_URL"               >> $FILE
 

Modified: trunk/initrd_source/skel/etc/dhclient.conf
===================================================================
--- trunk/initrd_source/skel/etc/dhclient.conf	2006-11-27 22:35:51 UTC (rev 3819)
+++ trunk/initrd_source/skel/etc/dhclient.conf	2006-11-27 22:43:20 UTC (rev 3820)
@@ -14,8 +14,13 @@
 #   option-142  ->  SSH_DOWNLOAD_URL
 #   option-143  ->  FLAMETHROWER_DIRECTORY_PORTBASE
 #   option-144  ->  TMPFS_STAGING
-#   option-208  ->  SSH_DOWNLOAD_URL (depricated)
-#
+#   option-208  ->  SSH_DOWNLOAD_URL (deprecated)  Removed by JRT, 2006-10-11
+#                   conflicted with pxelinux-magic code which permits
+#                   passing all sorts of parameters, including
+#                   selection of custom pxelinux boot config file
+#                   e.g. /tftpboot/pxelinux.cfg/mybootconfig.cfg
+#                   Needed to let us select boot binaries in the
+#                   dhcpd.conf file.
 
 request option-100, 
         option-140,
@@ -24,7 +29,6 @@
         option-142,
         option-143,
         option-144,
-        option-208,
         subnet-mask,
         broadcast-address,
         routers,