From a2f73a2b8c719c2c2b851b945f2f67446d03e13b Mon Sep 17 00:00:00 2001
From: jwsimpson <jwsimpson@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 4 Oct 2012 21:02:15 +0000
Subject: [PATCH] git-svn-id:
 https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13948
 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

---
 xCAT-server/share/xcat/install/scripts/post.rhel5.s390x  | 3 ++-
 xCAT-server/share/xcat/install/scripts/post.rhel6.s390x  | 3 ++-
 xCAT-server/share/xcat/install/scripts/post.sles10.s390x | 3 ++-
 xCAT-server/share/xcat/install/scripts/post.sles11.s390x | 2 ++
 xCAT-server/share/xcat/install/scripts/post.ubuntu       | 1 -
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x
index 2f33d17e6..231a47aea 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x
@@ -134,10 +134,11 @@ mkdir -p /opt/xcat
 cat >/opt/xcat/xcatinstallpost << 'EOF'
 # Install directory variable set by nodeset
 $INSTALLDIR/postscripts/xcatinstallpost
-chkconfig xcatpostinit1 off
 EOF
 chmod 755 /opt/xcat/xcatinstallpost
 
+chkconfig --add xcatpostinit1
+
 #create the dskls post 
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x
index fb43a6622..d32843f4a 100644
--- a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x
@@ -133,10 +133,11 @@ mkdir -p /opt/xcat
 cat >/opt/xcat/xcatinstallpost << 'EOF'
 # Install directory variable set by nodeset
 $INSTALLDIR/postscripts/xcatinstallpost
-chkconfig xcatpostinit1 off
 EOF
 chmod 755 /opt/xcat/xcatinstallpost
 
+chkconfig --add xcatpostinit1
+
 #create the dskls post 
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
diff --git a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x
index 8c0b8c1ab..71f0a76a4 100644
--- a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x
@@ -151,11 +151,12 @@ mkdir -p /opt/xcat
 cat >/opt/xcat/xcatinstallpost << 'EOF'
 # Install directory variable is set by nodeset
 $INSTALLDIR/postscripts/xcatinstallpost
-chkconfig xcatpostinit1 off
 EOF
 # Change permissions
 chmod 755 /opt/xcat/xcatinstallpost
 
+chkconfig --add xcatpostinit1
+
 #create the dskls post 
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11.s390x b/xCAT-server/share/xcat/install/scripts/post.sles11.s390x
index 2fcc08c60..65b57b97c 100644
--- a/xCAT-server/share/xcat/install/scripts/post.sles11.s390x
+++ b/xCAT-server/share/xcat/install/scripts/post.sles11.s390x
@@ -151,6 +151,8 @@ EOF
 # Change permissions
 chmod 755 /opt/xcat/xcatinstallpost
 
+chkconfig --add xcatpostinit1
+
 #create the dskls post 
 cat >/opt/xcat/xcatdsklspost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
diff --git a/xCAT-server/share/xcat/install/scripts/post.ubuntu b/xCAT-server/share/xcat/install/scripts/post.ubuntu
index 9b2d4fbf2..42edb6ddd 100644
--- a/xCAT-server/share/xcat/install/scripts/post.ubuntu
+++ b/xCAT-server/share/xcat/install/scripts/post.ubuntu
@@ -144,7 +144,6 @@ ln -s /etc/init.d/xcatpostinit1 /etc/rc2.d/S84xcatpostinit1
 mkdir -p /opt/xcat
 cat >/opt/xcat/xcatinstallpost << 'EOF'
 #INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatinstallpost#
-rm /etc/rc2.d/S84xcatpostinit1
 EOF
 chmod 755 /opt/xcat/xcatinstallpost