From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 27 Jan 2010 18:44:46 +0000 (+0000)
Subject: fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec... 
X-Git-Tag: VserverReference-5.0-1~3
X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=commitdiff_plain;h=714ea335aa0e47a673b765eb894bc02a39466b05

fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodeconfig/yum
  now known as the nodeyum package
  (might need some moer work for properly handling kexcludes in multi-fc plcs)
cleaned up all uses of /etc/planetlab/{node,slice}family
nodeconfig now does not need the build/ module anymore at build time
---

diff --git a/vserver-reference.cron b/cron.d/vserver-reference
similarity index 100%
rename from vserver-reference.cron
rename to cron.d/vserver-reference
diff --git a/vserver-reference.init b/initscripts/vserver-reference
similarity index 100%
rename from vserver-reference.init
rename to initscripts/vserver-reference
diff --git a/vserver-reference.logrotate b/logrotate/vserver-reference
similarity index 100%
rename from vserver-reference.logrotate
rename to logrotate/vserver-reference
diff --git a/vserver-reference.spec b/vserver-reference.spec
index f625b5e..4312f08 100644
--- a/vserver-reference.spec
+++ b/vserver-reference.spec
@@ -67,26 +67,15 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 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
+install -D -m 755 initscripts/vserver-reference $RPM_BUILD_ROOT/%{_initrddir}/vserver-reference
+install -D -m 644 cron.d/vserver-reference $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/vserver-reference
+install -D -m 644 logrotate/vserver-reference $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
-if [ -n "$SUDO_USER" ] ; then
-    # 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 %{slicefamily}
 %defattr(-,root,root)
 %{_initrddir}/vserver-reference
@@ -109,8 +98,6 @@ test -d /vservers/.vref/%{slicefamily} && \
 %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
 
 # Randomize daily run time