From e78aac3b9c520c4f6ecd3912e14df77c5d8a983c Mon Sep 17 00:00:00 2001
From: Josh Kunz <josh@kunz.xyz>
Date: Mon, 11 Mar 2019 22:32:16 -0700
Subject: [PATCH] Minor fixes + support hostname

---
 generate-dhcpd-conf | 11 +++++++----
 run.sh              |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/generate-dhcpd-conf b/generate-dhcpd-conf
index 99aa020..77f97db 100755
--- a/generate-dhcpd-conf
+++ b/generate-dhcpd-conf
@@ -4,6 +4,7 @@ import argparse
 import ipaddress
 import json
 import re
+import socket
 import subprocess
 
 from typing import List
@@ -22,9 +23,10 @@ maxleases 1
 
 interface {dhcp_intf}
 
-option dns    {dns}
-option router {gateway}
-option subnet {subnet}
+option dns      {dns}
+option router   {gateway}
+option subnet   {subnet}
+option hostname {hostname}
 """
 
 def nameservers() -> List[str]:
@@ -70,8 +72,9 @@ def generate_conf(intf_name : str) -> str:
     return DHCP_CONF_TEMPLATE.format(
         dhcp_intf = intf_name,
         dns = ' '.join(nameservers()),
-        host_addr = host_addr.ip,
         gateway = droute['gateway'],
+        host_addr = host_addr.ip,
+        hostname = socket.gethostname(),
         subnet = host_addr.network.netmask,
     )
 
diff --git a/run.sh b/run.sh
index 95fd1a1..f5adb1c 100755
--- a/run.sh
+++ b/run.sh
@@ -50,7 +50,7 @@ udhcpd -I $DUMMY_DHCPD_IP -f $DHCPD_CONF_FILE &
 # -serial mon:stdio: use "monitored stdio" as our serial output.
 # -nic: Use a TAP interface with our custom up/down scripts.
 # -drive: The VM image we're booting.
-qemu-system-x86_64 -enable-kvm -nographic -serial mon:stdio \
+exec qemu-system-x86_64 -enable-kvm -nographic -serial mon:stdio \
     -nic tap,id=qemu0,script=$QEMU_IFUP,downscript=$QEMU_IFDOWN \
     "$@" \
     -drive format=raw,file=/image