From 909517a2c505fdc1e5a4d28ebd86bf872eb2024f Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Sat, 28 Nov 2009 13:45:52 +0000 Subject: [PATCH] -Add RHEL-6 alpha support for stateful deployment -Fix bug in recent Table.pm enhancements git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4686 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Table.pm | 2 +- xCAT-server/lib/xcat/plugins/anaconda.pm | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm index a277ac21b..8b3a6f188 100644 --- a/perl-xCAT/xCAT/Table.pm +++ b/perl-xCAT/xCAT/Table.pm @@ -1601,7 +1601,7 @@ sub setNodesAttribs { foreach my $col (@orderedcols) { #try aggregating requests. Could also see about single prepare, multiple executes instead $upstring .= "$col = ?, "; } - $upstring =~ s/, / where $nodekey = ?/; + $upstring =~ s/, $/ where $nodekey = ?/; $upsth = $self->{dbh}->prepare($upstring); } if (scalar keys %updatenodes) { diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index dfaf77835..1707e965b 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -878,6 +878,13 @@ sub copycd $distname = "rhels5"; } } + elsif ($desc =~ /^Red Hat Enterprise Linux 6\.0$/) + { + unless ($distname) + { + $distname = "rhel6"; + } + } unless ($distname) {