X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=blobdiff_plain;f=bootcd.spec;h=8890becc46b740d2bdb8abc2f4d189fc309f7c7c;hp=9652e88047a0b24abdb17eee9988fe5f93fc3d46;hb=HEAD;hpb=789ada2b68c8c314c5f420b688df1d95e8c90375 diff --git a/bootcd.spec b/bootcd.spec index 9652e88..8890bec 100644 --- a/bootcd.spec +++ b/bootcd.spec @@ -2,11 +2,10 @@ %define nodefamily %{pldistro}-%{distroname}-%{_arch} %define name bootcd-%{nodefamily} -%define version 5.0 -%define taglevel 11 +%define version 6.0 +%define taglevel 0 # pldistro already in the rpm name -#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %define release %{taglevel}%{?date:.%{date}} # structure - this results in 2 packages @@ -29,12 +28,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # other archs must be able to install this BuildArch: noarch -Requires: dosfstools, mkisofs, gzip, mtools, syslinux +Requires: dosfstools, genisoimage, gzip, mtools, syslinux # yumdownloader is needed in bootcd-kernel 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 @@ -72,8 +73,8 @@ Conflicts: MyPLC <= 4.3 pushd bootcd -# Build the reference image -./prep.sh %{pldistro} %{nodefamily} +# Build the reference image - pass 3-fold version number to go in version.txt +./prep.sh %{pldistro} %{nodefamily} %{version} popd @@ -99,13 +100,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 $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target $RPM_BUILD_ROOT/etc/systemd/system/default.target -#ln -sf $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.service $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants/pl_boot.service -#ln -sf $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.service $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service popd %clean @@ -118,10 +112,69 @@ rm -rf $RPM_BUILD_ROOT %files -n bootcd-initscripts %defattr(-,root,root,-) /etc/plc.d -/lib/systemd/system -/etc/systemd/system %changelog +* Mon Jan 07 2019 Thierry - bootcd-6.0-0 +- requires 'genisoimage' rather than deprecated 'mkisofs' +- set kernel arg `net.ifnames=0` in addition to `biosdevname=0` +- does not use ifconfig, instead use ip and nm-ifup, or look up /sys/class/net +- slightly review the contents of forensics messages + +* Sun Jul 10 2016 Thierry Parmentelat - bootcd-5.4-1 +- use 8.8.8.8 s a DNS server if nothing else works +- more consistent and verbose forensics system + +* Tue Dec 08 2015 Thierry Parmentelat - bootcd-5.3-3 +- patch for f23 as of dec. 2015 where kernel and initrd show up in +- a new location under /boot + +* Fri Nov 13 2015 Thierry Parmentelat - bootcd-5.3-2 +- various fixes for resolv.conf + +* Fri Jun 26 2015 Thierry Parmentelat - bootcd-5.3-1 +- use TLSv1 instead of SSLv3 +- on systemd distros, do not try to replace the whole boot sequence +- as older bootCDs did; pl_boot is now just one more service, not the single +- service to run; this solves f21 bootCDs not starting up properly + +* Fri Apr 24 2015 Thierry Parmentelat - bootcd-5.2-6 +- remove default kargs systemd.log_target=console console=ttyS0,115200 +- simpler bootcd layout (no memdisk nor isolinux-debug.bin) +- keep track of actual kargs in log file for build.sh + +* Fri Apr 03 2015 Thierry Parmentelat - bootcd-5.2-5 +- changes for fedora 21 and its new release of syslinux + +* Fri Mar 21 2014 Thierry Parmentelat - bootcd-5.2-4 +- no change, only some internal comments were changed + +* Wed Jun 26 2013 Thierry Parmentelat - bootcd-5.2-3 +- attempt to make node take off more reliable with pl_wrapper + +* Wed Apr 24 2013 Thierry Parmentelat - bootcd-5.2-2 +- fix version number as it shows up in version.txt (was empty) + +* Thu Mar 07 2013 Thierry Parmentelat - bootcd-5.2-1 +- turn off systemd traces at boot-time + +* Tue Feb 26 2013 Thierry Parmentelat - 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 - bootcd-5.1-4 +- turn on getty/console on tty2 + +* Thu Feb 21 2013 Thierry Parmentelat - bootcd-5.1-3 +- reviewed for systemd & f18 + +* Mon May 07 2012 Thierry Parmentelat - bootcd-5.1-2 +- turn off selinux, turns out needed with some combinations like lxc/f14 + +* Wed Apr 11 2012 Thierry Parmentelat - 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 + * Mon Nov 07 2011 Thierry Parmentelat - bootcd-5.0-11 - add requires: to syslinux-perl on fedora14