From e76294c5093014544f03fe80a2c9bf1820b3f64f Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Sat, 4 Oct 2008 20:13:10 -0400 Subject: [PATCH] Install the DHCP server through more standard means, since the DHCP server code is fairly stable svn path=/trunk/packages/sipb-xen-dhcp/; revision=1035 --- debian/changelog | 3 ++- debian/control | 4 ++-- debian/rules | 3 --- debian/sipb-xen-dhcp.init | 2 +- .../usr/sbin/sipb-xen-dhcpserver | 0 5 files changed, 5 insertions(+), 7 deletions(-) rename code/dhcpserver.py => files/usr/sbin/sipb-xen-dhcpserver (100%) diff --git a/debian/changelog b/debian/changelog index 3dbbe51..a2bbc7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ sipb-xen-dhcp (3) unstable; urgency=low * invirt-configurize dhcp * Use the syslog instead of the event_logger module + * Install the server in a more standard location - -- Evan Broder Sat, 04 Oct 2008 20:08:29 -0400 + -- Evan Broder Sat, 04 Oct 2008 20:10:17 -0400 sipb-xen-dhcp (2) unstable; urgency=low diff --git a/debian/control b/debian/control index fae2da7..a2b46d8 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,10 @@ Source: sipb-xen-dhcp Section: base Priority: extra Maintainer: SIPB Xen Project -Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), subversion +Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0) Standards-Version: 3.7.2 Package: sipb-xen-dhcp Architecture: all -Depends: ${misc:Depends}, daemon, sipb-xen-database-common, sipb-xen-python-pydhcplib (>= 0.3.2-2) +Depends: ${misc:Depends}, daemon, sipb-xen-database-common, sipb-xen-python-pydhcplib (>= 0.3.2-2), sipb-xen-base Description: Install and enable the DHCP server diff --git a/debian/rules b/debian/rules index 341bade..e6192f6 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,3 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk - -binary-fixup/sipb-xen-dhcp:: - svn co https://sipb-xen-dev.mit.edu:1111/trunk/packages/sipb-xen-dhcp/code/ $(DEB_DESTDIR)/usr/local/lib/sipb-xen-dhcp diff --git a/debian/sipb-xen-dhcp.init b/debian/sipb-xen-dhcp.init index a1b14be..37bb6bb 100644 --- a/debian/sipb-xen-dhcp.init +++ b/debian/sipb-xen-dhcp.init @@ -17,7 +17,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="The sipb-xen DHCP server" NAME=sipb-xen-dhcp -DAEMON=/usr/local/lib/sipb-xen-dhcp/dhcpserver.py +DAEMON=/usr/sbin/sipb-xen-dhcpserver DAEMON_ARGS="" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME diff --git a/code/dhcpserver.py b/files/usr/sbin/sipb-xen-dhcpserver similarity index 100% rename from code/dhcpserver.py rename to files/usr/sbin/sipb-xen-dhcpserver -- 1.7.9.5