From 7b1300378cd2ba6020496bc5217e855a48cfa232 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@lanl.gov>
Date: Tue, 24 Apr 2012 10:03:14 -0600
Subject: [PATCH] last-minute fixes for ipv4

---
 install.sh                    | 2 +-
 packages/00admin/sbin/fire-ip | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/install.sh b/install.sh
index 5573b7b..2538025 100755
--- a/install.sh
+++ b/install.sh
@@ -14,7 +14,7 @@ fatsize=$(sfdisk -l /dev/sdb | awk '/^Disk/ {print $3 - 2;}')
 FATFS=${DRIVE}1
 EXTFS=${DRIVE}2
 
-sfdisk $DRIVE <<EOF
+sfdisk $DRIVE <<EOF || true
 ,$fatsize,6,*
 ,,L
 EOF
diff --git a/packages/00admin/sbin/fire-ip b/packages/00admin/sbin/fire-ip
index f688932..d1ed2ca 100755
--- a/packages/00admin/sbin/fire-ip
+++ b/packages/00admin/sbin/fire-ip
@@ -6,7 +6,7 @@ read n < ip.txt
 
 if grep -q ipv4 /proc/cmdline; then
     # IPv4
-    IP="10.0.0.$n/24"
+    IP="10.0.0.$n/16"
 else
     # IPv6
     l=$(busybox dc 16 o $n p)
@@ -20,7 +20,7 @@ fi
 if [ "$action" = "add" ]; then
     fail=fail
     for i in $(seq 5); do
-        if ip addr | grep -Fq $IP; then
+        if ip addr | grep -v tentative | grep -Fq $IP; then
             fail=
             break
         fi