From d0d8a8f43943f9d65bb0ab7a1f830f9ef43a668c Mon Sep 17 00:00:00 2001
From: xq2005 <xq2005@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 26 Jun 2013 08:05:11 +0000
Subject: [PATCH] sync the patch file on ubuntu

Former-commit-id: 32a53d327a5fc53cd2037f2c27c9e67baeb2c722
---
 conserver/debian/patches/initscript.patch | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/conserver/debian/patches/initscript.patch b/conserver/debian/patches/initscript.patch
index 1131a40..f62b338 100644
--- a/conserver/debian/patches/initscript.patch
+++ b/conserver/debian/patches/initscript.patch
@@ -1,19 +1,9 @@
 --- conserver-8.1.16/contrib/redhat-rpm/conserver.init	2003-02-28 10:06:50.000000000 +0800
-+++ conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init	2013-05-24 14:36:21.006320225 +0800
-@@ -6,15 +6,63 @@
++++ conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init	2013-05-27 15:49:39.435650612 +0800
+@@ -6,15 +6,53 @@
  # description: conserver is a serial-port console daemon
  # config: /etc/conserver.cf
  #
-+### BEGIN INIT INFO
-+# Provides: conserver
-+# Required-Start: 
-+# Required-Stop:
-+# Default-Start: 2 3 4 5
-+# Default-stop:
-+# Short-Description: conserver
-+# Description: Console server
-+### END INIT INFO
-+
 +RHPassed()
 +{
 +    passed
@@ -71,7 +61,7 @@
  
  # make sure conserver is installed and executable
  [ -x /usr/sbin/conserver  ] || exit 1
-@@ -24,23 +72,45 @@
+@@ -24,23 +62,45 @@
  case "$1" in
    start)
      echo -n "Starting conserver: "