Merge branch 'master' into lxc

in bootcd.spec, reinstate the test on the fedora distrib (for
requiring perl-syslinux) in a f16-compatible way

diff --combined bootcd.spec
index f1165d7,af1b8bc..e5298ba
--- 1/bootcd.spec
--- 2/bootcd.spec
+++ b/bootcd.spec
@@@ -34,7 -34,9 +34,9 @@@ Requires: dosfstools, mkisofs, gzip, mt
  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
  
@@@ -98,16 -100,6 +100,16 @@@ tar cpf - 
  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 /lib/systemd/system/pl_boot.target $RPM_BUILD_ROOT/etc/systemd/system/default.target
 +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants
 +mkdir -p $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants
 +ln -sf /lib/systemd/system/pl_boot.service $RPM_BUILD_ROOT/lib/systemd/system/pl_boot.target.wants/pl_boot.service
 +ln -sf /lib/systemd/system/pl_sysinit.service $RPM_BUILD_ROOT/lib/systemd/system/pl_sysinit.target.wants/pl_sysinit.service
  popd
      
  %clean
@@@ -120,8 -112,6 +122,8 @@@ rm -rf $RPM_BUILD_ROO
  %files -n bootcd-initscripts
  %defattr(-,root,root,-)
  /etc/plc.d
 +/lib/systemd/system
 +/etc/systemd/system
  
  %changelog
  * Mon Nov 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootcd-5.0-11