Re: [meta-selinux][PATCH 1/2] dhcp: make a copy of init-server

[Pascal Ouyang <xin.ouyang@windriver.com>]

于 14-6-16 上午9:38, wenzong.fan@windriver.com 写道:
> From: Wenzong Fan <wenzong.fan@windriver.com>
> 
> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ---
>   recipes-connectivity/dhcp/dhcp_4.3.0.bbappend |    3 ++
>   recipes-connectivity/dhcp/files/init-server   |   44 +++++++++++++++++++++++++
>   2 files changed, 47 insertions(+)
>   create mode 100644 recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
>   create mode 100644 recipes-connectivity/dhcp/files/init-server
> 
> diff --git a/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
> new file mode 100644
> index 0000000..900c2aa
> --- /dev/null
> +++ b/recipes-connectivity/dhcp/dhcp_4.3.0.bbappend
> @@ -0,0 +1,3 @@
> +inherit with-selinux
> +
> +FILESEXTRAPATHS_prepend := "${@target_selinux(d, '${THISDIR}/files:')}"
> diff --git a/recipes-connectivity/dhcp/files/init-server b/recipes-connectivity/dhcp/files/init-server
> new file mode 100644
> index 0000000..34c2085
> --- /dev/null
> +++ b/recipes-connectivity/dhcp/files/init-server
> @@ -0,0 +1,44 @@
> +#!/bin/sh
> +#
> +# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $
> +#
> +
> +test -f /usr/sbin/dhcpd || exit 0
> +
> +# It is not safe to start if we don't have a default configuration...
> +if [ ! -f /etc/default/dhcp-server ]; then
> +	echo "/etc/default/dhcp-server does not exist! - Aborting..."
> +	exit 0
> +fi
> +
> +# Read init script configuration (so far only interfaces the daemon
> +# should listen on.)
> +. /etc/default/dhcp-server
> +
> +case "$1" in
> +	start)
> +		echo -n "Starting DHCP server: "
> +		test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/
> +		test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases	
> +		start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES
> +		echo "."
> +		;;
> +	stop)
> +		echo -n "Stopping DHCP server: dhcpd3"
> +		start-stop-daemon -K -x /usr/sbin/dhcpd
> +		echo "."
> +		;;
> +	restart | force-reload)
> +		$0 stop
> +		sleep 2
> +		$0 start
> +		if [ "$?" != "0" ]; then
> +			exit 1
> +		fi
> +		;;
> +	*)
> +		echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}"
> +		exit 1
> +esac
> +
> +exit 0
> 


Merged, thanks. :)

-- 
- Pascal