From b256e6e4248c4529493411d38ed71794ceb40961 Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 27 May 2013 08:03:31 +0000
Subject: [PATCH] add a README file for how to make conserver RPM and update
 the initscript.patch

Former-commit-id: c768e650358877d2589a33369279bf72499136e5
---
 conserver/README           | 33 +++++++++++++++++++++++++++++++++
 conserver/initscript.patch | 19 ++++++++++---------
 2 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 conserver/README

diff --git a/conserver/README b/conserver/README
new file mode 100644
index 0000000..00d09ad
--- /dev/null
+++ b/conserver/README
@@ -0,0 +1,33 @@
+To make the conserver-xcat rpm, run:
+
+./bldconserver.pl
+
+To update the initscript.patch or initscript1.patch:
+
+1. Copy conserver-8.1.16.tar.gz to a directory, say /root/conserverstar
+  mkdir /root/conservertar
+  cp conserver-8.1.16.tar.gz /root/conserverstar
+
+2. Copy the initscript.patch or initscript1.patch to the same directory
+  cp initscript.patch /root/conserverstar
+
+3. Uncompress the conserver-8.1.16.tar.gz into two copies:
+  tar zxvf conserver-8.1.16.tar.gz
+  mv conserver-8.1.16 conserver-8.1.16-diffinit
+  tar zxvf conserver-8.1.16.tar.gz
+
+4. Patch the conserver.init with the original patch copied from SVN repository
+  cd /root/conservertar
+  cat initscript.patch | /usr/bin/patch -s -p1 --fuzz=0
+  select conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init as the file to patch
+
+5. Update the conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init with whatever changes that are needed
+
+6. Generate the new patch:
+  cd /root/conserverstart
+  diff -ruN conserver-8.1.16/contrib/redhat-rpm/conserver.init conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init > initscript.patch
+
+7. Copy the new patch to the xcat-dep SVN repository and checkin
+  cp initscript.patch ~/xcat/xcat-dep/trunk/conserver/
+  cd ~/xcat/xcat-dep/trunk/conserver/
+  svn commit -m "blah blah blah"
diff --git a/conserver/initscript.patch b/conserver/initscript.patch
index 1c27d9e..f62b338 100644
--- a/conserver/initscript.patch
+++ b/conserver/initscript.patch
@@ -1,11 +1,9 @@
---- conserver-8.1.16/contrib/redhat-rpm/conserver.init	2013-05-27 10:53:15.541680201 +0800
-+++ conserver-8.1.16-diffinit/contrib/redhat-rpm/conserver.init	2013-05-27 10:42:14.414593578 +0800
-@@ -16,14 +16,53 @@
- # Description: Console server
- ### END INIT INFO
- 
--# Source function library.
--. /etc/rc.d/init.d/functions
+--- 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-27 15:49:39.435650612 +0800
+@@ -6,15 +6,53 @@
+ # description: conserver is a serial-port console daemon
+ # config: /etc/conserver.cf
+ #
 +RHPassed()
 +{
 +    passed
@@ -34,6 +32,9 @@
 +  return $RVAL
 +}
  
+-# Source function library.
+-. /etc/rc.d/init.d/functions
+-
 -# Source networking configuration.
 -. /etc/sysconfig/network
  
@@ -60,7 +61,7 @@
  
  # make sure conserver is installed and executable
  [ -x /usr/sbin/conserver  ] || exit 1
-@@ -33,23 +72,45 @@
+@@ -24,23 +62,45 @@
  case "$1" in
    start)
      echo -n "Starting conserver: "