Thanks Justin! I've just checked in both the 2 patches. Sorry for the late, but I haven't had time to apply & test them before...
Cheers, -Andrea Justin Thiessen wrote: > Hi, > > Here are 2 patches. They remove a conflict between pxelinux and > systemimager over use of option code 208. > > This code is deprecated in favor of option code 142 in any relatively > recent version of systemimager, and (according to the comments), only > preserved for interoperatility with older code that might still be > hanging around. > > pxelinux needs this option. It tells pxelinux to pay attention to all > other options being passed to it through dhcp. So, for instance, if you > want to pass a particular pxelinux config file for a specific server, > you need this. > > These applied cleanly to the trunk that I pulled down today (Nov 22, 2006). > > Cheers, > > Justin Thiessen > --------------- > [EMAIL PROTECTED] > > > > ===(patch #1)=== > > --- trunk/initrd_source/skel/etc/dhclient.conf.orig 2006-10-11 > 13:38:11.000000000 -0700 > +++ trunk/initrd_source/skel/etc/dhclient.conf 2006-10-11 > 13:40:56.000000000 -0700 > @@ -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, > > > ===(patch #1 ends)=== > > --- > trunk/initrd_source/skel/etc/dhclient-script.systemimager-prefix.orig > 2006-10-11 13:41:14.000000000 -0700 > +++ trunk/initrd_source/skel/etc/dhclient-script.systemimager-prefix > 2006-10-11 13:42:49.000000000 -0700 > @@ -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 > > > ===(patch #2)=== > > > ===(patch #2 ends)=== > ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Sisuite-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/sisuite-users
