Browse Source

Allow the migration scripts to recognize the Red Hat-branded server.

Thomas Lackey 20 years ago
parent
commit
86feb680fa

+ 7 - 2
ldap/admin/src/scripts/template-migrate6to7

@@ -2839,7 +2839,7 @@ sub getVersion {
 		sleep(1); # allow some data to accumulate in the pipe
 #	print "Output from $prog -v:\n";
 		while (<F>) {
-			if (/^Netscape-Directory/ || /^iPlanet-Directory/i) {
+			if (/^Red Hat-Directory/ || /^Netscape-Directory/ || /^iPlanet-Directory/i) {
 				$versionstr = $_;
 				last;
 			}
@@ -2849,7 +2849,12 @@ sub getVersion {
 		$ENV{"$LIB_PATH"}=$cur_libpath;
 	}
 
-	if ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
+	if ($versionstr =~ /^Red Hat-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
+		$version     = $1;
+		$minor       = $2;
+		$buildNumber = $3;
+	}
+	elsif ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
 		$version     = $1;
 		$minor       = $2;
 		$buildNumber = $3;

+ 7 - 2
ldap/admin/src/scripts/template-migrateInstance7

@@ -487,7 +487,7 @@ sub getVersion {
 		sleep(1); # allow some data to accumulate in the pipe
 #	print "Output from $prog -v:\n";
 		while (<F>) {
-			if (/^Netscape-Directory/ || /^iPlanet-Directory/i) {
+			if (/^Red Hat-Directory/ || /^Netscape-Directory/ || /^iPlanet-Directory/i) {
 				$versionstr = $_;
 				last;
 			}
@@ -497,7 +497,12 @@ sub getVersion {
 		$ENV{"$LIB_PATH"}="$root${PATHSEP}lib${SEP}".$ENV{"$LIB_PATH"};
 	}
 
-	if ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
+	if ($versionstr =~ /^Red Hat-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
+		$version     = $1;
+		$minor       = $2;
+		$buildNumber = $3;
+	}
+	elsif ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
 		$version     = $1;
 		$minor       = $2;
 		$buildNumber = $3;

+ 7 - 2
ldap/admin/src/scripts/template-migrateTo7

@@ -3012,7 +3012,7 @@ sub getVersion {
 		sleep(1); # allow some data to accumulate in the pipe
 #	print "Output from $prog -v:\n";
 		while (<F>) {
-			if (/^Netscape-Directory/ || /^iPlanet-Directory/i) {
+			if (/^Red Hat-Directory/ || /^Netscape-Directory/ || /^iPlanet-Directory/i) {
 				$versionstr = $_;
 				last;
 			}
@@ -3022,7 +3022,12 @@ sub getVersion {
 		$ENV{"$LIB_PATH"}=$cur_libpath;
 	}
 
-	if ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
+	if ($versionstr =~ /^Red Hat-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
+		$version     = $1;
+		$minor       = $2;
+		$buildNumber = $3;
+	}
+	elsif ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) {
 		$version     = $1;
 		$minor       = $2;
 		$buildNumber = $3;