xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-06-11 17:28:49 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2244 from xcat2/master

Browse Source 
merge changes from master to 2.13 branch for 2.13 release
This commit is contained in:
Xiaopeng Wang
2016-12-01 17:35:35 +08:00
committed by GitHub
parent 75dc1c8b4d 6009f17957
commit c44f3c60d6
10 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makerpm
+4 -4
View File
@@ -55,7 +55,7 @@ function makenoarch {
tar --exclude .svn -czf $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz $RPMNAME
rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz --define "version $VER"
rpmbuild $QUIET -ta $RPMROOT/SOURCES/$RPMNAME-$VER.tar.gz --define "version $VER" $REL "$EASE"
RC=$?
if [ $RPMNAME = "xCAT-UI" ]; then
@@ -137,7 +137,7 @@ function makexcat {
rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/$ARCH/$RPMNAME-$VER*rpm
echo "Building $RPMROOT/RPMS/$ARCH/$RPMNAME-$VER-snap*.$ARCH.rpm $EMBEDTXT..."
rpmbuild $QUIET -ba $RPMNAME/$RPMNAME.spec $TARGET --define "version $VER"
rpmbuild $QUIET -ba $RPMNAME/$RPMNAME.spec $TARGET --define "version $VER" $REL "$EASE"
RC=$?
fi
}
@@ -170,7 +170,7 @@ function makegenesis {
cd - >/dev/null
rm -f $RPMROOT/SRPMS/$RPMNAME-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$VER*rpm
echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$VER-snap*.noarch.rpm $EMBEDTXT..."
rpmbuild $QUIET -ba $DIR/$RPMNAME.spec --define "version $VER"
rpmbuild $QUIET -ba $DIR/$RPMNAME.spec --define "version $VER" $REL "$EASE"
}
function makegenesisscripts {
@@ -190,7 +190,7 @@ function makegenesisscripts {
cd - >/dev/null
rm -f $RPMROOT/SRPMS/$RPMNAME-$ARCH-$VER*rpm $RPMROOT/RPMS/noarch/$RPMNAME-$ARCH-$VER*rpm
echo "Building $RPMROOT/RPMS/noarch/$RPMNAME-$ARCH-$VER-snap*.noarch.rpm $EMBEDTXT..."
rpmbuild $QUIET -ba $DIR/$RPMNAME.spec $TARGET --define "version $VER"
rpmbuild $QUIET -ba $DIR/$RPMNAME.spec $TARGET --define "version $VER" $REL "$EASE"
}
xCAT-server/lib/xcat/monitoring/snmpmon.pm
+2 -2
View File
@@ -514,8 +514,8 @@ sub configBMC {
$ret_text .= "Changeing SNMP PEF policy for IPMI nodes $noderange:\n $result\n";
}
} elsif ($action == 1) {
print "XCATBYPASS=Y rspconfig $noderange alert=en\n";
my $result = `XCATBYPASS=Y rspconfig $noderange alert=en 2>&1`;
print "XCATBYPASS=Y rspconfig $noderange alert=en community=public\n";
my $result = `XCATBYPASS=Y rspconfig $noderange alert=en community=public 2>&1`;
if ($?) {
$ret_val = 1;
xCAT::MsgUtils->message('S', "[mon]: Changeing SNMP PEF policy for IPMI nodes $noderange:\n $result\n");
xCAT-server/lib/xcat/plugins/ipmi.pm
+5
View File
@@ -1924,6 +1924,11 @@ sub do_rflash_process {
# child
elsif ($pid == 0) {
unless (setpgrp()) {
xCAT::SvrUtils::sendmsg([ 1, "Faild to run setgprp for $$ process" ],
$callback, $node);
exit(1);
}
my $extra = $_[8];
my @exargs = @$extra;
my $programe = \$0;
xCAT-server/share/xcat/netboot/rh/dracut_033/xcat-prepivot.sh
+1 -1
View File
@@ -41,7 +41,7 @@ fi
mount -t tmpfs rw $NEWROOT/$RWDIR
mkdir -p $NEWROOT/$RWDIR/tmpfs
ME=`hostname`
ME=`hostname -s`
if [ ! -z $NODE ]; then
ME=$NODE
fi
xCAT-server/share/xcat/netboot/rh/dracut_033/xcatroot
+1 -1
View File
@@ -160,7 +160,7 @@ elif [ -r /rootimg-statelite.gz ]; then
mount -t tmpfs rw $NEWROOT/$RWDIR
mkdir -p $NEWROOT/$RWDIR/tmpfs
ME=`hostname`
ME=`hostname -s`
if [ ! -z $NODE ]; then
ME=$NODE
fi
xCAT-test/autotest/bundle/rhels6.7_ppc64.bundle
-3
View File
@@ -270,9 +270,6 @@ switchdiscover_range_z
switchdiscover_range_z_V
makentp_v
makentp_h
makentp_V
makentp
makentp_a
nodeset_check_warninginfo
runcmdinstaller_h
runcmdinstaller_command
xCAT-test/autotest/bundle/rhels6.8_ppc64.bundle
-3
View File
@@ -275,9 +275,6 @@ switchdiscover_range_z
switchdiscover_range_z_V
makentp_v
makentp_h
makentp_V
makentp
makentp_a
nodeset_check_warninginfo
runcmdinstaller_h
runcmdinstaller_command
xCAT-test/autotest/bundle/rhels7.2_ppc64.bundle
-3
View File
@@ -275,9 +275,6 @@ switchdiscover_range_z
switchdiscover_range_z_V
makentp_v
makentp_h
makentp_V
makentp
makentp_a
nodeset_check_warninginfo
runcmdinstaller_h
runcmdinstaller_command
xCAT-test/autotest/bundle/rhels7.3_ppc64.bundle
-3
View File
@@ -275,9 +275,6 @@ switchdiscover_range_z
switchdiscover_range_z_V
makentp_v
makentp_h
makentp_V
makentp
makentp_a
nodeset_check_warninginfo
runcmdinstaller_h
runcmdinstaller_command
xCAT-test/autotest/bundle/sles11.4_ppc64.bundle
-3
View File
@@ -257,9 +257,6 @@ switchdiscover_range_z
switchdiscover_range_z_V
makentp_v
makentp_h
makentp_V
makentp
makentp_a
nodeset_check_warninginfo
xcatconfig_u_check_xcatsslversion_rhels_sles
reg_linux_diskless_installation_flat