X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=bootstrapfs.spec;h=9cfd9afd8853ac25368a2965ddd485e065fca250;hb=51411ee59c8bce4342793f13fc2f6af729f53d3a;hp=b7f46114f50be94f81cc5b90b7d6ee721084c588;hpb=3d0fccd9b1ba2bc65bbe47be6ab890fd8646001b;p=nodeimage.git diff --git a/bootstrapfs.spec b/bootstrapfs.spec index b7f4611..9cfd9af 100644 --- a/bootstrapfs.spec +++ b/bootstrapfs.spec @@ -113,12 +113,16 @@ popd # and let the php scripts do the right thing pushd BootstrapFS echo "* Installing MyPLC-side nodes yum config utilities" -# expose (fixed) myplc.repo.php as https:///yum/myplc.repo.php -install -D -m 644 ./nodeconfig/yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum/myplc.repo.php -# expose the fcdistro-dependant yum.conf as https:///yum/yum.conf -install -D -m 644 ./nodeconfig/yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum/yum.conf -# expose the (fcdistro-dependant) stock.repo as https:///yum/stock.repo -install -D -m 644 ./nodeconfig/yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum/stock.repo +echo "* Multi-fcdistro yum stuff" +mkdir -p $RPM_BUILD_ROOT/var/www/html/yum/ +rsync -av ./nodeconfig/yum/ $RPM_BUILD_ROOT/var/www/html/yum/ +echo "* Legacy (single fcdistro) yum stuff" +# expose (fixed) myplc.repo.php as https:///yum.legacy/myplc.repo.php +install -D -m 644 ./nodeconfig/yum/myplc.repo.php $RPM_BUILD_ROOT/var/www/html/yum.legacy/myplc.repo.php +# expose the fcdistro-dependant yum.conf as https:///yum.legacy/yum.conf +install -D -m 644 ./nodeconfig/yum/%{distroname}/yum.conf $RPM_BUILD_ROOT/var/www/html/yum.legacy/yum.conf +# expose the (fcdistro-dependant) stock.repo as https:///yum.legacy/stock.repo +install -D -m 644 ./nodeconfig/yum/%{distroname}/yum.myplc.d/stock.repo $RPM_BUILD_ROOT/var/www/html/yum.legacy/stock.repo # Install initscripts echo "* Installing plc.d initscripts" @@ -146,6 +150,7 @@ rm -rf $RPM_BUILD_ROOT %files -n nodeyum %defattr(-,root,root,-) /var/www/html/yum +/var/www/html/yum.legacy /etc/planetlab/db-config.d /etc/plc.d