Merge branch 'master' into lxc_devel - changelog from 2.0-37

diff --combined NodeManager.spec
index 58778e7,a9fe8e8..686ed24
--- 1/NodeManager.spec
--- 2/NodeManager.spec
+++ b/NodeManager.spec
@@@ -1,11 -1,10 +1,11 @@@
  %define slicefamily %{pldistro}-%{distroname}-%{_arch}
  
  %define name NodeManager
 -%define version 2.0
 -%define taglevel 37
 +%define version 2.1
 +%define taglevel 1
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 +%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
  
  Summary: PlanetLab Node Manager
  Name: %{name}
@@@ -37,9 -36,9 +37,9 @@@ Requires: gnup
  # we do need the slice images in any case
  Requires: sliceimage-%{slicefamily}
  # our interface to the vserver patch
 -Requires: util-vserver >= 0.30.208-17
 +#Requires: util-vserver >= 0.30.208-17
  # vserver.py
 -Requires: util-vserver-python > 0.3-16
 +#Requires: util-vserver-python > 0.3-16
  # sioc/plnet
  Requires: pyplnet >= 4.3
  
@@@ -61,7 -60,6 +61,7 @@@ local operations on slices
  # make manages the C and Python stuff
  rm -rf $RPM_BUILD_ROOT
  %{__make} %{?_smp_mflags} install DESTDIR="$RPM_BUILD_ROOT"
 +PYTHON_SITEARCH=`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`
  
  # install the sliver initscript (that triggers the slice initscript if any)
  mkdir -p $RPM_BUILD_ROOT/usr/share/NodeManager/sliver-initscripts/
@@@ -75,8 -73,6 +75,8 @@@ chmod 755 $RPM_BUILD_ROOT/%{_initrddir}
  install -d -m 755 $RPM_BUILD_ROOT/var/lib/nodemanager
  
  install -D -m 644 logrotate/nodemanager $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nodemanager
 +install -D -m 755 sshsh $RPM_BUILD_ROOT/bin/sshsh
 +install -D -m 644 bwlimit.py ${RPM_BUILD_ROOT}/${PYTHON_SITEARCH}/bwlimit.py
  
  ##########
  %post
@@@ -134,17 -130,17 +134,23 @@@ rm -rf $RPM_BUILD_ROO
  %{_initrddir}/
  %{_sysconfdir}/logrotate.d/nodemanager
  /var/lib/
 +/bin/sshsh
 +%{python_sitearch}/bwlimit.py*
  
  %changelog
+ * Thu Jun 21 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-37
+ - refactoring: isolate initscript functionality
+ - aimed at making initscript implementation with lxc straightforward
+ - show stack trace when module loading fails
+ - accounts.py renamed into account.py for consistency
+ 
  * Sun Jun 03 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-36
  - /var/log/nodemanager shows duration of mainloop
  
 +* Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.1-1
 +- first working draft for dealing with libvirt/lxc on f16 nodes
 +- not expected to work with mainline nodes (use 2.0 for that for now)
 +
  * Fri Apr 13 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-2.0-35
  - remove Requires to deprecated vserver-* rpms, use sliceimage-* instead