X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliceimage.spec;h=6260e1f1a9fb18594e01fa29eca7e383daa17270;hb=6da59deaec9278aed28e04f12efb3a3c94cd8f88;hp=6db50b4249d02f6ebc8c7ead6e80fddc36661414;hpb=b42e58ee57e65e4a8574311eda26c77a9702010c;p=sliceimage.git

diff --git a/sliceimage.spec b/sliceimage.spec
index 6db50b4..6260e1f 100644
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -9,7 +9,7 @@
 
 %define name sliceimage
 %define version 5.1
-%define taglevel 0
+%define taglevel 2
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -88,7 +88,6 @@ rm -rf $RPM_BUILD_ROOT
 
 ### for upgrades
 %post
-#[ "$PL_BOOTCD" = "1" ] || service vserver-sliceimage start
 [ "$PL_BOOTCD" = "1" ] && return
 # remove explicit reference to vserver, find out all relevant scripts
 for initscript in /etc/init.d/*sliceimage*; do $initscript start ; done
@@ -96,7 +95,6 @@ for initscript in /etc/init.d/*sliceimage*; do $initscript start ; done
 # 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" ] || service vserver-sliceimage force
 [ "$PL_BOOTCD" = "1" ] && return
 # remove explicit reference to vserver, find out all relevant scripts
 for initscript in /etc/init.d/*sliceimage*; do $initscript force ; done
@@ -105,6 +103,13 @@ for initscript in /etc/init.d/*sliceimage*; do $initscript force ; done
 #%define vcached_pid /var/run/vcached.pid
 
 %changelog
+* Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliceimage-5.1-2
+- for linux-containers: populates refs from stubs (for system slices)
+- for linux-containers: memory bump to 512M, and add acpi
+
+* Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - sliceimage-5.1-1
+- first working draft for both mainline and lxc
+
 * Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - vserver-reference-5.0-6
 - no semantic change - just fixed specfile for git URL