X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=blobdiff_plain;f=vserver-reference.spec;h=5d58877a26d6c192d1d62cd52c6c5acb36b30a79;hp=1f5d5cf249863fbe5ab428879666f5bc2ab929a0;hb=6daac782c6b03a083d178d58af30f3bc6c49b06f;hpb=53f0e29ae53cbe2bc983ffa0ea6a9aea86fbfe88 diff --git a/vserver-reference.spec b/vserver-reference.spec index 1f5d5cf..5d58877 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,13 +1,19 @@ -%define name vserver-reference -%define version 3.1 -%define release 1.planetlab%{?date:.%{date}} +# +# $Id$ +# +%define url $URL$ -Vendor: PlanetLab -Packager: PlanetLab Central -Distribution: PlanetLab 3.0 -URL: http://cvs.planet-lab.org/cvs/vserver-reference +%define slicefamily %{pldistro}-%{distroname}-%{_arch} -Summary: VServer reference image +%define name vserver +%define version 4.2 +%define taglevel 10 + +# pldistro already in the rpm name +#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} +%define release %{taglevel}%{?date:.%{date}} + +Summary: VServer reference image for slice family %{slicefamily} Name: %{name} Version: %{version} Release: %{release} @@ -15,101 +21,139 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Requires: util-vserver, e2fsprogs, yum +# this would not be right +#BuildArch: noarch + +Vendor: PlanetLab +Packager: PlanetLab Central +Distribution: PlanetLab %{plrelease} +URL: %(echo %{url} | cut -d ' ' -f 2) -AutoReqProv: no %define debug_package %{nil} %description +This package does not really exist. + +%package %{slicefamily} +Summary: VServer reference image +Group: Applications/System +AutoReqProv: no +Requires: util-vserver, e2fsprogs, yum +Requires(pre): util-vserver-core, findutils + +%description %{slicefamily} This package creates the virtual server (VServer) reference image used as the installation base for new PlanetLab slivers. +%package systemslices-%{slicefamily} +Summary: System slice packages +Group: Applications/System +Requires: vserver-%{slicefamily} >= %{version}-%{release} +AutoReqProv: no + +%description systemslices-%{slicefamily} +This package installs the stubs necessary to create system slices +(typically planetflow) on top of the reference image. + %prep %setup -q %build -RPM_BUILD_DIR=$RPM_BUILD_DIR ./%{name}.init +pushd VserverReference +./build.sh %{pldistro} %{slicefamily} +popd %install rm -rf $RPM_BUILD_ROOT -find vservers/vserver-reference | cpio -p -d -u $RPM_BUILD_ROOT/ -# If run under sudo, allow user to delete the build directory -if [ -n "$SUDO_USER" ] ; then - chown -R $SUDO_USER . -fi +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 +install -D -m 644 vserver-reference.logrotate $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/vserver-reference +find vservers | cpio -p -d -u $RPM_BUILD_ROOT/ +popd %clean rm -rf $RPM_BUILD_ROOT -# If run under sudo, allow user to delete the built RPM +# If run under sudo if [ -n "$SUDO_USER" ] ; then - chown $SUDO_USER %{_rpmdir}/%{_arch}/%{name}-%{version}-%{release}.%{_arch}.rpm + # Allow user to delete the build directory + chown -h -R $SUDO_USER . + # Some temporary cdroot files like /var/empty/sshd and + # /usr/bin/sudo get created with non-readable permissions. + find . -not -perm +0600 -exec chmod u+rw {} \; + # Allow user to delete the built RPM(s) + chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} fi -%files +%files %{slicefamily} +%defattr(-,root,root) +%{_initrddir}/vserver-reference +%{_sysconfdir}/cron.d/vserver-reference +%{_sysconfdir}/logrotate.d/vserver-reference +/vservers/.vref/%{slicefamily} + +%files systemslices-%{slicefamily} %defattr(-,root,root) -/vservers/vserver-reference +/vservers/.vstub/%{slicefamily} %define vcached_pid /var/run/vcached.pid -%pre -# Stop vcached -if [ -r %{vcached_pid} ] ; then - kill $(cat %{vcached_pid}) -fi -touch %{vcached_pid} +# XXX: UGLY HACK +%pre %{slicefamily} +test -d /vservers/.vref/%{slicefamily} && \ + find /vservers/.vref/%{slicefamily} -print0 | xargs -0 setattr --~iunlink +: -# vcached will clean up .vtmp later -mkdir -p /vservers/.vtmp -if [ -d /vservers/vserver-reference ] ; then - mv /vservers/vserver-reference /vservers/.vtmp/vserver-reference.$RANDOM -fi -if [ -d /vservers/.vcache ] ; then - mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM -fi +%post %{slicefamily} +chkconfig --add vserver-reference +chkconfig vserver-reference on +# store the default for nodemanager +[ -f /etc/planetlab/slicefamily ] || { mkdir -p /etc/planetlab ; echo %{slicefamily} > /etc/planetlab/slicefamily ; } +[ "$PL_BOOTCD" = "1" ] || service vserver-reference start -%post -VROOT=/vservers/vserver-reference - -# Make sure the barrier bit is set -chmod 0000 /vservers -setattr --barrier /vservers - -# Copy configuration files from host to reference image -for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do - if [ -f $file ] ; then - echo $file | cpio -p -d -u $VROOT - fi -done - -# Install and parse Management Authority (MA) configuration -if [ -r /etc/planetlab/primary_ma ] ; then - . /etc/planetlab/primary_ma - install -D -m 644 /etc/planetlab/primary_ma $VROOT/etc/planetlab/primary_ma -elif [ -d /mnt/cdrom/bootme/cacert ] ; then - MA_NAME="PlanetLab Central" - MA_BOOT_SERVER=$(head -1 /mnt/cdrom/bootme/BOOTSERVER) - MA_BOOT_SERVER_CACERT=/mnt/cdrom/bootme/cacert/$MA_BOOT_SERVER/cacert.pem - mkdir -p $VROOT/etc/planetlab - cat > $VROOT/etc/planetlab/primary_ma < - VserverReference-4.2-10 +- Use the correct yum.conf to get access to required packages such as pf2slice. -# Also install in /mnt/cdrom/bootme for backward compatibility -install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/mnt/cdrom/bootme/cacert/$MA_BOOT_SERVER/cacert.pem -echo $MA_BOOT_SERVER > $VROOT/mnt/cdrom/bootme/BOOTSERVER +* Mon Jun 30 2008 Daniel Hokka Zakrisson - VserverReference-4.2-9 +- Scriptlet fix. -# Allow vcached to run again -rm -f %{vcached_pid} +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-8 +- Unset the immutable and iunlink bits to make sure we can install the package. + +* Fri Jun 27 2008 Daniel Hokka Zakrisson - VserverReference-4.2-7 +- Let rpm remove the files. + +* Thu Apr 24 2008 Thierry Parmentelat - VserverReference-4.2-6 +- empty change, this should *not* be a noarch package + +* Mon Apr 21 2008 Thierry Parmentelat - VserverReference-4.2-5 +- tweaked pre script that was removing everything under /vservers/.vref +- dismantle vcached (as far as this module is concerned) +- sudo to log in /var/log/sudo + +* Fri Mar 28 2008 Thierry Parmentelat - VserverReference-4.2-3 VserverReference-4.2-4 +- bugfix, 4.2-3 was broken as the slicefamily stamp could not get created, thus nm issued 'vuseradd -t default' + +* Wed Mar 26 2008 Thierry Parmentelat - VserverReference-4.2-2 VserverReference-4.2-3 +- a single node can now install several instances of this package +- package name contains slicefamily - -- +- setattr --iunlink or --~iunlink appropriately (uses /proc/virtual/info) +- does not copy yum.conf from host anymore + +* Fri Feb 15 2008 Thierry Parmentelat - vserver-4.2-1 vserver-4.2-2 +- vserver image to properly use links rather than copies + +* Thu Jan 31 2008 Thierry Parmentelat - vserver-4.2-0 vserver-4.2-1 +- more careful scan of the vserver-*.pkgs image specifications -%changelog * Tue Sep 1 2005 Mark Huang 3.1-1.planetlab - Pre-package vserver-reference instead of building it on nodes