X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootcd.spec;h=a37e1b5247d426da13c29486f63e3df11223c35c;hb=417568827a6a6eaf1df70d3f2dc0cd7d8a35bd7b;hp=1bf318008af3e5c9ac4a522d08b1e078d46decb7;hpb=88b7d5163ea828b6832e78435ba761fc9b0c37b1;p=bootcd.git

diff --git a/bootcd.spec b/bootcd.spec
index 1bf3180..a37e1b5 100644
--- a/bootcd.spec
+++ b/bootcd.spec
@@ -2,8 +2,8 @@
 %define nodefamily %{pldistro}-%{distroname}-%{_arch}
 
 %define name bootcd-%{nodefamily}
-%define version 5.0
-%define taglevel 11
+%define version 5.1
+%define taglevel 2
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -34,7 +34,9 @@ Requires: dosfstools, mkisofs, gzip, mtools, syslinux
 Requires: yum-utils
 # mkdiskimage is used for USB-partitioned mode
 # but it now comes in a separate rpm
+%if "%{distro}" == "Fedora" && %{distrorelease} >= 14
 Requires: syslinux-perl
+%endif
 
 Requires: pyplnet
 
@@ -99,15 +101,6 @@ for script in bootcd bootcd-kernel; do
     install -D -m 755 plc.d/$script $RPM_BUILD_ROOT/etc/plc.d/$script
 done
 
-#systemd files
-mkdir -p $RPM_BUILD_ROOT/lib/systemd/system
-mkdir -p $RPM_BUILD_ROOT/etc/systemd/system
-cp -pr systemd/* $RPM_BUILD_ROOT/lib/systemd/system
-ln -sf /lib/systemd/system/pl_boot.target $RPM_BUILD_ROOT/etc/systemd/system/default.target
-mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/pl_boot.target.wants
-mkdir -p $RPM_BUILD_ROOT/etc/systemd/system/pl_sysinit.target.wants
-ln -sf /lib/systemd/system/pl_boot.service $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants/pl_boot.service
-ln -sf /lib/systemd/system/pl_sysinit.service $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service
 popd
     
 %clean
@@ -120,10 +113,16 @@ rm -rf $RPM_BUILD_ROOT
 %files -n bootcd-initscripts
 %defattr(-,root,root,-)
 /etc/plc.d
-/lib/systemd/system
-/etc/systemd/system
 
 %changelog
+* Mon May 07 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-2
+- turn off selinux, turns out needed with some combinations like lxc/f14
+
+* Wed Apr 11 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-1
+- compatible with pre- and post- f16
+- add systemd friendlyness to bootcd
+- also add biosdevname=0 tp kernel args so ethernet devices are still named in eth<x>
+
 * Mon Nov 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.0-11
 - add requires: to syslinux-perl on fedora14