Changeset 3242 in /cluster/svnroot


Ignore:
Timestamp:
Jun 20, 2011 11:22:30 PM (9 years ago)
Author:
skylar
Message:

support multiple BCCD systems on a network (#646)

Location:
bccd-ng/branches/skylar-devel/packages/etc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar-devel/packages/etc/dhcp3/dhclient.conf

    r2751 r3242  
    3232#     # DHCP offers from the BCCD server
    3333#require bccd-identifier;
    34 send bccd-identifier "bccd-client";
     34send bccd-identifier "!BCCD-CLIENT!";
  • bccd-ng/branches/skylar-devel/packages/etc/dhcp3/dhcpd.conf

    r2751 r3242  
    5353
    5454class "bccd-nodes" {
    55   match if option bccd-identifier = "bccd-client";
     55  match if option bccd-identifier = "!BCCD-CLIENT!";
    5656}
    5757
    5858class "pxelinux-nodes" {
    59   match if option bccd-identifier != "bccd-client";
     59  match if option bccd-identifier != "!BCCD-CLIENT!";
    6060}
    6161
  • bccd-ng/branches/skylar-devel/packages/etc/init.d/bccd-dhcp

    r2751 r3242  
    3737LIBCONF=$DHCPDIR/bccd_net.conf
    3838DHCLICONF=$DHCPDIR/dhclient.conf
     39BCCDID=bccd-client
    3940
    4041egrep -q '[[:space:]+](lockdhcp|nodemode)[[:space:]]*' /proc/cmdline
     
    7576    update-rc.d dhcp3-server defaults
    7677fi
     78
     79BCCDID=$(/bin/egrep -o 'bccdid=([[digit:]]|[[:alpha:]]|-|/)+' /proc/cmdline | \
     80    /usr/bin/cut -d= -f2)
     81if [[ -n ${BCCDID}]; then
     82    /bin/sed -i -e "s/\!BCCD-CLIENT\!/${BCCDID}/g" /etc/dhcp3/*.conf
     83fi
Note: See TracChangeset for help on using the changeset viewer.