minor fixes

diff --git a/config.planetlab/bootstrapfs.post b/config.planetlab/bootstrapfs.post
index 2413251..0e722a8 100644 (file)
--- a/config.planetlab/bootstrapfs.post
+++ b/config.planetlab/bootstrapfs.post
@@ -30,6 +30,8 @@ chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
 
 # NOTE:  This is added to relieve one site's Cisco router configuration that
 # fails to recognize the host once the arping is sent out.
+# NOTE: this is pretty fragile, and fails on fedora 10 that as of today (oct. 20 2009) 
+# has initscripts-8.86.3-1.i386 which reads almost identical but with /sbin/arping instead
 cat <<\EOF | patch -d ${vdir}/etc/sysconfig/network-scripts/
 --- ifup-eth   2008-07-08 13:19:49.000000000 -0400
 +++ ifup-eth-orig      2008-07-08 13:20:02.000000000 -0400

diff --git a/config.planetlab/vserver.post b/config.planetlab/vserver.post
index 1c650a8..fb304df 100644 (file)
--- a/config.planetlab/vserver.post
+++ b/config.planetlab/vserver.post
@@ -14,4 +14,4 @@ sed -i -e "s/root:\*/root:/" ${vdir}/etc/passwd
 
 # modify the sudoers file to remove the 'requiretty' attribute
 echo "Removing requiretty from default /etc/sudoers file"
-sed -i -e "s/Defaults    requiretty/#Defaults    requiretty/" ${vdir}/etc/sudoers
+sed -i -e 's,^\(Defaults.*requiretty\),#\1,' /etc/sudoers