[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [libvirt] [v1.0.5-maint PATCH] lxc: correctly backport /dev/tty fix



On 07/29/2013 05:50 PM, Eric Blake wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=982317
> 
> maint-only patch; reported by Geert Jansen
> 
> Commit 17cdc298 tried to backport upstream 90a0c6d, but in
> resolving conflicts, failed to account that upstream commit
> e1d32bb refactored code to leave off a leading /dev.
> 
> * src/lxc/lxc_container.c (lxcContainerPopulateDevices): Use
> correct device name.
> 
> Signed-off-by: Eric Blake <eblake redhat com>
> ---
>  src/lxc/lxc_container.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 8497c10..972486b 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -839,7 +839,7 @@ static int lxcContainerPopulateDevices(char **ttyPaths, size_t nttyPaths)
>          { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_FULL, 0666, "/dev/full" },
>          { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_RANDOM, 0666, "/dev/random" },
>          { LXC_DEV_MAJ_MEMORY, LXC_DEV_MIN_URANDOM, 0666, "/dev/urandom" },
> -        { LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY, 0666, "/tty" },
> +        { LXC_DEV_MAJ_TTY, LXC_DEV_MIN_TTY, 0666, "/dev/tty" },
>      };
>      const struct {
>          const char *src;
> 

Yeah I guess I messed that up. ACK

- Cole


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]