From 0023d7fdfb494657d59fd0c9bf1b96db8c3c359c Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 15 Sep 2019 10:05:03 +0000
Subject: [PATCH] qemu-boot.sh: Come code cleanup

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/qemu-boot.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/scripts/qemu-boot.sh b/scripts/qemu-boot.sh
index 5f64a225..81d0e855 100644
--- a/scripts/qemu-boot.sh
+++ b/scripts/qemu-boot.sh
@@ -3,7 +3,7 @@
 goodbye()
 {
 	:
-	# rm -f $tmp_files
+	rm -f $tmp_files
 }
 
 usage()
@@ -43,20 +43,25 @@ do_sudo()
 		log running $@
 		eval "$@"
 		return $?
-	else
-		log running sudo $@
-		#sudo -p "Password for $myname:" $@
-		eval sudo "$@"
-		return $?
 	fi
+	log running sudo $@
+	#sudo -p "Password for $myname:" $@
+	eval sudo "$@"
+	return $?
 }
 
 ldap_search()
 {
 	local ldap_server=ldap.lcl
 	local binddn=cn=ldapadm,dc=jannet,dc=de
-	local password_file=$HOME/.feedfs-ldap/passwords/$binddn@$ldap_server
-	[ -r "$password_file" ] || fatal "Password file $password_file doesn't exist"
+	local password_files="$HOME/.feedfs-ldap/passwords/$binddn@$ldap_server $HOME/.ldap.secret"
+	local p password_file
+	for p in $password_files; do
+		[ -r "$p" ] || continue
+		password_file=$p
+		break
+	done
+	[ "$password_file" ] || fatal "None of the LDAP password files $password_files exists"
 	ldapsearch -y $password_file -xZ -h $ldap_server -D $binddn -b $base,ou=networks,dc=jannet,dc=de $@
 }
 
@@ -75,8 +80,8 @@ boot_net()
 		macaddr=",macaddr=$mac"
 	}
 
-	ps aux | grep -v grep | grep -q dhcpd || /etc/init.d/dhcpd start
-	ps aux | grep -v grep | grep -q nfsd || /etc/init.d/nfsserver start
+	systemctl try-start dhcpd-priv.lcl
+	systemctl try-start nfsserver
 
 	[ "$nic_model" ] || nic_model=",model=e1000"
 	# need this for net access, would be nicer if it didn't run as root
@@ -107,7 +112,6 @@ boot_image()
 
 	test -r "$boot_image" || fatal "inaccessible boot image \"$boot_image\""
 		#-net bridge,br=$bridge \
-
 		#-net nic,vlan=1$nic_model,macaddr=00:02:36:22:13:6c \
  		#-net tap,ifname=tap1,vlan=1,script=$tmpdir/qemu-ifup,downscript=$tmpdir/qemu-ifdown \
 	#set -x
@@ -120,12 +124,9 @@ boot_image()
 
 boot()
 {
-	tmpdir=`mktemp -d /tmp/$myname""_XXXXXX`
-	(
-		cd $tmpdir
-		ln -s $exe qemu-ifup
-		ln -s $exe qemu-ifdown
-	)
+	tmpdir=`mktemp -d /tmp/$myname-XXXXXX`
+	ln -s $exe $tmpdir/qemu-ifup
+	ln -s $exe $tmpdir/qemu-ifdown
 
 	#do_sudo /sbin/modprobe kvm-intel
 	tmp_files="$tmp_files $tmpdir"
@@ -225,4 +226,3 @@ qemu-boot.sh) # legacy
 	echo called as unknown executable name $0
 	;;
 esac
-