[lxc-devel] [PATCH] oracle template: use @LOCALSTATEDIR@ instead of hardcoded /var for lock dir

[Dwight Engen]

On Thu, 06 Dec 2012 09:42:47 -0500
Stéphane Graber <stgraber at ubuntu.com> wrote:

> On 12/06/2012 09:19 AM, Dwight Engen wrote:
> > 
> > Signed-off-by: Dwight Engen <dwight.engen at oracle.com>
> 
> Thanks but I already proposed that yesterday and it landed a few
> minutes ago :)

Sounds good. I just did a pull and didn't see it in there, which is why
I sent it. Long as it got in there somehow :) Thanks.

> > ---
> >  templates/lxc-oracle.in |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
> > index 243f0e4..eadee3a 100644
> > --- a/templates/lxc-oracle.in
> > +++ b/templates/lxc-oracle.in
> > @@ -337,7 +337,7 @@ container_rootfs_create()
> >          fi
> >      done
> >  
> > -    mkdir -p /var/lock/subsys/
> > +    mkdir -p @LOCALSTATEDIR@/lock/subsys/
> >      (
> >          flock -x 200
> >          if [ $? -ne 0 ]; then
> > @@ -433,7 +433,7 @@ container_rootfs_create()
> >          echo "Rebuilding rpm database"
> >          rm -f $container_rootfs/var/lib/rpm/__db*
> >          chroot $container_rootfs rpm --rebuilddb >/dev/null 2>&1
> > -    ) 200>/var/lock/subsys/lxc-oracle-$name
> > +    ) 200>@LOCALSTATEDIR@/lock/subsys/lxc-oracle-$name
> >  }
> >  
> >  usage()
> > 
> 
>