[lxc-devel] [PATCH 2/3] oracle template: don't sed /etc/init/tty.conf on older releases

[Stéphane Graber]

On Wed, Jan 15, 2014 at 12:21:52PM -0500, Dwight Engen wrote:
> Signed-off-by: Dwight Engen <dwight.engen at oracle.com>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

> ---
>  templates/lxc-oracle.in | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
> index ccc746a..6df328d 100644
> --- a/templates/lxc-oracle.in
> +++ b/templates/lxc-oracle.in
> @@ -245,7 +245,9 @@ EOF
>      echo "pts/0"        >>$container_rootfs/etc/securetty
>  
>      # prevent mingetty from calling vhangup(2) since it fails with userns
> -    sed -i 's|mingetty|mingetty --nohangup|' $container_rootfs/etc/init/tty.conf
> +    if [ -f $container_rootfs/etc/init/tty.conf ]; then
> +        sed -i 's|mingetty|mingetty --nohangup|' $container_rootfs/etc/init/tty.conf
> +    fi
>  
>      # dont try to unmount /dev/lxc devices
>      sed -i 's|&& $1 !~ /^\\/dev\\/ram/|\&\& $2 !~ /^\\/dev\\/lxc/ \&\& $1 !~ /^\\/dev\\/ram/|' $container_rootfs/etc/init.d/halt
> -- 
> 1.8.3.1
> 
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel

-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20140115/41b7e031/attachment.pgp>