Package: lxc Version: 1.0.3-1 Followup-For: Bug #745670 Control: tags -1 patch
Hi, The problem still presents in 1.0.3-1 due to wrong path and sh compatibility. The attached patches can solve the issues. -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.14-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages lxc depends on: ii libapparmor1 2.8.0-5+b1 ii libc6 2.18-7 ii libcap2 1:2.22-1.2 ii libseccomp2 2.1.1-1 ii libselinux1 2.3-1 ii multiarch-support 2.18-7 Versions of packages lxc recommends: ii lua5.2 5.2.3-1 ii python3 3.3.4-1 ii rsync 3.1.0-3 Versions of packages lxc suggests: pn lxc-stuff <none> -- no debconf information -- ChangZhuo Chen (陳昌倬) <czc...@gmail.com> http://czchen.info/ Key fingerprint = EC9F 905D 866D BE46 A896 C827 BE0C 9242 03F4 552D
From c1a0cc1b845ed7d48bb08fbd72b9e5ca341e9456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= <czc...@gmail.com> Date: Tue, 20 May 2014 23:44:37 +0800 Subject: [PATCH 1/2] Fix lxc-devsetup path --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index f53f915..454a28a 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ override_dh_auto_install: mv debian/tmp/usr/bin/lxc-test-* debian/lxc-dev/usr/bin # fix systemd service - sed -i -e "s|/usr/libexec/lxc/lxc-devsetup|/usr/lib/$(DEB_HOST_MULTIARCH)/lxc|" \ + sed -i -e "s|/usr/libexec/lxc/lxc-devsetup|/usr/lib/$(DEB_HOST_MULTIARCH)/lxc/lxc-devsetup|" \ -e "s|/usr/libexec/lxc/lxc-startup start|/usr/bin/lxc-autostart|" \ -e "s|/usr/libexec/lxc/lxc-startup stop|/usr/bin/lxc-autostart --shutdown|" \ debian/tmp/lib/systemd/system/lxc.service -- 2.0.0.rc4
From f8f86658e77ef109f24db1b942972ea05063cc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ChangZhuo=20Chen=20=28=E9=99=B3=E6=98=8C=E5=80=AC=29?= <czc...@gmail.com> Date: Tue, 20 May 2014 23:48:36 +0800 Subject: [PATCH 2/2] Fix sh compatibility --- debian/patches/0009-sh-compatibility.patch | 23 +++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 debian/patches/0009-sh-compatibility.patch diff --git a/debian/patches/0009-sh-compatibility.patch b/debian/patches/0009-sh-compatibility.patch new file mode 100644 index 0000000..8695a61 --- /dev/null +++ b/debian/patches/0009-sh-compatibility.patch @@ -0,0 +1,23 @@ +Description: Fix for sh compatibility +--- +Origin: upstream, https://github.com/lxc/lxc/commit/e702123afe1a318c41cb7eb96223ae6ba5d21751 +--- lxc-1.0.3.orig/config/init/systemd/lxc-devsetup ++++ lxc-1.0.3/config/init/systemd/lxc-devsetup +@@ -2,7 +2,7 @@ + + # lxc.devsetup - Setup host /dev for container /dev subdirectories. + +-if [[ ! -d /dev/.lxc ]] ++if [ ! -d /dev/.lxc ] + then + echo "Creating /dev/.lxc" + mkdir /dev/.lxc +@@ -17,7 +17,7 @@ else + mount -t tmpfs tmpfs /dev/.lxc + fi + +-if [[ ! -d /dev/.lxc/user ]] ++if [ ! -d /dev/.lxc/user ] + then + echo "Creating /dev/.lxc/user" + mkdir /dev/.lxc/user diff --git a/debian/patches/series b/debian/patches/series index 95fd90e..fc28e35 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ 0006-lxc-sigint.patch 0007-lxc-patch-shebang.patch 0008-debian-config.patch +0009-sh-compatibility.patch -- 2.0.0.rc4
signature.asc
Description: Digital signature
