Changeset 3243 in /cluster/svnroot


Ignore:
Timestamp:
Jun 21, 2011 7:29:32 PM (9 years ago)
Author:
skylar
Message:

rolling back changes for now (#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

    r3242 r3243  
    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

    r3242 r3243  
    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

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