%define nodefamily %{pldistro}-%{distroname}-%{_arch}
%define name bootcd-%{nodefamily}
-%define version 5.0
-%define taglevel 11
+%define version 5.1
+%define taglevel 5
# pldistro already in the rpm name
#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
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
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/lib/systemd/system/pl_boot.target.wants
-mkdir -p $RPM_BUILD_ROOT/lib/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
%files -n bootcd-initscripts
%defattr(-,root,root,-)
/etc/plc.d
-/lib/systemd/system
-/etc/systemd/system
%changelog
+* Tue Feb 26 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-5
+- fix console on tty2: this broke the build on fedora14
+- even though f14 doesn't use systemd by defaults there is /etc/systemd in there
+
+* Fri Feb 22 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-4
+- turn on getty/console on tty2
+
+* Thu Feb 21 2013 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.1-3
+- reviewed for systemd & f18
+
+* 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