X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=bootmanager.spec;h=27ef2d56b1038d1c73db052237583712f52c5cca;hb=46b7e125c111fd15cbd6942023095e6e3f861002;hp=5e9d0530dcda129379f4cb86d39843545446fdcd;hpb=daccb35c2f1bc8d1b3b0a732534d9da34be51a3a;p=bootmanager.git diff --git a/bootmanager.spec b/bootmanager.spec index 5e9d053..27ef2d5 100644 --- a/bootmanager.spec +++ b/bootmanager.spec @@ -1,18 +1,14 @@ # -# $Id$ -# -%define url $URL$ - %define name bootmanager -%define version 5.0 -%define taglevel 0 +%define version 5.2 +%define taglevel 1 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} Summary: The PlanetLab Boot Manager Name: %{name} @@ -24,16 +20,20 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch -Requires: tar, gnupg, sharutils, bzip2, pypcilib -Requires: PLCAPI >= 5.0 -# the python code packaged in these are shipped on the node as well -Requires: pypcilib pyplnet monitor-runlevelagent +Requires: tar, gnupg, sharutils, bzip2 +# need the apache user at install-time +Requires: httpd + +Requires: plcapi >= 5.2 +# we need to install these on the myplc side too, although this is suboptimal +# b/c this python code gets shipped on the nodes as well +Requires: pypcilib pyplnet ### avoid having yum complain about updates, as stuff is moving around # plc.d/bootmanager -Conflicts: myplc <= 5.0 +Conflicts: myplc <= 4.3 # nodeconfig/boot/* -Conflicts: nodeconfig <= 5.0 +Conflicts: nodeconfig <= 4.3 AutoReqProv: no %define debug_package %{nil} @@ -68,13 +68,10 @@ install -D -m 755 plc.d/bootmanager $RPM_BUILD_ROOT/etc/plc.d/bootmanager rm -rf $RPM_BUILD_ROOT %post -# signing of botmanager.sh occurs as part of /etc/plc.d/bootmanager -# which in turn invokes build.sh - -# NOTE: do not run this agent when installed on a myplc. -# xxx - a bit hacky maybe -chkconfig monitor-runlevelagent off -chkconfig --del monitor-runlevelagent +# initialize the boot manager upload area +mkdir -p /var/log/bm +chown apache:apache /var/log/bm +chmod 700 /var/log/bm %files %defattr(-,root,root,-) @@ -85,6 +82,127 @@ chkconfig --del monitor-runlevelagent /etc/plc.d/bootmanager %changelog +* Thu Mar 07 2013 Thierry Parmentelat - bootmanager-5.2-1 +- merged the branches for vserver and lxc +- requires the rest of 5.2 - notably 'virt' in GetNodeFlavour +- note that WriteModprobeConfig and MakeInitrd are turned off for lxc nodes +- also note that fsck management for btrfs/lxc is still weak +- vs_ROOT_SIZE=14G lxc_ROOT_SIZE=70G +- vs_TOTAL_MINIMUM_DISK_SIZE=50G lxc_TOTAL_MINIMUM_DISK_SIZE=120G +- expects ntpd to be turned on in the nodeimage + +* Fri Feb 22 2013 Thierry Parmentelat - bootmanager-5.1-5 +- fix for heterogeneous bootimage/nodeimage + +* Thu Feb 21 2013 Thierry Parmentelat - bootmanager-5.1-4 +- Turn off WriteModprobeConfig for f18 +- enable btrfs quota +- fix very old ssh DSA key generation + +* Tue Oct 16 2012 Thierry Parmentelat - bootmanager-5.1-3 +- run parted with --script to keep it from hanging + +* Fri Aug 31 2012 Thierry Parmentelat - bootmanager-5.0-24 +- run parted with --script to avoid it to hang + +* Wed Jul 18 2012 Thierry Parmentelat - bootmanager-5.1-2 +- pour the 5.0-22 and 5.0-23 features into the lxc mix + +* Mon Jul 09 2012 Thierry Parmentelat - bootmanager-5.0-23 +- added support for disks larger than 2Tb using gpt instead of msdos + +* Tue May 15 2012 Thierry Parmentelat - bootmanager-5.0-22 +- bootmanager log clearly states duration of download and extraction of node image + +* Fri Apr 13 2012 Thierry Parmentelat - bootmanager-5.1-1 +- first working draft for dealing with f16 nodes +- not expected to work with mainline nodes (use 5.0 for that for now) + +* Fri Apr 13 2012 Thierry Parmentelat - bootmanager-5.0-21 +- no significant change, just checkpoint as 5.1 is addressing lxc + +* Thu Jul 07 2011 Thierry Parmentelat - bootmanager-5.0-20 +- be more explicit on the node conf_file actually used +- did this after a former PLC node tried to boot at PLE with its PLC plnode.txt still on a usb stick + +* Fri Jun 10 2011 Thierry Parmentelat - bootmanager-5.0-19 +- nicer log - was intended for previous tag + +* Wed Jun 08 2011 Thierry Parmentelat - bootmanager-5.0-18 +- {Start,Stop,}RunLevelAgent now ship with bootmanager +- new UpdateLastBootOnce +- root_size bumped to 14Gb which is more in line with modern h/w +- more safely tries to umount /dev/ and /sys +- support for raid partitions +- mkswap -f +- blacklist files from /etc/modprobe.conf/* instead + +* Thu Feb 17 2011 Thierry Parmentelat - bootmanager-5.0-17 +- on install of boostrapfs, keep track in /bm-install.log with date & flavour + +* Sun Jan 23 2011 Thierry Parmentelat - bootmanager-5.0-16 +- for f14 : try to mount /dev as devtmpfs before bind-mounting to on the hdd's /dev +- fix for chosing version of parted - for f14 +- added support for virtio deveices in /dev/vd +- fixed scanning of new disks +- slightly reviewed logs - default mode is verbose +- removed deprecated mkinitrd.sh + +* Fri Dec 10 2010 S.Çağlar Onur - bootmanager-5.0-15 +- Fix problems caused by shell redirection + +* Thu Dec 09 2010 Thierry Parmentelat - bootmanager-5.0-14 +- tag 5.0-13 is broken + +* Wed Dec 08 2010 S.Çağlar Onur - bootmanager-5.0-13 +- Add support for uploading bash_history to a central server for failboot nodes. +- Start to use subprocess instead of deprecated popen2 module +- Fix typo for VSERVERS_SIZE +- Add --allow-missing parameter to support different kernel configs with mkinitrd + +* Thu Aug 26 2010 S.Çağlar Onur - bootmanager-5.0-12 +- Revert "replace deprecated popen2 with subprocess" + +* Wed Aug 11 2010 S.Çağlar Onur - bootmanager-5.0-11 +- replace deprecated popen2 with subprocess and handle fsck return codes in a different code path + +* Fri Jul 30 2010 S.Çağlar Onur - bootmanager-5.0-10 +- Fix typo + +* Fri Jul 30 2010 Baris Metin - bootmanager-5.0-9 +- fix typo + +* Wed Jul 28 2010 S.Çağlar Onur - bootmanager-5.0-8 +- disable time/count based filesystem checks + +* Tue Jul 27 2010 S.Çağlar Onur - bootmanager-5.0-7 +- Fix new disk additions to LVM array + +* Wed Jul 07 2010 Thierry Parmentelat - BootManager-5.0-6 +- bugfix for centos5/python2.4 missing hashlib + +* Mon Jul 05 2010 Baris Metin - BootManager-5.0-5 +- check sha1sum of downloaded bootstrapfs +- try recovering filesystem errors + +* Wed Jun 23 2010 Thierry Parmentelat - BootManager-5.0-4 +- nicer initscript now uses 'action' from /etc/init.d/functions +- bugfix for nodes with extensions + +* Fri Apr 02 2010 Thierry Parmentelat - BootManager-5.0-3 +- create /etc/planetlab if missing +- uses key 'ssh_rsa_key' in BootUpdateNode (requires PLCAPI-5.0.5) + +* Sat Feb 13 2010 Thierry Parmentelat - BootManager-5.0-2 +- caglar's change to run MkInitrd right before kexec +- plus clean up old code + +* Fri Jan 29 2010 Thierry Parmentelat - BootManager-5.0-1 +- first working version of 5.0: +- pld.c/, db-config.d/ and nodeconfig/ scripts should now sit in the module they belong to +- uses PLCAPI's GetNodeFlavour to get all info on the bootstrapfs tarball(s) to install +- installation layout on the plc side has changed, more consistent for e.g. 'alpha' bootmanagers + * Sat Jan 09 2010 Thierry Parmentelat - BootManager-4.3-16 - support for fedora 12 @@ -191,4 +309,3 @@ chkconfig --del monitor-runlevelagent * Fri Sep 2 2005 Mark Huang - - Initial build. -%define module_current_branch 4.3