Add pinentry for gnupg

[hvlinux.git] / stage2 / bootscripts / dhcp

diff --git a/stage2/bootscripts/dhcp b/stage2/bootscripts/dhcp
index fbbd241..b814bb2 100755 (executable)
--- a/stage2/bootscripts/dhcp
+++ b/stage2/bootscripts/dhcp
@@ -10,6 +10,10 @@ log_script_name "$0 $*"
 # Load global network parameters
 source /etc/sysconfig/network/network-parameters
 
+DAEMON=/usr/sbin/dhcpd
+DAEMON_DESC="DHCP server"
+DAEMON_OPTS="-q ${DHCP_SERVER_IF}"
+
 if [ -z "${DHCP_SERVER_IF}" ]; then
     # DHCP server is not enabled
     msg_log "DHCP server disabled in '/etc/sysconfig/network/network-parameters'"
@@ -24,13 +28,13 @@ fi
 # See how we were called
 case "$1" in
     start)
-       cmd_run_log_box_warn "DHCP server start" loadproc /usr/sbin/dhcpd -q ${DHCP_SERVER_IF}
+       cmd_run_log_box_warn "${DAEMON_DESC} start" loadproc ${DAEMON} ${DAEMON_OPTS}
        ;;
-    
+
     stop)
-       cmd_run_log_box_warn "DHCP server stop" killproc /usr/sbin/dhcpd
+       cmd_run_log_box_warn "${DAEMON_DESC} stop" killproc ${DAEMON}
        ;;
-   
+
     restart)
        $0 stop
        sleep 1
@@ -38,9 +42,9 @@ case "$1" in
        ;;
 
     status)
-       statusproc /usr/sbin/dhcpd
+       statusproc ${DAEMON}
        ;;
-    
+
     *)
        echo "Usage: $0 {restart|start|status|stop}"
         exit ${EXIT_CODE_FAILURE}