Changeset adcbdaf

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:

• Makefile (modified) (2 diffs)
• fed-tun.ucb.pl (deleted)
• federate.sh (modified) (4 diffs)
• rc.accounts.patch (deleted)
• rc.fedaccounts (added)

fedkit/Makefile

@@ -1 +1 @@
 BINARIES=federate.sh smbmount.FreeBSD.pl smbmount.Linux.pl \
-         make_hosts fed-tun.pl fed-tun.ucb.pl fed_evrepeater
-PATCHES=rc.accounts.patch
+         make_hosts fed-tun.pl fed_evrepeater rc.fedaccounts
 
 fedkit.tgz:     ${BINARIES} ${PATCHES}
@@ -7 +6 @@
         mkdir -p /tmp/fedkit/local/federation/etc
         cp ${BINARIES} /tmp/fedkit/local/federation/bin
-        cp ${PATCHES} /tmp/fedkit/local/federation/etc
         tar czf fedkit.tgz -C /tmp/fedkit local
         rm -rf /tmp/fedkit

fedkit/federate.sh

@@ -73 +73 @@
 cp "$CONFIGDIR/client.conf" "/usr/local/federation/etc"
 chmod 644 "/usr/local/federation/etc/client.conf"
+# Capture accounts to remove for rc.fedaccounts
+$EMUDIR/tmcc -b accounts > /usr/local/federation/etc/old_accts
+chmod 644 "/usr/local/federation/etc/old_accts"
 
 # Get our gateway, share, and mount user from the configuration file.
@@ -120 +123 @@
 cp /tmp/hosts /etc/hosts && rm /tmp/hosts
 
-# XXX:
-# The standard emulab rc.accounts script won't replace existing user accounts
-# with our new ones, so we have to patch it to do so.  This is obviously pretty
-# fragile and needs to change.  To make matters worse, our FBSD62-SMB images
-# contain the patched rc.accounts, so this patching step will fail there.
-
-if [ -e /usr/local/federation/etc/rc.accounts.patch ]; then
-        cd "$EMUDIR/rc"
-        patch -f < /usr/local/federation/etc/rc.accounts.patch
-        cd /tmp
-fi
-
 #
 # Spin on our gateway!
@@ -153 +144 @@
 echo $GATEWAY > $BOSSNODE
 
+# Capture new accounts  for rc.fedaccounts
+$EMUDIR/tmcc -b accounts > /usr/local/federation/etc/accts
+chmod 644 "/usr/local/federation/etc/accts"
 
 #
@@ -178 +172 @@
 rm -f /var/emulab/boot/tmcc/accounts
 
-$RCDIR/rc.accounts reconfig
+/usr/local/federation/bin/rc.fedaccounts
 
 #