From 35d35d9899013413e2a9fa10947db6421197c89c Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Mon, 13 Aug 2007 20:04:39 +0000 Subject: [PATCH 01/16] Fix version / revision. --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index 6a74161..425cec0 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,6 +1,6 @@ %define name vserver %define version 4.0 -%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central -- 2.43.0 From 6683e9f04af90549d879358442da3478c1a4ac98 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Mon, 13 Aug 2007 20:34:46 +0000 Subject: [PATCH 02/16] Bump minor version --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index 425cec0..d68aca8 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,5 +1,5 @@ %define name vserver -%define version 4.0 +%define version 4.1 %define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab -- 2.43.0 From 22624ef7417e1e117af0bace1dcff64c58481078 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Mon, 20 Aug 2007 20:15:20 +0000 Subject: [PATCH 03/16] Bump version --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index d68aca8..bcb7ac0 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,6 +1,6 @@ %define name vserver %define version 4.1 -%define release 1%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central -- 2.43.0 From a751c68e96594c5a34ef3579f3f4226d64726fae Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 24 Aug 2007 04:40:48 +0000 Subject: [PATCH 04/16] changed code that figures out which Fedora version we are running on --- vserver-reference.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index bcb7ac0..4bd7aa5 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -4,7 +4,7 @@ Vendor: PlanetLab Packager: PlanetLab Central -Distribution: PlanetLab 3.0 +Distribution: PlanetLab 4.0 URL: http://cvs.planet-lab.org/cvs/vserver-reference Summary: VServer reference image @@ -47,7 +47,7 @@ This package installs the RPMS necessary to create system ("root %build pushd vserver-reference -./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { print $4 } ' /etc/fedora-release || echo 4) +./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 6) ./system-packages.sh popd -- 2.43.0 From bcbdee42e45e8295d45c6518c70f88c65565114a Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 24 Aug 2007 04:43:06 +0000 Subject: [PATCH 05/16] default to FC4 if we cannot figure out Fedora version --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index 4bd7aa5..2a17379 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -47,7 +47,7 @@ This package installs the RPMS necessary to create system ("root %build pushd vserver-reference -./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 6) +./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4) ./system-packages.sh popd -- 2.43.0 From 91029451fc61906dcc37343fcfbdcded25da3435 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 24 Aug 2007 05:50:54 +0000 Subject: [PATCH 06/16] Fedora 7 does not pull in findutils via a dependency --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b9c3244..f1433f5 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: build.sh,v 1.16 2007/06/25 19:52:27 deisenst Exp $ +# $Id: build.sh,v 1.17 2007/08/13 18:02:33 faiyaza Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -55,6 +55,7 @@ gzip perl python tar +findutils ) usage() -- 2.43.0 From 1d81f6e98d08b2d9b1c7cc5bee6644a4ae5afd63 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 24 Aug 2007 06:06:04 +0000 Subject: [PATCH 07/16] more debugging output --- system-packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system-packages.sh b/system-packages.sh index 741e7a3..c1e07e9 100755 --- a/system-packages.sh +++ b/system-packages.sh @@ -6,7 +6,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: system-packages.sh,v 1.3 2006/07/01 18:13:31 mlhuang Exp $ +# $Id: system-packages.sh,v 1.4 2006/11/13 18:59:32 mlhuang Exp $ # export PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -73,7 +73,7 @@ for vref in planetflow ; do # Assert that we got it successfully if [ ! -f $rpms/$package-$version.$arch.rpm ] ; then - echo "Failed to fetch $package-$version.$arch.rpm from $repository" >&2 + echo "Failed to fetch $package-$version.$arch.rpm from $repository ($baseurl/$subdirectory)" >&2 false fi -- 2.43.0 From 9cf50f2b0222ea7158b8883b9ce3c3d1d01f219b Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 24 Aug 2007 06:21:04 +0000 Subject: [PATCH 08/16] make Fedora 7 compatible --- system-packages.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system-packages.sh b/system-packages.sh index c1e07e9..d225ed5 100755 --- a/system-packages.sh +++ b/system-packages.sh @@ -6,7 +6,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: system-packages.sh,v 1.4 2006/11/13 18:59:32 mlhuang Exp $ +# $Id: system-packages.sh,v 1.5 2007/08/24 06:06:04 mef Exp $ # export PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -63,7 +63,7 @@ for vref in planetflow ; do # downloading it from one of the common # subdirectories. echo "* $vref: $repository $package-$version.$arch.rpm" - for subdirectory in "" Fedora/RPMS $arch ; do + for subdirectory in "" Fedora/RPMS Fedora $arch ; do if curl --fail --silent --max-time 60 $baseurl/$subdirectory/$package-$version.$arch.rpm \ >$rpms/$package-$version.$arch.rpm ; then break -- 2.43.0 From c688f5e036e0b977bc80f3683055559e87a41b9a Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Tue, 28 Aug 2007 21:39:20 +0000 Subject: [PATCH 09/16] fix to selecting Fedora release number --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index 2a17379..b5a6c0b 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -47,7 +47,7 @@ This package installs the RPMS necessary to create system ("root %build pushd vserver-reference -./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($3=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4) +./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($2=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4) ./system-packages.sh popd -- 2.43.0 From e6bb141d31dd5d44f802f990525ab7eea7e589ec Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 31 Aug 2007 02:27:55 +0000 Subject: [PATCH 10/16] rely on build/build.common to pick default fedora release correctly --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index b5a6c0b..9b7201e 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -47,7 +47,7 @@ This package installs the RPMS necessary to create system ("root %build pushd vserver-reference -./build.sh -r $([ -f "/etc/fedora-release" ] && awk ' { if ($2=="Core") print $4; else print $3 } ' /etc/fedora-release || echo 4) +./build.sh ./system-packages.sh popd -- 2.43.0 From f5965b780a226ccfc2998278da6631f4a381b376 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Fri, 31 Aug 2007 02:29:35 +0000 Subject: [PATCH 11/16] use build/build.common functions --- build.sh | 73 ++++++++++++-------------------------------------------- 1 file changed, 15 insertions(+), 58 deletions(-) diff --git a/build.sh b/build.sh index f1433f5..be62285 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: build.sh,v 1.17 2007/08/13 18:02:33 faiyaza Exp $ +# $Id: build.sh,v 1.18.2.1 2007/08/30 16:39:09 mef Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -23,10 +23,14 @@ fi export PATH -# Release and architecture to install -releasever=4 -basearch=i386 +# build.common comes from the build module +. build.common +pl_process_fedora_options $@ +shiftcount=$? +shift $shiftcount + +# XXX this should be coming from some configuration file # Packages to install packagelist=( bash @@ -58,28 +62,9 @@ tar findutils ) -usage() -{ - 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 -} - -# Get options -while getopts "r:a:h" opt ; do - case $opt in - r) - releasever=$OPTARG - ;; - a) - basearch=$OPTARG - ;; - h|*) - usage - ;; - esac +# vserver-reference packages used for reference image +for package in "${packagelist[@]}" ; do + packages="$packages -p $package" done # Do not tolerate errors @@ -89,38 +74,10 @@ set -e vroot=$PWD/vservers/.vref/default install -d -m 755 $vroot -# Install default reference image -for package in "${packagelist[@]}" ; do - packages="$packages -p $package" -done -mkfedora -v -r $releasever -a $basearch -k $packages $vroot - -# Clean /dev -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 $vroot/dev/fd -# For df and linuxconf -touch $vroot/dev/hdv1 -# For TUN/TAP -mkdir -p $vroot/dev/net -mknod -m 600 $vroot/dev/net/tun c 10 200 -# For pseudo ttys -mkdir -p $vroot/dev/pts - -# Disable all services in reference image -chroot $vroot sh -c "/sbin/chkconfig --list | awk '{ print \$1 }' | xargs -i /sbin/chkconfig {} off" +# Populate a minimal /dev in the reference image +pl_makedevs $vroot -# This tells the Boot Manager that it is okay to update -# /etc/resolv.conf and /etc/hosts whenever the network configuration -# changes. Users are free to delete this file. -touch $vroot/etc/AUTO_UPDATE_NET_FILES +# Populate image with vserver-reference packages +pl_setup_chroot $vroot $packages exit 0 -- 2.43.0 From dd047efea7ffd5eb3b9c9203a5f173171bb5da3e Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Thu, 6 Sep 2007 20:41:23 +0000 Subject: [PATCH 12/16] added jre... :-( --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index be62285..5276fec 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: build.sh,v 1.18.2.1 2007/08/30 16:39:09 mef Exp $ +# $Id: build.sh,v 1.19 2007/08/31 02:28:35 mef Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -59,6 +59,7 @@ gzip perl python tar +jre-6u1-linux findutils ) -- 2.43.0 From 08eec02b97ab936532d3d08601b2b7edaece26c9 Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Fri, 7 Sep 2007 19:11:38 +0000 Subject: [PATCH 13/16] s/jre-somejunk/jre --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 5276fec..7aa40b9 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ # Mark Huang # Copyright (C) 2004-2006 The Trustees of Princeton University # -# $Id: build.sh,v 1.19 2007/08/31 02:28:35 mef Exp $ +# $Id: build.sh,v 1.20 2007/09/06 20:41:23 faiyaza Exp $ # PATH=/sbin:/bin:/usr/sbin:/usr/bin @@ -59,7 +59,7 @@ gzip perl python tar -jre-6u1-linux +jre findutils ) -- 2.43.0 From a98f6390f6de1706362b0e4690f63b622cdb746f Mon Sep 17 00:00:00 2001 From: Faiyaz Ahmed Date: Fri, 7 Sep 2007 19:17:45 +0000 Subject: [PATCH 14/16] bump build --- vserver-reference.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index 9b7201e..dccd05c 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,6 +1,6 @@ %define name vserver %define version 4.1 -%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release 3%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central -- 2.43.0 From 3a700b15ae5e43a6af4feed84613ebda7e95b9d7 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Sun, 14 Oct 2007 18:16:59 +0000 Subject: [PATCH 15/16] Module has been renamed from vserver-reference to VserverReference. Update the pushd to VserverReference. --- vserver-reference.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vserver-reference.spec b/vserver-reference.spec index dccd05c..bdac8ff 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -46,7 +46,7 @@ This package installs the RPMS necessary to create system ("root %setup -q %build -pushd vserver-reference +pushd VserverReference ./build.sh ./system-packages.sh popd @@ -54,7 +54,7 @@ popd %install rm -rf $RPM_BUILD_ROOT -pushd vserver-reference +pushd VserverReference install -D -m 755 vserver-reference.init $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference install -D -m 644 vserver-reference.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference find vservers | cpio -p -d -u $RPM_BUILD_ROOT/ -- 2.43.0 From d04607a7a1197abf9c47db3d406620a56d42ac72 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Mon, 15 Oct 2007 16:29:50 +0000 Subject: [PATCH 16/16] Add in filesystem package explicitly. --- build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sh b/build.sh index 7aa40b9..5859421 100755 --- a/build.sh +++ b/build.sh @@ -61,6 +61,7 @@ python tar jre findutils +filesystem ) # vserver-reference packages used for reference image -- 2.43.0