From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 3 Apr 2006 19:40:23 +0000 (+0000)
Subject: - use mkfedora
X-Git-Tag: myplc-0_4-rc1~32
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=5019ed42fbc721dbfc9abc3ac0f89bcaecf2bc4a

- use mkfedora
---

diff --git a/support-files/buildnode.sh b/support-files/buildnode.sh
index 7fe18e3..53b18b7 100755
--- a/support-files/buildnode.sh
+++ b/support-files/buildnode.sh
@@ -1,147 +1,82 @@
 #!/bin/bash
 #
 # Build PlanetLab-Bootstrap.tar.bz2, the reference image for PlanetLab
-# nodes. Requires the web and boot servers to be up, which complicates
-# bootstrap. Alternatively, we could require the build server to host
-# a local yum repository. Already, it is required to run the same
-# major version of yum as the nodes.
+# nodes.
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2005 The Trustees of Princeton University
+# Copyright (C) 2005-2006 The Trustees of Princeton University
 #
-# $Id: buildnode.sh,v 1.4 2006/03/10 18:20:34 mlhuang Exp $
+# $Id: buildnode.sh,v 1.5 2006/03/21 14:57:29 mlhuang Exp $
 #
 
-# Get the production /etc/yum.conf file. XXX When MAs begin deploying
-# their own boot servers and/or code, this will have to change.
-curl --silent http://boot.planet-lab.org/$(curl --silent --insecure --form node_id=1 --form file=/etc/yum.conf https://boot.planet-lab.org/db/plnodeconf/getsinglefile.php) > yum.conf
-
-# Solve the bootstrap problem by including any just built packages in
-# the yum configuration. This cooperates with the PlanetLab build
-# system.
-if [ -n "$RPM_BUILD_DIR" ] ; then
-    # Remove any [PlanetLab*] sections
-    sed -i -f - yum.conf <<EOF
-# Match lines between [PlanetLab*] and the next [*
-/\[PlanetLab.*\]/I,/^\[/{
-# Delete [PlanetLab*]
-/\[PlanetLab.*\]/Id
-# Done when we see [*
-/^\[/b
-# Otherwise delete
-d
-}
-EOF
-
-    # And replace them with a section for the RPMS that were just built
-    yum-arch $(dirname $RPM_BUILD_DIR)/RPMS
-    createrepo $(dirname $RPM_BUILD_DIR)/RPMS || :
-    # If run under sudo, allow user to delete the headers/ and
-    # repodata/ directories.
-    if [ -n "$SUDO_USER" ] ; then
-	chown -R $SUDO_USER $(dirname $RPM_BUILD_DIR)/RPMS
-    fi
-    cat >> yum.conf <<EOF
-[Bootstrap]
-name=Bootstrap RPMS -- $(dirname $RPM_BUILD_DIR)/RPMS/
-baseurl=file://$(dirname $RPM_BUILD_DIR)/RPMS/
-EOF
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+# In both a normal CVS environment and a PlanetLab RPM
+# build environment, all of our dependencies are checked out into
+# directories at the same level as us.
+if [ -d ../../build ] ; then
+    PATH=$PATH:../../build
+    srcdir=../..
+else
+    echo "Error: Could not find $(cd ../.. && pwd -P)/build/"
+    exit 1
 fi
 
-# Make /
-VROOT=$PWD/PlanetLab-Bootstrap
-install -d -m 755 $VROOT
+export PATH
 
-MAKEDEV ()
+# Release and architecture to install
+releasever=2
+basearch=i386
+
+usage()
 {
-    rm -rf $VROOT/dev
-    mkdir -p $VROOT/dev
-    mknod -m 666 $VROOT/dev/null c 1 3
-    mknod -m 666 $VROOT/dev/zero c 1 5
-    mknod -m 666 $VROOT/dev/full c 1 7
-    mknod -m 644 $VROOT/dev/random c 1 8
-    mknod -m 644 $VROOT/dev/urandom c 1 9
-    mknod -m 666 $VROOT/dev/tty c 5 0
-    mknod -m 666 $VROOT/dev/ptmx c 5 2
-    # For bash command substitution
-    ln -nsf ../proc/self/fd /dev/fd
-    # For df and linuxconf
-    touch $VROOT/dev/hdv1
+    echo "Usage: build.sh [OPTION]..."
+    echo "	-r release	Fedora release number (default: $releasever)"
+    echo "	-a arch		Fedora architecture (default: $basearch)"
+    echo "	-h		This message"
+    exit 1
 }
 
-# Initialize /dev in reference image
-MAKEDEV
-
-# Mount /dev/pts in reference image
-mkdir -p $VROOT/dev/pts
-mount -t devpts none $VROOT/dev/pts
-
-# Mount /proc in reference image
-mkdir -p $VROOT/proc
-mount -t proc none $VROOT/proc
-
-# Clean up before exiting if anything goes wrong
-trap "umount $VROOT/proc ; umount $VROOT/dev/pts ; exit 255" ERR
-
-# Create a dummy /etc/fstab in reference image
-mkdir -p $VROOT/etc
-cat > $VROOT/etc/fstab <<EOF
-# This fake fstab exists only to please df and linuxconf.
-/dev/hdv1	/	ext2	defaults	1 1
-EOF
-cp $VROOT/etc/fstab $VROOT/etc/mtab
-
-# Prevent all locales from being installed in reference image
-mkdir -p $VROOT/etc/rpm
-cat > $VROOT/etc/rpm/macros <<EOF
-%_install_langs en_US:en
-%_excludedocs 1
-%__file_context_path /dev/null
-EOF
-
-# Trick rpm and yum, who read the real root /etc/rpm/macros file
-# rather than the one installed in the reference image, despite what
-# you might expect the --root and --installroot options to mean. Both
-# programs always read $HOME/.rpmmacros.
-export HOME=$PWD
-ln -sf $VROOT/etc/rpm/macros $PWD/.rpmmacros
-
-# Initialize RPM database in reference image
-mkdir -p $VROOT/var/lib/rpm
-rpm --root $VROOT --initdb
+# Get options
+while getopts "r:a:h" opt ; do
+    case $opt in
+	r)
+	    releasever=$OPTARG
+	    ;;
+	a)
+	    basearch=$OPTARG
+	    ;;
+	h|*)
+	    usage
+	    ;;
+    esac
+done
 
