X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vserver-reference.spec;h=897b8a0e475640ac9548da1c7b2da0d435b9739d;hb=da06fc9ec17e13e0b2a6e42c34d63d8c14f1e6e3;hp=0fdb21a6f1aab46329ca29d26c676ec0b81aacc2;hpb=bbc1a08ac1cef26a946e3af552a2ac83499ffd88;p=sliceimage.git

diff --git a/vserver-reference.spec b/vserver-reference.spec
index 0fdb21a..897b8a0 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -1,7 +1,6 @@
-
 %define name vserver-reference
 %define version 3.1
-%define release 1.planetlab%{?date:.%{date}}
+%define release 2%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
@@ -29,15 +28,19 @@ as the installation base for new PlanetLab slivers.
 %setup -q
 
 %build
-RPM_BUILD_DIR=$RPM_BUILD_DIR ./%{name}.init
+RPM_BUILD_DIR=$RPM_BUILD_DIR ./build.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m 755 %{name}.init $RPM_BUILD_ROOT/%{_initrddir}/%{name}
 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 .
+    # 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 {} \;
 fi
 
 %clean
@@ -50,6 +53,7 @@ fi
 
 %files
 %defattr(-,root,root)
+%{_initrddir}/%{name}
 /vservers/vserver-reference
 
 %define vcached_pid /var/run/vcached.pid
@@ -59,7 +63,7 @@ fi
 if [ -r %{vcached_pid} ] ; then
     kill $(cat %{vcached_pid})
 fi
-touch %{vcached_pid}
+echo $$ > %{vcached_pid}
 
 # vcached will clean up .vtmp later
 mkdir -p /vservers/.vtmp
@@ -70,49 +74,14 @@ if [ -d /vservers/.vcache ] ; then
     mv /vservers/.vcache /vservers/.vtmp/.vcache.$RANDOM
 fi
 
-%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 <<EOF
-MA_NAME="$MA_NAME"
-MA_BOOT_SERVER="$MA_BOOT_SERVER"
-MA_BOOT_SERVER_CACERT="$MA_BOOT_SERVER_CACERT"
-EOF
-fi
-
-# Install boot server certificate
-install -D -m 644 $MA_BOOT_SERVER_CACERT $VROOT/$MA_BOOT_SERVER_CACERT
-
-# 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
-
-# Update packages and populate header cache
-chroot $VROOT yum --sslcertdir /mnt/cdrom/bootme/cacert -y update
-
 # Allow vcached to run again
 rm -f %{vcached_pid}
 
+%post
+chkconfig --add %{name}
+chkconfig %{name} on
+[ "$PL_BOOTCD" = "1" ] || service vserver-reference start
+
 %changelog
 * Tue Sep  1 2005 Mark Huang <mlhuang@cs.princeton.edu> 3.1-1.planetlab
 - Pre-package vserver-reference instead of building it on nodes