TEST-20-NFS: remove stale pid file

test/TEST-20-NFS/dhcpd.conf

@@ -3,16 +3,16 @@ ddns-update-style none;
 use-host-decl-names true;
 
 subnet 192.168.50.0 netmask 255.255.255.0 {
-	option subnet-mask      255.255.255.0;
-	option routers          192.168.50.1;
-	next-server             192.168.50.1;
-	server-identifier       192.168.50.1;
-	option domain-name-servers 192.168.50.1;
-	option domain-search "example.com";
-	option domain-name "other.com";
-
-	# MAC numbering scheme:
-	# NFSv3: last octect starts at 0x00 and works up
+option subnet-mask      255.255.255.0;
+option routers          192.168.50.1;
+next-server             192.168.50.1;
+server-identifier       192.168.50.1;
+option domain-name-servers 192.168.50.1;
+option domain-search "example.com";
+option domain-name "other.com";
+
+# MAC numbering scheme:
+# NFSv3: last octect starts at 0x00 and works up
 
     group {
         # NFSv3 root=dhcp or root={/dev/,}nfs, use server-id

test/TEST-20-NFS/server-init.sh

@@ -46,10 +46,12 @@ rpc.idmapd
 echo > /dev/watchdog
 exportfs -r
 echo > /dev/watchdog
+mkdir -p /var/lib/dhcpd
 >/var/lib/dhcpd/dhcpd.leases
 echo > /dev/watchdog
 chmod 777 /var/lib/dhcpd/dhcpd.leases
 echo > /dev/watchdog
+rm -f /var/run/dhcpd.pid
 dhcpd -d -cf /etc/dhcpd.conf -lf /var/lib/dhcpd/dhcpd.leases &
 echo "Serving NFS mounts"
 while :; do

test/TEST-20-NFS/test.sh

@@ -237,7 +237,7 @@ test_setup() {
         inst_multiple sh ls shutdown poweroff stty cat ps ln ip \
             dmesg mkdir cp ping exportfs \
             modprobe rpc.nfsd rpc.mountd showmount tcpdump \
-            /etc/services sleep mount chmod
+            /etc/services sleep mount chmod rm
         for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
             [ -f ${_terminfodir}/l/linux ] && break
         done