patches/tsoljds-tstripe-05-primary-zone.diff
author stephen
Fri, 04 May 2012 15:07:50 +0000
branchgnome-2-30-s11update
changeset 22414 65070fca64a2
permissions -rw-r--r--
2012-04-23 Stephen Browne <[email protected]> RTI: 362502 CR : 7108974 * patches/tsoljds-tstripe-05-primary-zone.diff: new patch to ignore secondary zones when finding a match to lazy boot. * specs/SUNWtgnome-tstripe.spec: add new patch

diff -urN tstripe.orig/src/xagent-proxy.c tstripe.new/src/xagent-proxy.c
--- tstripe.orig/src/xagent-proxy.c	2012-04-18 22:14:36.251878855 +0100
+++ tstripe.new/src/xagent-proxy.c	2012-04-18 22:17:01.619969180 +0100
@@ -666,6 +666,8 @@
 	while (fgets (line, sizeof (line), fp) != NULL) {
 		if ((zcent = tsol_sgetzcent (line, NULL, NULL)) == NULL)
 			continue;
+		if (zcent->zc_match & TSOL_MATCH_SHARED_LABEL)
+			continue;
 		if (blequal (sl, &zcent->zc_label)) {
 			zonename = strdup (zcent->zc_name);
 			tsol_freezcent (zcent);