25163011 Docker engine should not use SMF FMRI fragments in code
authorshreya.jain@oracle.com <shreya.jain@oracle.com>
Mon, 12 Dec 2016 09:53:42 -0800
changeset 7480 aa7a775dd813
parent 7479 bb846d3c84b5
child 7481 0bc6259c3cf8
25163011 Docker engine should not use SMF FMRI fragments in code
components/docker/patches/0001-Solaris-v1.10.3.patch
--- a/components/docker/patches/0001-Solaris-v1.10.3.patch	Sun Dec 11 15:46:59 2016 -0800
+++ b/components/docker/patches/0001-Solaris-v1.10.3.patch	Mon Dec 12 09:53:42 2016 -0800
@@ -1,6 +1,6 @@
-From 2dd56e50d4e22a931b6b26de35a19321ee0e36a4 Mon Sep 17 00:00:00 2001
-From: "[email protected]" <[email protected]>
-Date: Mon, 21 Nov 2016 12:10:24 -0800
+From a3e044c4d94e66259008000a451578849b50b516 Mon Sep 17 00:00:00 2001
+From: Shreya Jain <[email protected]>
+Date: Fri, 9 Dec 2016 13:30:07 -0800
 Subject: [PATCH] Solaris-v1.10.3
 
 ---
@@ -3324,7 +3324,7 @@
 +}
 diff --git a/daemon/execdriver/zones/driver.go b/daemon/execdriver/zones/driver.go
 new file mode 100644
-index 0000000..db48175
+index 0000000..5649ce1
 --- /dev/null
 +++ b/daemon/execdriver/zones/driver.go
 @@ -0,0 +1,799 @@
@@ -3881,7 +3881,7 @@
 +	PathDnsXml := filepath.Join(ProfilesPath, "/dns_client.xml")
 +	PathNSSwitchXml := filepath.Join(ProfilesPath, "/ns_switch.xml")
 +
-+	err = exec.Command(SVCCFG, "extract", "dns/client", ">", PathDnsXml).Run()
++	err = exec.Command(SVCCFG, "extract", "svc:/network/dns/client", ">", PathDnsXml).Run()
 +	if err != nil {
 +		logrus.Errorf("Error exporting dns/client: %v", err)
 +		return execdriver.ExitStatus{ExitCode: -1}, err
@@ -3938,7 +3938,7 @@
 +		os.Remove(PathDnsXml)
 +	}
 +
-+	err = exec.Command(SVCCFG, "extract", "name-service/switch", ">", PathNSSwitchXml).Run()
++	err = exec.Command(SVCCFG, "extract", "svc:/system/name-service/switch", ">", PathNSSwitchXml).Run()
 +	if err != nil {
 +		logrus.Errorf("Error exporting name-service/switch: %v", err)
 +		return execdriver.ExitStatus{ExitCode: -1}, err