X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootmanager.spec;h=ee2320eef6d6c08092133c43b02eab0ba9bc5bba;hb=07139b606dfc3c657ef7d06da25c084c1679b660;hp=9620ae538e439232c8b4190ab64952fb3521257f;hpb=8176e3cd9ced2dcfca4fecb21f765d576d13ac18;p=bootmanager.git diff --git a/bootmanager.spec b/bootmanager.spec index 9620ae5..ee2320e 100644 --- a/bootmanager.spec +++ b/bootmanager.spec @@ -32,7 +32,9 @@ nodes. pushd bootmanager ./build.sh -make -C support-files +pushd support-files +./buildnode.sh -r $([ -f "/etc/fedora-release" ] && awk ' { print $4 } ' /etc/fedora-release || echo "4") +popd popd @@ -47,8 +49,6 @@ find build.sh source | cpio -p -d -u $RPM_BUILD_ROOT/%{_datadir}/%{name}/ install -D -m 755 bootmanager.sh $RPM_BUILD_ROOT/var/www/html/boot/bootmanager.sh for file in \ uudecode.gz \ - alpina-BootLVM.tar.gz \ - alpina-PartDisks.tar.gz \ PlanetLab-Bootstrap.tar.bz2 ; do install -D -m 644 support-files/$file $RPM_BUILD_ROOT/var/www/html/boot/$file done @@ -61,12 +61,12 @@ rm -rf $RPM_BUILD_ROOT # If run under sudo if [ -n "$SUDO_USER" ] ; then # Allow user to delete the build directory - chown -R $SUDO_USER . + 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 -R $SUDO_USER %{_rpmdir}/%{_arch} + chown -h -R $SUDO_USER %{_rpmdir}/%{_arch} fi %post