From 171c8aa118efd6fe802e63e22175f8c34ee673cd Mon Sep 17 00:00:00 2001 From: jwsimpson Date: Wed, 3 Oct 2012 11:27:29 +0000 Subject: [PATCH] update to correct problems with post boot script changes git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13935 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/install/scripts/post.debian | 1 - xCAT-server/share/xcat/install/scripts/post.rhel5.s390x | 6 +++++- xCAT-server/share/xcat/install/scripts/post.rhel6.s390x | 6 +++++- xCAT-server/share/xcat/install/scripts/post.sles10.s390x | 6 +++++- xCAT-server/share/xcat/install/scripts/post.sles11.s390x | 6 +++++- xCAT-server/share/xcat/install/scripts/post.ubuntu | 1 - 6 files changed, 20 insertions(+), 6 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/post.debian b/xCAT-server/share/xcat/install/scripts/post.debian index 9c10ff73d..922b4ca67 100644 --- a/xCAT-server/share/xcat/install/scripts/post.debian +++ b/xCAT-server/share/xcat/install/scripts/post.debian @@ -86,7 +86,6 @@ do touch /opt/xcat/xcatinfo fi echo "XCATSERVER=$i" > /opt/xcat/xcatinfo - echo "REBOOT=TRUE" >> /opt/xcat/xcatinfo break fi RAND=$(perl -e 'print int(rand(5)). "\n"') diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x index 21947d955..2f33d17e6 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.rhel5.s390x @@ -138,7 +138,11 @@ 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# +EOF +chmod 755 /opt/xcat/xcatdsklspost # Only run preboot scripts here TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ d" /xcatpost/mypostscript` diff --git a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x index 017469d8b..fb43a6622 100644 --- a/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.rhel6.s390x @@ -137,7 +137,11 @@ 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# +EOF +chmod 755 /opt/xcat/xcatdsklspost # Only run preboot scripts here TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ d" /xcatpost/mypostscript` diff --git a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x index 81df0cc8f..8c0b8c1ab 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles10.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.sles10.s390x @@ -156,7 +156,11 @@ 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# +EOF +chmod 755 /opt/xcat/xcatdsklspost # Only run prebooot scripts here TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ d" /tmp/mypostscript` diff --git a/xCAT-server/share/xcat/install/scripts/post.sles11.s390x b/xCAT-server/share/xcat/install/scripts/post.sles11.s390x index c6169f436..2fcc08c60 100644 --- a/xCAT-server/share/xcat/install/scripts/post.sles11.s390x +++ b/xCAT-server/share/xcat/install/scripts/post.sles11.s390x @@ -151,7 +151,11 @@ 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# +EOF +chmod 755 /opt/xcat/xcatdsklspost # Only run prebooot scripts here TMP=`sed "/postbootscripts-start-here/,/postbootscripts-end-here/ d" /tmp/mypostscript` diff --git a/xCAT-server/share/xcat/install/scripts/post.ubuntu b/xCAT-server/share/xcat/install/scripts/post.ubuntu index 0c133e454..9b2d4fbf2 100644 --- a/xCAT-server/share/xcat/install/scripts/post.ubuntu +++ b/xCAT-server/share/xcat/install/scripts/post.ubuntu @@ -88,7 +88,6 @@ do touch /opt/xcat/xcatinfo fi echo "XCATSERVER=$i" > /opt/xcat/xcatinfo - echo "REBOOT=TRUE" >> /opt/xcat/xcatinfo break fi RAND=$(perl -e 'print int(rand(5)). "\n"')