X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=1616904e16da6df694d0d4931de297b10b6c302b;hb=e01407b25d5e55e4ff342bcd95998fc5f1263e62;hp=f3272bfa554844cbd9a0f6db148ba6fae6d99984;hpb=2da375cd6e7c82a21e049eeb7d72f3eafa2f859a;p=sliceimage.git diff --git a/vserver-reference.spec b/vserver-reference.spec index f3272bf..1616904 100644 --- a/vserver-reference.spec +++ b/vserver-reference.spec @@ -1,11 +1,11 @@ -%define name vserver-reference -%define version 3.0 -%define release 1.planetlab%{?date:.%{date}} +%define name vserver +%define version 4.0 +%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab 3.0 -URL: http://www.planet-lab.org +URL: http://cvs.planet-lab.org/cvs/vserver-reference Summary: VServer reference image Name: %{name} @@ -15,175 +15,130 @@ Source0: %{name}-%{version}.tar.bz2 License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildArchitectures: noarch -Requires: util-vserver -AutoReqProv: no -BuildRequires: e2fsprogs, yum +Requires: util-vserver, e2fsprogs, yum +Requires(pre): coreutils %define debug_package %{nil} %description +This package does not really exist. + +%package reference +Summary: VServer reference image +Group: Applications/System +AutoReqProv: no + +%description reference This package creates the virtual server (VServer) reference image used as the installation base for new PlanetLab slivers. -%define vrootdir /vservers -%define vrefdir %{vrootdir}/%{name} -%define installroot $RPM_BUILD_ROOT%{vrefdir} +%package system-packages +Summary: System slice packages +Group: Applications/System +Requires: vserver-reference = %{version}-%{release} +AutoReqProv: no + +%description system-packages +This package installs the RPMS necessary to create system ("root + resource") slices from the virtual server (VServer) reference image. %prep %setup -q -# chattr, mknod, mount, yum all require root privileges. Yech. -if [ $UID -ne 0 ] ; then - echo You must be root to build the %{name} package. - false -fi - %build +pushd vserver-reference +./build.sh +./system-packages.sh +popd %install -# Running as root -export PATH="$PATH:/sbin:/usr/sbin" - -# Clean up -if grep -q %{installroot}/proc /proc/mounts ; then - umount %{installroot}/proc -fi -if grep -q %{installroot}/dev/pts /proc/mounts ; then - umount %{installroot}/dev/pts -fi -chattr -R -i $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT -# Make /vservers -mkdir -p $RPM_BUILD_ROOT%{vrootdir} -chmod 000 $RPM_BUILD_ROOT%{vrootdir} -chattr +t $RPM_BUILD_ROOT%{vrootdir} - -# Make /vservers/vserver-reference -mkdir -p %{installroot} -chattr -t %{installroot} -chmod 755 %{installroot} - -MAKEDEV () -{ - if grep -q %{installroot}/dev/pts /proc/mounts ; then - umount %{installroot}/dev/pts - fi - rm -rf %{installroot}/dev - mkdir -p %{installroot}/dev - mknod -m 666 %{installroot}/dev/null c 1 3 - mknod -m 666 %{installroot}/dev/zero c 1 5 - mknod -m 666 %{installroot}/dev/full c 1 7 - mknod -m 644 %{installroot}/dev/random c 1 8 - mknod -m 644 %{installroot}/dev/urandom c 1 9 - mknod -m 666 %{installroot}/dev/tty c 5 0 - mknod -m 666 %{installroot}/dev/ptmx c 5 2 - touch %{installroot}/dev/hdv1 -} - -# Initialize /dev in reference image -MAKEDEV - -# Mount /dev/pts in reference image -mkdir -p %{installroot}/dev/pts -mount -t devpts none %{installroot}/dev/pts - -# Mount /proc in reference image -mkdir -p %{installroot}/proc -mount -t proc none %{installroot}/proc - -# Create a dummy /etc/fstab in reference image -mkdir -p %{installroot}/etc -cat > %{installroot}/etc/fstab < %{installroot}/etc/rpm/macros - -# Initialize RPM database in reference image -mkdir -p %{installroot}/var/lib/rpm -rpm --root %{installroot} --initdb - -# XXX Get yum.conf from PlanetLabConf - -# Install RPMs in reference image -yum -c ./yum.conf \ -%{?sslcertdir:--sslcertdir=%{sslcertdir}} \ ---installroot=%{installroot} \ --y groupinstall VServer - -# Freshen any new RPMs -find %{_topdir}/RPMS -type f | xargs rpm --root %{installroot} -F - -# Clean up /dev in reference image -MAKEDEV - -# Configure authentication in reference image -chroot %{installroot} authconfig --nostart --kickstart --enablemd5 --enableshadow || : - -# Disable all services in reference image -chroot %{installroot} /bin/sh -c "chkconfig --list | awk '{ print \$1 }' | xargs -i chkconfig {} off" - -# Clean up -if grep -q %{installroot}/proc /proc/mounts ; then - umount %{installroot}/proc -fi -if grep -q %{installroot}/dev/pts /proc/mounts ; then - umount %{installroot}/dev/pts -fi +pushd vserver-reference +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/ +popd %clean -# Running as root -export PATH="$PATH:/sbin:/usr/sbin" +rm -rf $RPM_BUILD_ROOT -# Clean up -if grep -q %{installroot}/proc /proc/mounts ; then - umount %{installroot}/proc +# If run under sudo +if [ -n "$SUDO_USER" ] ; then + # Allow user to delete the build directory + chown -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 -R $SUDO_USER %{_rpmdir}/%{_arch} fi -if grep -q %{installroot}/dev/pts /proc/mounts ; then - umount %{installroot}/dev/pts + +%files reference +%defattr(-,root,root) +%{_initrddir}/vserver-reference +%{_sysconfdir}/cron.d/vserver-reference +/vservers/vserver-reference + +%files system-packages +%defattr(-,root,root) +/vservers/system-packages + +%define vcached_pid /var/run/vcached.pid + +%pre reference +# Stop vcached +if [ -r %{vcached_pid} ] ; then + kill $(cat %{vcached_pid}) fi -chattr -R -i $RPM_BUILD_ROOT -rm -rf $RPM_BUILD_ROOT +echo $$ > %{vcached_pid} -# Make sure the original user can remove the generated files -if [ -n "$SUDO_UID" ] ; then - chown -R $SUDO_UID.$SUDO_GID . - for i in \ - %{_topdir}/BUILD \ - %{_topdir}/RPMS/noarch/%{name}-%{version}-%{release}.noarch.rpm \ - %{_topdir}/RPMS/noarch \ - %{_topdir}/RPMS/ \ - %{_topdir}/SRPMS/%{name}-%{version}-%{release}.src.rpm \ - %{_topdir}/SRPMS/ ; do - if [ -e $i ] ; then - chown $SUDO_UID.$SUDO_GID $i - fi - done +# 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 -# 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 %{vrefdir} - fi -done +# Allow vcached to run again +rm -f %{vcached_pid} -%preun +%post reference +chkconfig --add vserver-reference +chkconfig vserver-reference on +[ "$PL_BOOTCD" = "1" ] || service vserver-reference start -%files -%defattr(-,root,root) -%{vrefdir} +# Randomize daily run time +M=$((60 * $RANDOM / 32768)) +H=$((24 * $RANDOM / 32768)) +sed -i -e "s/@M@/$M/" -e "s/@H@/$H/" %{_sysconfdir}/cron.d/vserver-reference %changelog +* Tue Sep 1 2005 Mark Huang 3.1-1.planetlab +- Pre-package vserver-reference instead of building it on nodes + +* Tue Nov 30 2004 Mark Huang 3.0-5.planetlab +- PL3118 and PL3131 fix: set barrier bit on /vservers instead of old + immulink bit. Do not reset the immutable bit on the new + vserver-reference directory when deleting it after an error. + +* Mon Nov 15 2004 Mark Huang 3.0-4.planetlab +- bump release to install Fedora Core 2 updates as of Tue Nov 9 2004 +- PL3017 fix: rebuild vserver-reference image in case it was built + with i386 glibc + +* Mon Nov 15 2004 Mark Huang 3.0-4.planetlab +- bump release to install Fedora Core 2 updates as of Tue Nov 9 2004 +- PL3017 fix: rebuild vserver-reference image in case it was built + with i386 glibc + +* Sun Oct 10 2004 Mark Huang 3.0-3.planetlab +- dynamically install reference image at init time + +* Sun Oct 10 2004 Mark Huang 3.0-2.planetlab +- dynamically install reference image + * Tue Sep 14 2004 Mark Huang 3.0-1.planetlab - initial build