[lxc-devel] [lxc/lxc] 8f7b58: lxc-user-nic: dont risk passing EOF

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/lxc/lxc
  Commit: 8f7b58d68f7a73b1182d83162d4d2ee8c475f020
      https://github.com/lxc/lxc/commit/8f7b58d68f7a73b1182d83162d4d2ee8c475f020
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M src/lxc/lxc_user_nic.c

  Log Message:
  -----------
  lxc-user-nic: dont risk passing EOF

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 8befa924f89520784ca2cb876279ab6098cd73e1
      https://github.com/lxc/lxc/commit/8befa924f89520784ca2cb876279ab6098cd73e1
  Author: Serge Hallyn <serge.hallyn at ubuntu.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M src/lxc/Makefile.am
    M src/lxc/conf.c
    M src/lxc/lxc_user_nic.c
    M src/lxc/network.c
    M src/lxc/network.h
    M src/tests/Makefile.am
    M src/tests/lxc-test-usernic

  Log Message:
  -----------
  lxc-user-nic: use common code from network.c

This pulls a lot of common code out of lxc_user_nic.c.  It also
moves one function from conf.c that was duplicated in lxc_user_nic.c
(It removes a DEBUG statement because (a) it doesn't seem actually
useful and (b) DEBUG doesn't work in network.c).

Also replace the old test of only parsing code with a skeleton for
a full test.  (Note - the test will need some work, it's just there
as do-what-i-mean code example)

Signed-off-by: Serge Hallyn <serge.hallyn at ubuntu.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


  Commit: 6a59920b640e89b4b12a47175b5cbb68a48a9289
      https://github.com/lxc/lxc/commit/6a59920b640e89b4b12a47175b5cbb68a48a9289
  Author: Michael H. Warfield <mhw at WittsEnd.com>
  Date:   2013-11-25 (Mon, 25 Nov 2013)

  Changed paths:
    M templates/lxc-fedora.in

  Log Message:
  -----------
  Fix stupid architecture error.

>From 38cfabdbe0e46f5a0ed20687fcda48424b4a7b6d Mon Sep 17 00:00:00 2001
From: "Michael H. Warfield" <mhw at WittsEnd.com>
Date: Mon, 25 Nov 2013 10:34:48 -0500
Subject: [PATCH 1/2] Fix stupid architecture error.
Organization: Thaumaturgy & Speculums Technology

Fix stupid architecture error.

Stupid error and I did it!  Fixed hard coded x86_64 in several spots.

Signed-off-by: Michael H. Warfield <mhw at WittsEnd.com>
Acked-by: Stéphane Graber <stgraber at ubuntu.com>


Compare: https://github.com/lxc/lxc/compare/8cd80b50efe2...6a59920b640e