Hello community, here is the log from the commit of package lxc for openSUSE:Factory checked in at 2014-08-18 11:24:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxc (Old) and /work/SRC/openSUSE:Factory/.lxc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxc" Changes: -------- --- /work/SRC/openSUSE:Factory/lxc/lxc.changes 2014-08-13 17:08:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxc.new/lxc.changes 2014-08-18 11:24:12.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Aug 15 14:43:35 UTC 2014 - [email protected] + +- third patch to get lxc-autostart-helper to work on openSUSE + * 0003-lxc-autostart-helper-working-even-if-var-lock-subsys.patch + +------------------------------------------------------------------- +Fri Aug 15 13:04:48 UTC 2014 - [email protected] + +- added another patch to ensure correct operation of lxc.service systemd-unit + * 0002-lxc-autostart-helper-working-even-if-action-is-not-a.patch + +------------------------------------------------------------------- +Thu Aug 14 19:26:33 UTC 2014 - [email protected] + +- added patch to ensure correct operation of lxc.service systemd-unit + * 0001-systemd-Ensure-action-is-defined.patch + +------------------------------------------------------------------- New: ---- 0001-systemd-Ensure-action-is-defined.patch 0002-lxc-autostart-helper-working-even-if-action-is-not-a.patch 0003-lxc-autostart-helper-working-even-if-var-lock-subsys.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxc.spec ++++++ --- /var/tmp/diff_new_pack.wOWbmf/_old 2014-08-18 11:24:13.000000000 +0200 +++ /var/tmp/diff_new_pack.wOWbmf/_new 2014-08-18 11:24:13.000000000 +0200 @@ -26,6 +26,9 @@ Source: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz Source1: README.SUSE Source2: lxc-createconfig.in +Patch1: 0001-systemd-Ensure-action-is-defined.patch +Patch2: 0002-lxc-autostart-helper-working-even-if-action-is-not-a.patch +Patch3: 0003-lxc-autostart-helper-working-even-if-var-lock-subsys.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +77,9 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build chmod 755 configure ++++++ 0001-systemd-Ensure-action-is-defined.patch ++++++ >From 82dddfc2d3c26db922f105111a439e43f5ce7172 Mon Sep 17 00:00:00 2001 From: Martin Pitt <[email protected]> Date: Thu, 31 Jul 2014 08:53:54 +0200 Subject: [PATCH 1/2] systemd: Ensure action() is defined If /etc/rc.d/init.d/functions is not present or does not define an action() function, provide a simple fallback using "echo". Signed-off-by: Martin Pitt <[email protected]> Acked-by: Serge E. Hallyn <[email protected]> --- config/init/sysvinit/lxc.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config/init/sysvinit/lxc.in b/config/init/sysvinit/lxc.in index 4bfd0f0..c4c0c75 100644 --- a/config/init/sysvinit/lxc.in +++ b/config/init/sysvinit/lxc.in @@ -45,6 +45,13 @@ STOPOPTS="-a -s" test ! -r "$sysconfdir"/rc.d/init.d/functions || . "$sysconfdir"/rc.d/init.d/functions +# provide action() fallback +if ! type action >/dev/null 2>&1; then + action() { + echo "$@" + } +fi + # Source any configurable options test ! -r "$sysconfdir"/sysconfig/lxc || . "$sysconfdir"/sysconfig/lxc -- 2.0.4 ++++++ 0002-lxc-autostart-helper-working-even-if-action-is-not-a.patch ++++++ >From 968ae01f39622aad693e3d3b4c91bf69cdcab0b8 Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 15 Aug 2014 15:01:01 +0200 Subject: [PATCH 2/2] lxc-autostart-helper working even if action is not available Signed-off-by: Johannes Kastl <[email protected]> --- config/init/sysvinit/lxc.in | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/config/init/sysvinit/lxc.in b/config/init/sysvinit/lxc.in index c4c0c75..9697ff4 100644 --- a/config/init/sysvinit/lxc.in +++ b/config/init/sysvinit/lxc.in @@ -47,9 +47,7 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions || # provide action() fallback if ! type action >/dev/null 2>&1; then - action() { - echo "$@" - } + ACTION_NOT_AVAILABLE="yes" fi # Source any configurable options @@ -105,7 +103,13 @@ case "$1" in # Start containers wait_for_bridge # Start autoboot containers first then the NULL group "onboot,". - action $"Starting LXC autoboot containers: " /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS + if [ ${ACTION_NOT_AVAILABLE} == "yes" ] + then + echo "Starting LXC autoboot containers: " + /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS + else + action $"Starting LXC autoboot containers: " /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS + fi touch "$localstatedir"/lock/subsys/lxc ;; stop) @@ -117,7 +121,13 @@ case "$1" in # The stop is serialized and can take excessive time. We need to avoid # delaying the system shutdown / reboot as much as we can since it's not # parallelized... Even 5 second timout may be too long. - action $"Stopping LXC containers: " "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY + if [ ${ACTION_NOT_AVAILABLE} == "yes" ] + then + echo "Stopping LXC containers: " + "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY + else + action $"Stopping LXC containers: " "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY + fi rm -f "$localstatedir"/lock/subsys/lxc ;; restart|reload|force-reload) -- 2.0.4 ++++++ 0003-lxc-autostart-helper-working-even-if-var-lock-subsys.patch ++++++ >From 63ae5adcf5703630370c3cab3b225ef327bc61bd Mon Sep 17 00:00:00 2001 From: Johannes Kastl <[email protected]> Date: Fri, 15 Aug 2014 16:38:44 +0200 Subject: [PATCH 2/2] lxc-autostart-helper working even if /var/lock/subsys does not exist Signed-off-by: Johannes Kastl <[email protected]> --- config/init/sysvinit/lxc.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/config/init/sysvinit/lxc.in b/config/init/sysvinit/lxc.in index 9697ff4..72c6eca 100644 --- a/config/init/sysvinit/lxc.in +++ b/config/init/sysvinit/lxc.in @@ -110,7 +110,12 @@ case "$1" in else action $"Starting LXC autoboot containers: " /usr/bin/lxc-autostart $OPTIONS $BOOTGROUPS fi - touch "$localstatedir"/lock/subsys/lxc + if [ -d "$localstatedir"/lock/subsys/ ] + then + touch "$localstatedir"/lock/subsys/lxc + else + touch "$localstatedir"/lock/lxc + fi ;; stop) if [ -n "$SHUTDOWNDELAY" ] @@ -128,7 +133,12 @@ case "$1" in else action $"Stopping LXC containers: " "$bindir"/lxc-autostart $STOPOPTS $SHUTDOWNDELAY fi - rm -f "$localstatedir"/lock/subsys/lxc + if [ -d "$localstatedir"/lock/subsys/ ] + then + rm -f "$localstatedir"/lock/subsys/lxc + else + rm -f "$localstatedir"/lock/lxc + fi ;; restart|reload|force-reload) $0 stop -- 2.0.4 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
