Changeset adcbdaf


Ignore:
Timestamp:
Sep 18, 2009 7:27:17 PM (15 years ago)
Author:
Ted Faber <faber@…>
Branches:
axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02
Children:
69692a9
Parents:
157ac77
Message:

Stop depending on the patched rc.accounts file to install accounts.

Location:
fedkit
Files:
1 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • fedkit/Makefile

    r157ac77 radcbdaf  
    11BINARIES=federate.sh smbmount.FreeBSD.pl smbmount.Linux.pl \
    2          make_hosts fed-tun.pl fed-tun.ucb.pl fed_evrepeater
    3 PATCHES=rc.accounts.patch
     2         make_hosts fed-tun.pl fed_evrepeater rc.fedaccounts
    43
    54fedkit.tgz:     ${BINARIES} ${PATCHES}
     
    76        mkdir -p /tmp/fedkit/local/federation/etc
    87        cp ${BINARIES} /tmp/fedkit/local/federation/bin
    9         cp ${PATCHES} /tmp/fedkit/local/federation/etc
    108        tar czf fedkit.tgz -C /tmp/fedkit local
    119        rm -rf /tmp/fedkit
  • fedkit/federate.sh

    r157ac77 radcbdaf  
    7373cp "$CONFIGDIR/client.conf" "/usr/local/federation/etc"
    7474chmod 644 "/usr/local/federation/etc/client.conf"
     75# Capture accounts to remove for rc.fedaccounts
     76$EMUDIR/tmcc -b accounts > /usr/local/federation/etc/old_accts
     77chmod 644 "/usr/local/federation/etc/old_accts"
    7578
    7679# Get our gateway, share, and mount user from the configuration file.
     
    120123cp /tmp/hosts /etc/hosts && rm /tmp/hosts
    121124
    122 # XXX:
    123 # The standard emulab rc.accounts script won't replace existing user accounts
    124 # with our new ones, so we have to patch it to do so.  This is obviously pretty
    125 # fragile and needs to change.  To make matters worse, our FBSD62-SMB images
    126 # contain the patched rc.accounts, so this patching step will fail there.
    127 
    128 if [ -e /usr/local/federation/etc/rc.accounts.patch ]; then
    129         cd "$EMUDIR/rc"
    130         patch -f < /usr/local/federation/etc/rc.accounts.patch
    131         cd /tmp
    132 fi
    133 
    134125#
    135126# Spin on our gateway!
     
    153144echo $GATEWAY > $BOSSNODE
    154145
     146# Capture new accounts  for rc.fedaccounts
     147$EMUDIR/tmcc -b accounts > /usr/local/federation/etc/accts
     148chmod 644 "/usr/local/federation/etc/accts"
    155149
    156150#
     
    178172rm -f /var/emulab/boot/tmcc/accounts
    179173
    180 $RCDIR/rc.accounts reconfig
     174/usr/local/federation/bin/rc.fedaccounts
    181175
    182176#
Note: See TracChangeset for help on using the changeset viewer.