X-Git-Url: http://git.onelab.eu/?p=sliceimage.git;a=blobdiff_plain;f=sliceimage.spec;h=1644ed5913c511441fc0750e12921b8e36a4f8f9;hp=eee3e236d585544a25644ccaea6d1247be1f0400;hb=dfcac42a6d0c9e581a37fd62ac935309d318addf;hpb=2e19625ea303bb184a9a44b8f3c14ac16d169d36 diff --git a/sliceimage.spec b/sliceimage.spec index eee3e23..1644ed5 100644 --- a/sliceimage.spec +++ b/sliceimage.spec @@ -9,7 +9,7 @@ %define name sliceimage %define version 5.1 -%define taglevel 5 +%define taglevel 8 # pldistro already in the rpm name #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -88,21 +88,44 @@ rm -rf $RPM_BUILD_ROOT ### for upgrades %post -[ "$PL_BOOTCD" = "1" ] && return +if [ "$PL_BOOTCD" = "1" ] ; then + exit 0 +fi # remove explicit reference to vserver, find out all relevant scripts -for initscript in /etc/init.d/*sliceimage*; do $initscript start ; done +initScripts=`find /etc/init.d/ -name '*sliceimage*'` +if [ "$initScripts" != "" ] ; then + for initscript in $initScripts ; do $initscript start ; done +fi # need to do this for system slices, for when a new image shows up # we've already the service installed and enabled, as systemslices requires the plain package %post -n sliceimage-system-%{slicefamily} -[ "$PL_BOOTCD" = "1" ] && return +if [ "$PL_BOOTCD" = "1" ] ; then + exit 0 +fi # remove explicit reference to vserver, find out all relevant scripts -for initscript in /etc/init.d/*sliceimage*; do $initscript force ; done +initScripts=`find /etc/init.d/ -name '*sliceimage*'` +if [ "$initScripts" != "" ] ; then + for initscript in $initScripts ; do $initscript force ; done +fi #%define vcached_pid /var/run/vcached.pid %changelog +* Wed Jul 16 2014 Thierry Parmentelat - sliceimage-5.1-8 +- use systemd unit files to initialize lxc-sliceimage instead of a sysv script + +* Mon Apr 28 2014 Thierry Parmentelat - sliceimage-5.1-7 +- can build pips and gems in sliceimage (currently only gem used in omf) +- requires a recent build/pkgs.py if pkgs file does mention pip or gem + +* Wed Jul 03 2013 Thierry Parmentelat - sliceimage-5.1-6 +- attempt to make lxc-sliceimage (update lxc ref. images) more robust +- in particular by avoiding chroot when simple file operations are involved +- also this activity gets logged into /var/log/lxc-sliceimage.log +- it is still unclear whether stub-based images are correctly updated + * Wed Jun 26 2013 Thierry Parmentelat - sliceimage-5.1-5 - fixes for heterogeneous slice/nodes - addresses PATH and missing eth0 among others