-#
-
%define nodefamily %{pldistro}-%{distroname}-%{_arch}
%define extensionfamily %{distroname}-%{_arch}
-%define name bootstrapfs-%{nodefamily}
-%define version 2.0
-%define taglevel 14
+%define name nodeimage-%{nodefamily}
+%define version 2.1
+%define taglevel 1
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
Distribution: PlanetLab %{plrelease}
URL: %{SCMURL}
-Summary: The PlanetLab Bootstrap Filesystems for %{nodefamily}
+Summary: The PlanetLab nodeimage filesystems for %{nodefamily}
Name: %{name}
Version: %{version}
Release: %{release}
# this is for plc.d/packages that uses ed for hacking yumgroups.xml
Requires: ed
+# 5.1 now uses new name nodeimage
+Obsoletes: bootstrapfs-%{nodefamily}
# 5.0 now has 3-fold nodefamily
%define obsolete_nodefamily %{pldistro}-%{_arch}
Obsoletes: bootstrapfs-%{obsolete_nodefamily}
%description
-The PlanetLab Bootstrap Filesystem(s) are downloaded by the
-BootManager to instantiate a node with a new filesystem.
+The PlanetLab nodeimage filesystem is downloaded by the
+BootManager to reinstall a node with a new filesystem.
%package plain
-Summary: The (uncompressed) PlanetLab Bootstrap Filesystems for %{nodefamily}
+Summary: The (uncompressed) PlanetLab nodeimage filesystem for %{nodefamily}
Group: System Environment/Base
%description plain
This package provides the same functions as %{name} but with uncompressed tarball for faster tests.
%build
############################## node-side
-[ -d bootstrapfs ] || ln -s BootstrapFS bootstrapfs
-pushd bootstrapfs
+pushd nodeimage
./build.sh %{pldistro}
for tar in *.tar *.tar.bz2; do
echo "* Computing SHA1 checksum for $tar"
############################## server-side
# ship all fcdistros for multi-fcdistros myplc, and let the php scripts do the right thing
-pushd bootstrapfs/nodeconfig/yum
+pushd nodeimage/nodeconfig/yum
# scan fcdistros and catenate all repos in 'stock.repo' so db-config can be distro-independant
for fcdistro in $(ls); do
[ -d $fcdistro ] || continue
rm -rf $RPM_BUILD_ROOT
############################## node-side
-pushd bootstrapfs
+pushd nodeimage
for out in *.tar *.tar.bz2 ; do
echo "* Installing $out"
install -D -m 644 $out $RPM_BUILD_ROOT/var/www/html/boot/$out
############################## server-side
# ship all fcdistros for multi-fcdistros myplc, and let the php scripts do the right thing
-pushd bootstrapfs
+pushd nodeimage
echo "* Installing MyPLC-side nodes yum config utilities (support for multi-fcdistro)"
mkdir -p $RPM_BUILD_ROOT/var/www/html/yum/
rsync -av ./nodeconfig/yum/ $RPM_BUILD_ROOT/var/www/html/yum/