X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=10455011c5b45532965771bbf0166881c425eb12;hb=5df962adcf05f12a802f828e8da91eebfe2b2874;hp=0459f6537c7c98772b2959cdd986a7a2f4707584;hpb=dfb2293f8e156799981459fc30f4259b1c4674b5;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 0459f65..1045501 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -20,6 +20,8 @@ Requires: util-vserver
 AutoReqProv: no
 BuildRequires: e2fsprogs, yum
 
+%define debug_package %{nil}
+
 %description
 This package creates the virtual server (VServer) reference image used
 as the installation base for new PlanetLab slivers.
@@ -40,6 +42,9 @@ fi
 %build
 
 %install
+# Running as root
+export PATH="$PATH:/sbin:/usr/sbin"
+
 # Clean up
 if grep -q %{installroot}/proc /proc/mounts ; then
     umount %{installroot}/proc
@@ -99,6 +104,7 @@ EOF
 mkdir -p %{installroot}/etc/rpm
 cat > %{installroot}/etc/rpm/macros <<EOF
 %_install_langs en_US:en
+%_excludedocs 1
 EOF
 
 # Initialize RPM database in reference image
@@ -108,11 +114,14 @@ rpm --root %{installroot} --initdb
 # XXX Get yum.conf from PlanetLabConf
 
 # Install RPMs in reference image
-yum \
+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
 
@@ -131,6 +140,9 @@ if grep -q %{installroot}/dev/pts /proc/mounts ; then
 fi
 
 %clean
+# Running as root
+export PATH="$PATH:/sbin:/usr/sbin"
+
 # Clean up
 if grep -q %{installroot}/proc /proc/mounts ; then
     umount %{installroot}/proc
@@ -141,6 +153,22 @@ fi
 chattr -R -i $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
+# 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
+fi
+
 %post
 # Copy configuration files from host to reference image
 for file in /etc/hosts /etc/resolv.conf /etc/yum.conf ; do