-# glibc must be specified explicitly for the correct arch to be chosen.
-yum -c yum.conf --installroot=$VROOT -y install glibc yum
+# Do not tolerate errors
+set -e
 
-# yum will annoyingly use the /etc/yum.conf file in the --installroot
-# even if overridden with -c
-rm -f $VROOT/etc/yum.conf
+VROOT=$PWD/PlanetLab-Bootstrap
+install -d -m 755 $VROOT
 
-# Some of the PlanetLab RPMs may attempt to call /sbin/runlevel to
-# determine if the installation is running inside the BootCD
-# environment. We would like to pretend that we are, so make sure
-# /sbin/runlevel returns 'unknown'.
-rm -f $VROOT/var/run/utmp
+# Some of the PlanetLab RPMs attempt to (re)start themselves in %post,
+# unless the installation is running inside the BootCD environment. We
+# would like to pretend that we are.
 export PL_BOOTCD=1
 
-# Go, baby, go
-yum -c yum.conf --installroot=$VROOT -y groupinstall PlanetLab
-
-# Remove stale RPM locks
-rm -f $VROOT/var/lib/rpm/__db*
-
-# Clean up /dev in reference image
-umount $VROOT/dev/pts
+# Install the "PlanetLab" group. This requires that the PlanetLab
+# build system install the appropriate yumgroups.xml file (currently
+# build/groups/v3_yumgroups.xml) in $RPM_BUILD_DIR/../RPMS/ and that
+# mkfedora runs either yum-arch or createrepo on that directory.
+mkfedora -v -r $releasever -a $basearch -g PlanetLab $VROOT
 
 # Disable unnecessary services
+echo "* Disabling unnecessary services"
 for service in netfs rawdevices cpuspeed smartd ; do
     /usr/sbin/chroot $VROOT /sbin/chkconfig $service off
 done
 
-# Clean up
-umount $VROOT/proc
-
 # Build tarball
+echo "* Building bootstrap tarball"
 tar -cpjf PlanetLab-Bootstrap.tar.bz2 -C $VROOT .
 rm -rf $VROOT