On 01/22/2013 03:57 PM, Serge Hallyn wrote: > Quoting Matthias Brugger (matthias....@gmail.com): >> In lxc-setcap the path to lxc-init wasn't set right, so that >> a call to the script failed with an error. This patch sets >> the path to the right directory. >> >> Signed-off-by: Matthias Brugger <matthias....@gmail.com> > > Acked-by: Serge E. Hallyn <serge.hal...@ubuntu.com>
Acked-by: Stéphane Graber <stgra...@ubuntu.com> And pushed to staging. Thanks. >> --- >> src/lxc/lxc-setcap.in | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/src/lxc/lxc-setcap.in b/src/lxc/lxc-setcap.in >> index fcbe2be..3e95b16 100644 >> --- a/src/lxc/lxc-setcap.in >> +++ b/src/lxc/lxc-setcap.in >> @@ -60,7 +60,7 @@ lxc_setcaps() >> setcap $LXC_UNSHARE_CAPS=ep @BINDIR@/lxc-unshare >> setcap $LXC_NETSTAT_CAPS=ep @BINDIR@/lxc-netstat >> setcap $LXC_CHECKPOINT_CAPS=ep @BINDIR@/lxc-checkpoint >> - setcap $LXC_INIT_CAPS=ep @LXCINITDIR@/lxc-init >> + setcap $LXC_INIT_CAPS=ep @LXCINITDIR@/lxc/lxc-init >> >> test -e @LXCPATH@ || mkdir -p @LXCPATH@ >> chmod 0777 @LXCPATH@ >> @@ -76,7 +76,7 @@ lxc_dropcaps() >> setcap -r @BINDIR@/lxc-unshare >> setcap -r @BINDIR@/lxc-netstat >> setcap -r @BINDIR@/lxc-checkpoint >> - setcap -r @LXCINITDIR@/lxc-init >> + setcap -r @LXCINITDIR@/lxc/lxc-init >> >> chmod 0755 @LXCPATH@ >> } >> -- >> 1.7.11.7 >> >> >> ------------------------------------------------------------------------------ >> Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, >> MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current >> with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft >> MVPs and experts. ON SALE this month only -- learn more at: >> http://p.sf.net/sfu/learnnow-d2d >> _______________________________________________ >> Lxc-devel mailing list >> Lxc-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/lxc-devel > > ------------------------------------------------------------------------------ > Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, > MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current > with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft > MVPs and experts. ON SALE this month only -- learn more at: > http://p.sf.net/sfu/learnnow-d2d > _______________________________________________ > Lxc-devel mailing list > Lxc-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/lxc-devel > -- Stéphane Graber Ubuntu developer http://www.ubuntu.com
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnnow-d2d
_______________________________________________ Lxc-devel mailing list Lxc-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/lxc-devel
