From: Tony Breeds <tony@bakeyournoodle.com>
Date: Fri, 16 Jul 2010 05:11:38 +0000 (+1000)
Subject: Merge branch 'devel'
X-Git-Tag: yaboot-1.3.17-rc1~26
X-Git-Url: https://git.ozlabs.org/?p=yaboot.git;a=commitdiff_plain;h=8aef1508bddad47681e258e9f2eaa7987cbd8a32;hp=a01ba048668c5a7e5efa2aa41eeb0a3ed374a63a

Merge branch 'devel'
---

diff --git a/Developers_Certificate_of_Origin.txt b/Developers_Certificate_of_Origin.txt
new file mode 100644
index 0000000..7fd781a
--- /dev/null
+++ b/Developers_Certificate_of_Origin.txt
@@ -0,0 +1,17 @@
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or
+
+(c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it.
+
+(d) The contribution is made free of any other party's intellectual property claims or rights.
+
+(e) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved.
+
+then you just add a line saying
+
+	Signed-off-by: Random J Developer random@developer.org>
diff --git a/Makefile b/Makefile
index 4c35c67..336ac52 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 include Config
 
-VERSION = 1.3.14
+VERSION = 1.3.16
 # Debug mode (spam/verbose)
 DEBUG = 0
 # make install vars
diff --git a/second/file.c b/second/file.c
index 81d91a9..debf7f4 100644
--- a/second/file.c
+++ b/second/file.c
@@ -261,10 +261,8 @@ extract_vendor_options(struct bootp_packet *packet, struct boot_fspec_t *result)
 /*
  * Check netinfo for ipv4 parameters and add them to the fspec iff the
  * fspec has no existing value.
- *
- * Returns 1 on success, 0 on failure.
  */
-static int
+static void
 extract_netinfo_args(struct boot_fspec_t *result)
 {
      struct bootp_packet *packet;
@@ -272,7 +270,7 @@ extract_netinfo_args(struct boot_fspec_t *result)
      /* Check to see if we can get the [scyg]iaddr fields from netinfo */
      packet = prom_get_netinfo();
      if (!packet)
-          return 0;
+          return;
 
      DEBUG_F("We have a boot packet\n");
      DEBUG_F(" siaddr = <%x>\n", packet->siaddr);
@@ -304,8 +302,6 @@ extract_netinfo_args(struct boot_fspec_t *result)
           result->giaddr = ipv4_to_str(packet->siaddr);
           DEBUG_F("Forcing giaddr to siaddr <%s>\n", result->giaddr);
      }
-
-     return 1;
 }
 
 /*
@@ -370,7 +366,7 @@ extract_netboot_args(char *imagepath, struct boot_fspec_t *result)
 	  ret = extract_ipv6_args(imagepath, result);
      else
 	  ret = extract_ipv4_args(imagepath, result);
-     ret |= extract_netinfo_args(result);
+     extract_netinfo_args(result);
 
      DEBUG_F("ipv6 = <%d>\n", result->is_ipv6);
      DEBUG_F("siaddr = <%s>\n", result->siaddr);
diff --git a/ybin/ybin b/ybin/ybin
index d883622..44e63f4 100755
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -29,7 +29,7 @@ fi
 PRG="${0##*/}"
 ABSPRG="$0"
 SIGINT="$PRG: Interrupt caught ... exiting"
-VERSION=1.3.14
+VERSION=1.3.16
 DEBUG=0
 VERBOSE=0
 TMP="${TMPDIR:-/tmp}"