arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the way the xcatdsklspost file is included in the template file

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4266 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2009-09-30 17:27:42 +00:00
parent 4fedb1cc7f
commit befc4743c4
7 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/Template.pm
View File

@ -75,6 +75,8 @@ sub subvars {
$inc =~ s/#CRYPT:([^:]+):([^:]+):([^#]+)#/crydb($1,$2,$3)/eg;
$inc =~ s/#COMMAND:([^#]+)#/command($1)/eg;
$inc =~ s/#INCLUDE_NOP:([^#]+)#/includefile($1,1)/eg;
$inc =~ s/#INCLUDE:([^#]+)#/includefile($1, 0)/eg;
if ($tmplerr) {
close ($outh);

8
xCAT-server/share/xcat/install/scripts/post.rh
View File

@ -23,8 +23,8 @@ hostname $HOSTNAME
#
# put xCAT post install in init.d process
#
cat >/etc/init.d/xcatpostinit << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
cat >/etc/init.d/xcatpostinit << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
EOF
chmod 755 /etc/init.d/xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@ -32,8 +32,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit
mkdir -p /opt/xcat
cat >/opt/xcat/xcatdsklspost << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
cat >/opt/xcat/xcatdsklspost << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
chkconfig xcatpostinit off
EOF
TMP=`sed "/IBM(c)/ a ADDSITEYUM=1" /opt/xcat/xcatdsklspost`

8
xCAT-server/share/xcat/install/scripts/post.rh.iscsi
View File

@ -22,8 +22,8 @@ export HOSTNAME=$(host $IP 2>/dev/null | awk '{print $5}' | awk -F. '{print $1}'
hostname $HOSTNAME#
# put xCAT post install in init.d process
#
cat >/etc/init.d/xcatpostinit << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
cat >/etc/init.d/xcatpostinit << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
EOF
chmod 755 /etc/init.d/xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@ -31,8 +31,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit
mkdir -p /opt/xcat
cat >/opt/xcat/xcatdsklspost << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
cat >/opt/xcat/xcatdsklspost << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
chkconfig xcatpostinit off
EOF
TMP=`sed "/IBM(c)/ a ADDSITEYUM=1" /opt/xcat/xcatdsklspost`

8
xCAT-server/share/xcat/install/scripts/post.sles
View File

@ -52,8 +52,8 @@ echo $HOSTNAME
/sbin/portmap
cat >/etc/init.d/xcatpostinit << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
cat >/etc/init.d/xcatpostinit << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
EOF
chmod 755 /etc/init.d/xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@ -61,8 +61,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit
mkdir -p /opt/xcat
cat >/opt/xcat/xcatdsklspost << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
cat >/opt/xcat/xcatdsklspost << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
chkconfig xcatpostinit off
EOF
chmod 755 /opt/xcat/xcatdsklspost

8
xCAT-server/share/xcat/install/scripts/post.sles.iscsi
View File

@ -26,8 +26,8 @@ echo $HOSTNAME
/sbin/portmap
cat >/etc/init.d/xcatpostinit << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
cat >/etc/init.d/xcatpostinit << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
EOF
chmod 755 /etc/init.d/xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@ -35,8 +35,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit
mkdir -p /opt/xcat
cat >/opt/xcat/xcatdsklspost << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
cat >/opt/xcat/xcatdsklspost << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
chkconfig xcatpostinit off
EOF
chmod 755 /opt/xcat/xcatdsklspost

8
xCAT-server/share/xcat/install/scripts/post.sles11
View File

@ -52,8 +52,8 @@ echo $HOSTNAME
/sbin/portmap
cat >/etc/init.d/xcatpostinit << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
cat >/etc/init.d/xcatpostinit << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
EOF
chmod 755 /etc/init.d/xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@ -61,8 +61,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit
mkdir -p /opt/xcat
cat >/opt/xcat/xcatdsklspost << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
cat >/opt/xcat/xcatdsklspost << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
chkconfig xcatpostinit off
EOF
chmod 755 /opt/xcat/xcatdsklspost

8
xCAT-server/share/xcat/install/scripts/post.sles11.iscsi
View File

@ -35,8 +35,8 @@ echo "$MASTER:/install /install nfs timeo=14,intr 1 2" >>/etc/fstab
# check the arch for nodetype
NODE_ARCH=#TABLE:nodetype:$NODE:arch#
cat >/etc/init.d/xcatpostinit << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
cat >/etc/init.d/xcatpostinit << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatpostinit#
EOF
chmod 755 /etc/init.d/xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc3.d/S84xcatpostinit
@ -44,8 +44,8 @@ ln -s /etc/init.d/xcatpostinit /etc/init.d/rc4.d/S84xcatpostinit
ln -s /etc/init.d/xcatpostinit /etc/init.d/rc5.d/S84xcatpostinit
mkdir -p /opt/xcat
cat >/opt/xcat/xcatdsklspost << EOF
#INCLUDE_NOP:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
cat >/opt/xcat/xcatdsklspost << 'EOF'
#INCLUDE:#TABLE:site:key=installdir:value#/postscripts/xcatdsklspost#
chkconfig xcatpostinit off
EOF
chmod 755 /opt/xcat/xcatdsklspost