Commits

Anonymous committed 4cd021b

Fix update.conf to copy customizations into the jails and remove old deprecated jails

Comments (0)

Files changed (1)

updated/update.conf

 #    an update to the slaves.  the function name MUST remain the same and the so must 
 #    everythin else.  The rest of the update system looks for this function.
 
-REMOTEVERSION=20131204c
+REMOTEVERSION=20131204d
 CONF=/etc/vlbuildslave/slavehost.conf
 BKCONF=/etc/vlbuildslave/slavehost.conf.backup
 LOGFILE=/var/log/vlbuildbot-updated.log
 #cp ${CHROOTS[32c7p1]}/CHROOT-RO/etc/wgetrc $CHROOT32/CHROOT-RO/etc/
 #cp ${CHROOTS[32c7p1]}/CHROOT-RO/etc/lftp.conf $CHROOT32/CHROOT-RO/etc/
 # Copy the slapt-getrc for 7.1
-cp $BOTREPO/slapt-getrc.32c7p1 CHROOT-RO/etc/slapt-get/slapt-getrc
+cp $BOTREPO/slapt-getrc.32c7p1 $JAILS/$CHROOT32/CHROOT-RO/etc/slapt-get/slapt-getrc
 # Set the resolv.conf to google dns servers
-echo "nameserver 8.8.8.8" > $CHROOT32/CHROOT-RO/etc/resolv.conf
+echo "nameserver 8.8.8.8" > $JAILS/$CHROOT32/CHROOT-RO/etc/resolv.conf
 # Copy the i586 stuff
-cp $BOTREPO/chroot/x86/bin/* $CHROOT32/CHROOT-RO/bin/
+cp -var $BOTREPO/chroot/x86/bin/* $JAILS/$CHROOT32/CHROOT-RO/bin/
 # copy the requiredbuilder hacks
-cp $BOTREPO/chroot/usr/bin/* $CHROOT32/CHROOT-RO/usr/bin/
+cp -var $BOTREPO/chroot/usr/bin/* $JAILS/$CHROOT32/CHROOT-RO/usr/bin/
 # Copy time settings from the host to the guest
 for file in localtime localtime-copied-from; do
-        cp /etc/$file $CHROOT64/CHROOT-RO/etc/ -arxp
+        cp /etc/$file $JAILS/$CHROOT32/CHROOT-RO/etc/ -arxp
 done
 
 cd ..
 #cp ${CHROOTS[64c7p1]}/CHROOT-RO/etc/lftp.conf $CHROOT64/CHROOT-RO/etc/
 
 # Copy slapt-getrc for 64bit 7.1
-cp $BOTREPO/slapt-getrc.64c7p1 $CHROOT64/CHROOT-RO/etc/slapt-get/slapt-getrc
+cp $BOTREPO/slapt-getrc.64c7p1 $JAILS/$CHROOT64/CHROOT-RO/etc/slapt-get/slapt-getrc
 # resolv.conf
-echo "nameserver 8.8.8.8" > $CHROOT64/CHROOT-RO/etc/resolv.conf
+echo "nameserver 8.8.8.8" > $JAILS/$CHROOT64/CHROOT-RO/etc/resolv.conf
 # Copy the chroot hacks
-cp $BOTREPO/chroot/usr/bin/* $CHROOT64/CHROOT-RO/usr/bin/
+cp -var $BOTREPO/chroot/usr/bin/* $JAILS/$CHROOT64/CHROOT-RO/usr/bin/
 # Copy time settings from the host to the guest
 for file in localtime localtime-copied-from; do
-	cp /etc/$file $CHROOT64/CHROOT-RO/etc/ -arxp
+	cp /etc/$file $JAILS/$CHROOT64/CHROOT-RO/etc/ -arxp
 done
 
 
 sed -i "s|^\(CHROOTS\[32c7p1\]=.*\)|CHROOTS\[32c7p1\]=\$JAILS/$CHROOT32|g" $CONF
 sed -i "s|^\(CHROOTS\[64c7p1\]=.*\)|CHROOTS\[64c7p1\]=\$JAILS/$CHROOT64|g" $CONF
 
+# check for the old chroots and delete them
+for dir in VL-7.1-BB-RC4 VL64-7.1-BB-RC4 ; do
+	if [ -d $JAILS/$dir ]; then
+		echo "Old jail $dir found.  Removing it."
+	fi
+done
+
 # remove the lock file when we are done
 rm -rf /tmp/vlbuildbot-updating.lock
 )
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.