From 897bf547750ddba4e239f859b095b3ba31c5afbb Mon Sep 17 00:00:00 2001
From: Henri Wahl <h.wahl@ifw-dresden.de>
Date: Mon, 29 Jul 2013 13:13:34 +0200
Subject: [PATCH] prepare 0.3

---
 etc/init.d/dhcpy6d              | 4 +++-
 installer/debian/changelog      | 7 ++++---
 installer/redhat/init.d/dhcpy6d | 4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/etc/init.d/dhcpy6d b/etc/init.d/dhcpy6d
index f4cdcc9..2b3d309 100755
--- a/etc/init.d/dhcpy6d
+++ b/etc/init.d/dhcpy6d
@@ -19,6 +19,8 @@ DHCPY6DCONF=/etc/dhcpy6d.conf
 DHCPY6DPID=/var/run/dhcpy6d.pid
 NAME="dhcpy6d"
 DESC="dhcpy6d DHCPv6 server"
+USER=dhcpy6d
+GROUP=dhcpy6d
 
 RUN=no
 DEFAULTFILE=/etc/default/dhcpy6d
@@ -57,7 +59,7 @@ fi
 if ! check_status; then
 
 start-stop-daemon --start --make-pidfile --pidfile ${DHCPY6DPID} \
---background --oknodo --exec $DHCPY6DBIN -- --config $DHCPY6DCONF --user dhcpy6d --group dhcpy6d
+--background --oknodo --exec $DHCPY6DBIN -- --config $DHCPY6DCONF --user $USER --group $GROUP
 
 sleep 2
 if check_status -q; then
diff --git a/installer/debian/changelog b/installer/debian/changelog
index ebfd26a..0d3b701 100644
--- a/installer/debian/changelog
+++ b/installer/debian/changelog
@@ -1,10 +1,11 @@
-dhcpy6d (0.3git-1) unstable; urgency=low
+dhcpy6d (0.3) unstable; urgency=low
 
   * New upstream
+    - running as non-root user/group dhcpy6d
+    - deb improvements
     - rpm improvements
-    - running as non-root user dhcpy6d
 
- -- Henri Wahl <h.wahl@ifw-dresden.de>  Mon, 10 Jun 2013 11:47:00 +0200
+ -- Henri Wahl <h.wahl@ifw-dresden.de>  Mon, 29 Jul 2013 13:14:00 +0200
 
 
 dhcpy6d (0.2-1) unstable; urgency=low
diff --git a/installer/redhat/init.d/dhcpy6d b/installer/redhat/init.d/dhcpy6d
index 81b918b..5c169b8 100755
--- a/installer/redhat/init.d/dhcpy6d
+++ b/installer/redhat/init.d/dhcpy6d
@@ -28,6 +28,8 @@ exec=/usr/sbin/dhcpy6d
 lockfile=/var/lock/subsys/dhcpy6d
 pidfile=/var/run/dhcpy6d.pid
 config=/etc/dhcpy6d.conf
+user=dhcpy6d
+group=dhcpy6d
 
 rh_status() {
     status -p $pidfile -l $(basename $lockfile) $exec
@@ -45,7 +47,7 @@ start() {
     rh_status_q && return 0
 
     echo -n $"Starting $prog: "
-    $exec --config $config --user dhcpy6d --group dhcpy6d &
+    $exec --config $config --user $user --group $group &
     RETVAL=$?
     pid=$!
     echo $pid > $pidfile