Show
Ignore:
Timestamp:
09/18/09 19:27:17 (3 years ago)
Author:
Ted Faber <faber@…>
Children:
69692a9b4fdb882eb9deddb4da2c105ba1a2e18d
Parents:
157ac77a0528c9fa35cf7653bd002564735f69f2
git-committer:
Ted Faber <faber@isi.edu> / 2009-09-19T02:27:17Z+0000
Message:

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

Location:
fedkit
Files:
1 added
2 removed
2 modified

Legend:

Unmodified
Added
Removed

  • fedkit/Makefile

    r9c166cf 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

    r4450b24 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#