From 414957d98557eb7f7007813a7fbec9d429419e4e Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Mon, 9 Nov 2015 09:08:44 +0000 Subject: [PATCH] fix build Signed-off-by: Vasiliy Tolstov --- Godeps/Godeps.json | 38 --------------- build | 2 +- cloudinit.go | 48 ++++++++----------- datasource/vmware/vmware.go | 4 +- system/networkd_linux.go | 8 +++- .../github.com/sigma/vmw-guestinfo/COPYING | 0 .../sigma/vmw-guestinfo/bridge/backdoor.c | 0 .../sigma/vmw-guestinfo/bridge/backdoor_386.c | 0 .../vmw-guestinfo/bridge/backdoor_amd64.c | 0 .../sigma/vmw-guestinfo/bridge/bridge.go | 0 .../sigma/vmw-guestinfo/bridge/dynbuf.c | 0 .../sigma/vmw-guestinfo/bridge/hostinfo.c | 0 .../sigma/vmw-guestinfo/bridge/hostinfoHV.c | 0 .../sigma/vmw-guestinfo/bridge/message.c | 0 .../sigma/vmw-guestinfo/bridge/utilMem.c | 0 .../sigma/vmw-guestinfo/bridge/vmcheck.c | 0 .../sigma/vmw-guestinfo/bridge/vmsignal.c | 0 .../sigma/vmw-guestinfo/examples/main.go | 4 +- .../sigma/vmw-guestinfo/include/backdoor.h | 0 .../sigma/vmw-guestinfo/include/backdoorInt.h | 0 .../vmw-guestinfo/include/backdoor_def.h | 0 .../vmw-guestinfo/include/backdoor_types.h | 0 .../vmw-guestinfo/include/community_source.h | 0 .../sigma/vmw-guestinfo/include/cpuid_info.h | 0 .../sigma/vmw-guestinfo/include/debug.h | 0 .../sigma/vmw-guestinfo/include/dynbuf.h | 0 .../vmw-guestinfo/include/guest_msg_def.h | 0 .../sigma/vmw-guestinfo/include/hostType.h | 0 .../sigma/vmw-guestinfo/include/hostinfo.h | 0 .../sigma/vmw-guestinfo/include/hostinfoInt.h | 0 .../sigma/vmw-guestinfo/include/message.h | 0 .../sigma/vmw-guestinfo/include/mul64.h | 0 .../sigma/vmw-guestinfo/include/safetime.h | 0 .../vmw-guestinfo/include/unicodeTypes.h | 0 .../sigma/vmw-guestinfo/include/util.h | 0 .../sigma/vmw-guestinfo/include/vm_assert.h | 0 .../vmw-guestinfo/include/vm_basic_asm.h | 0 .../vmw-guestinfo/include/vm_basic_asm_x86.h | 0 .../include/vm_basic_asm_x86_64.h | 0 .../vmw-guestinfo/include/vm_basic_defs.h | 0 .../vmw-guestinfo/include/vm_basic_types.h | 0 .../sigma/vmw-guestinfo/include/vmcheck.h | 0 .../sigma/vmw-guestinfo/include/vmsignal.h | 0 .../sigma/vmw-guestinfo/include/vmware.h | 0 .../vmw-guestinfo/include/vmware_pack_begin.h | 0 .../vmw-guestinfo/include/vmware_pack_end.h | 0 .../vmw-guestinfo/include/vmware_pack_init.h | 0 .../vmw-guestinfo/include/x86_basic_defs.h | 0 .../sigma/vmw-guestinfo/include/x86cpuid.h | 0 .../vmw-guestinfo/include/x86cpuid_asm.h | 0 .../sigma/vmw-guestinfo/include/x86vendor.h | 0 .../sigma/vmw-guestinfo/message/message.go | 2 +- .../sigma/vmw-guestinfo/rpcout/rpcout.go | 2 +- .../sigma/vmw-guestinfo/rpcvmx/rpcvmx.go | 2 +- .../sigma/vmw-guestinfo/vmcheck/vmcheck.go | 2 +- 55 files changed, 35 insertions(+), 77 deletions(-) delete mode 100644 Godeps/Godeps.json rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/COPYING (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/backdoor.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/bridge.go (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/dynbuf.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/hostinfo.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/hostinfoHV.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/message.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/utilMem.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/vmcheck.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/bridge/vmsignal.c (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/examples/main.go (62%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoor.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoorInt.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoor_def.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/backdoor_types.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/community_source.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/cpuid_info.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/debug.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/dynbuf.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/hostType.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/hostinfo.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/hostinfoInt.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/message.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/mul64.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/safetime.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/unicodeTypes.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/util.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_assert.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_basic_asm.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86_64.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_basic_defs.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmcheck.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmsignal.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmware.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmware_pack_begin.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmware_pack_end.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/vmware_pack_init.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/x86_basic_defs.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/x86cpuid.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/x86cpuid_asm.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/include/x86vendor.h (100%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/message/message.go (93%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go (94%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go (92%) rename {Godeps/_workspace/src => vendor}/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go (76%) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index b3a7f07..0000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ImportPath": "github.com/coreos/coreos-cloudinit", - "GoVersion": "go1.3.3", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "github.com/cloudsigma/cepgo", - "Rev": "1bfc4895bf5c4d3b599f3f6ee142299488c8739b" - }, - { - "ImportPath": "github.com/coreos/go-systemd/dbus", - "Rev": "4fbc5060a317b142e6c7bfbedb65596d5f0ab99b" - }, - { - "ImportPath": "github.com/coreos/yaml", - "Rev": "6b16a5714269b2f70720a45406b1babd947a17ef" - }, - { - "ImportPath": "github.com/dotcloud/docker/pkg/netlink", - "Comment": "v0.11.1-359-g55d41c3e21e1", - "Rev": "55d41c3e21e1593b944c06196ffb2ac57ab7f653" - }, - { - "ImportPath": "github.com/guelfey/go.dbus", - "Rev": "f6a3a2366cc39b8479cadc499d3c735fb10fbdda" - }, - { - "ImportPath": "github.com/tarm/goserial", - "Rev": "cdabc8d44e8e84f58f18074ae44337e1f2f375b9" - }, - { - "ImportPath": "github.com/sigma/vmw-guestinfo", - "Rev": "de573afc542e0268fe8478d46e237fad9d6f7aec" - } - ] -} diff --git a/build b/build index 6961010..0a047b1 100755 --- a/build +++ b/build @@ -3,7 +3,7 @@ ORG_PATH="github.com/coreos" REPO_PATH="${ORG_PATH}/coreos-cloudinit" VERSION=$(git describe --tags) -GLDFLAGS="-X main.version \"${VERSION}\"" +GLDFLAGS="-X main.version=${VERSION}" rm -rf bin tmp diff --git a/cloudinit.go b/cloudinit.go index 49f8ff5..3c89bd7 100644 --- a/cloudinit.go +++ b/cloudinit.go @@ -33,16 +33,16 @@ import ( "github.com/coreos/coreos-cloudinit/datasource/metadata/packet" "github.com/coreos/coreos-cloudinit/datasource/proc_cmdline" "github.com/coreos/coreos-cloudinit/datasource/url" - "github.com/coreos/coreos-cloudinit/datasource/vmware" + + // "github.com/coreos/coreos-cloudinit/datasource/vmware" "github.com/coreos/coreos-cloudinit/datasource/waagent" "github.com/coreos/coreos-cloudinit/initialize" "github.com/coreos/coreos-cloudinit/network" "github.com/coreos/coreos-cloudinit/pkg" "github.com/coreos/coreos-cloudinit/system" - "github.com/coreos/coreos-cloudinit/datasource/metadata/openstack" ) -const ( +var ( datasourceInterval = 100 * time.Millisecond datasourceMaxInterval = 30 * time.Second datasourceTimeout = 5 * time.Minute @@ -63,7 +63,7 @@ var ( packetMetadataService string url string procCmdLine bool - vmware bool + // vmware bool } convertNetconf string workspace string @@ -85,11 +85,11 @@ func init() { flag.StringVar(&flags.sources.ec2MetadataService, "from-ec2-metadata", "", "Download EC2 data from the provided url") // flag.BoolVar(&flags.sources.cloudSigmaMetadataService, "from-cloudsigma-metadata", false, "Download data from CloudSigma server context") flag.StringVar(&flags.sources.digitalOceanMetadataService, "from-digitalocean-metadata", "", "Download DigitalOcean data from the provided url") - flag.StringVar(&flags.sources.openstackMetadataService, "from-openstack-metadata", "", "Download OpenStack data from the provided url") + flag.StringVar(&flags.sources.ec2MetadataService, "from-openstack-metadata", "", "Download OpenStack data from the provided url") flag.StringVar(&flags.sources.packetMetadataService, "from-packet-metadata", "", "Download Packet data from metadata service") flag.StringVar(&flags.sources.url, "from-url", "", "Download user-data from provided url") flag.BoolVar(&flags.sources.procCmdLine, "from-proc-cmdline", false, fmt.Sprintf("Parse %s for '%s=', using the cloud-config served by an HTTP GET to ", proc_cmdline.ProcCmdlineLocation, proc_cmdline.ProcCmdlineCloudConfigFlag)) - flag.BoolVar(&flags.sources.vmware, "from-vmware-guestinfo", false, "Read data from VMware guestinfo") + // flag.BoolVar(&flags.sources.vmware, "from-vmware-guestinfo", false, "Read data from VMware guestinfo") flag.StringVar(&flags.oem, "oem", "", "Use the settings specific to the provided OEM") flag.StringVar(&flags.convertNetconf, "convert-netconf", "", "Read the network config provided in cloud-drive and translate it from the specified format into networkd unit files") flag.StringVar(&flags.workspace, "workspace", "/var/lib/cloudinit", "Base directory where cloudinit should use to store data") @@ -97,7 +97,6 @@ func init() { flag.BoolVar(&flags.validate, "validate", false, "[EXPERIMENTAL] Validate the user-data but do not apply it to the system") flag.StringVar(&flags.timeout, "timeout", "60s", "Timeout to wait for all datasource metadata") flag.StringVar(&flags.dstimeout, "dstimeout", "10s", "Timeout to wait for single datasource metadata") - } type oemConfig map[string]string @@ -112,10 +111,6 @@ var ( "from-ec2-metadata": "http://169.254.169.254/", "from-configdrive": "/media/configdrive", }, - "openstack": oemConfig{ - "from-openstack-metadata": "http://169.254.169.254/", - "convert-netconf": "debian", - }, "rackspace-onmetal": oemConfig{ "from-configdrive": "/media/configdrive", "convert-netconf": "debian", @@ -123,16 +118,16 @@ var ( "azure": oemConfig{ "from-waagent": "/var/lib/waagent", }, - "cloudsigma": oemConfig{ - "from-cloudsigma-metadata": "true", - }, + // "cloudsigma": oemConfig{ + // "from-cloudsigma-metadata": "true", + // }, "packet": oemConfig{ "from-packet-metadata": "https://metadata.packet.net/", }, - "vmware": oemConfig{ - "from-vmware-guestinfo": "true", - "convert-netconf": "vmware", - }, + // "vmware": oemConfig{ + // "from-vmware-guestinfo": "true", + // "convert-netconf": "vmware", + // }, } ) @@ -182,7 +177,7 @@ func main() { case "debian": case "digitalocean": case "packet": - case "vmware": + // case "vmware": default: fmt.Printf("Invalid option to -convert-netconf: '%s'. Supported options: 'debian, digitalocean, packet, vmware'\n", flags.convertNetconf) os.Exit(2) @@ -190,7 +185,7 @@ func main() { dss := getDatasources() if len(dss) == 0 { - fmt.Println("Provide at least one of -from-file, -from-configdrive, -from-ec2-metadata, -from-cloudsigma-metadata, --from-openstack-metadata-from-packet-metadata, -from-digitalocean-metadata, -from-vmware-guestinfo, -from-waagent, -from-url or -from-proc-cmdline") + fmt.Println("Provide at least one of -from-file, -from-configdrive, -from-ec2-metadata, -from-cloudsigma-metadata, -from-packet-metadata, -from-digitalocean-metadata, -from-vmware-guestinfo, -from-waagent, -from-url or -from-proc-cmdline") os.Exit(2) } @@ -265,8 +260,8 @@ func main() { ifaces, err = network.ProcessDigitalOceanNetconf(metadata.NetworkConfig.(digitalocean.Metadata)) case "packet": ifaces, err = network.ProcessPacketNetconf(metadata.NetworkConfig.(packet.NetworkData)) - case "vmware": - ifaces, err = network.ProcessVMwareNetconf(metadata.NetworkConfig.(map[string]string)) + // case "vmware": + // ifaces, err = network.ProcessVMwareNetconf(metadata.NetworkConfig.(map[string]string)) default: err = fmt.Errorf("Unsupported network config format %q", flags.convertNetconf) } @@ -339,9 +334,6 @@ func getDatasources() []datasource.Datasource { if flags.sources.digitalOceanMetadataService != "" { dss = append(dss, digitalocean.NewDatasource(flags.sources.digitalOceanMetadataService)) } - if flags.sources.openstackMetadataService != "" { - dss = append(dss, openstack.NewDatasource(flags.sources.openstackMetadataService)) - } if flags.sources.waagent != "" { dss = append(dss, waagent.NewDatasource(flags.sources.waagent)) } @@ -351,9 +343,9 @@ func getDatasources() []datasource.Datasource { if flags.sources.procCmdLine { dss = append(dss, proc_cmdline.NewDatasource()) } - if flags.sources.vmware { - dss = append(dss, vmware.NewDatasource()) - } + // if flags.sources.vmware { + // dss = append(dss, vmware.NewDatasource()) + // } return dss } diff --git a/datasource/vmware/vmware.go b/datasource/vmware/vmware.go index 4fb382a..c636d3d 100644 --- a/datasource/vmware/vmware.go +++ b/datasource/vmware/vmware.go @@ -23,8 +23,8 @@ import ( "github.com/coreos/coreos-cloudinit/datasource" "github.com/coreos/coreos-cloudinit/pkg" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck" + "github.com/sigma/vmw-guestinfo/rpcvmx" + "github.com/sigma/vmw-guestinfo/vmcheck" ) type readConfigFunction func(key string) (string, error) diff --git a/system/networkd_linux.go b/system/networkd_linux.go index 6e48951..f59f306 100644 --- a/system/networkd_linux.go +++ b/system/networkd_linux.go @@ -20,9 +20,9 @@ import ( "os/exec" "strings" - "github.com/vishvananda/netlink" "github.com/coreos/coreos-cloudinit/config" "github.com/coreos/coreos-cloudinit/network" + "github.com/vishvananda/netlink" ) func RestartNetwork(interfaces []network.InterfaceGenerator) (err error) { @@ -56,7 +56,11 @@ func downNetworkInterfaces(interfaces []network.InterfaceGenerator) error { for _, iface := range interfaces { if systemInterface, ok := sysInterfaceMap[iface.Name()]; ok { log.Printf("Taking down interface %q\n", systemInterface.Name) - if err := netlink.NetworkLinkDown(systemInterface); err != nil { + link, err := netlink.LinkByName(systemInterface.Name) + if err != nil { + log.Printf("Error while downing interface %q (%s). Continuing...\n", systemInterface.Name, err) + } + if err = netlink.LinkSetDown(link); err != nil { log.Printf("Error while downing interface %q (%s). Continuing...\n", systemInterface.Name, err) } } diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/COPYING b/vendor/github.com/sigma/vmw-guestinfo/COPYING similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/COPYING rename to vendor/github.com/sigma/vmw-guestinfo/COPYING diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_386.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/backdoor_amd64.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/bridge.go b/vendor/github.com/sigma/vmw-guestinfo/bridge/bridge.go similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/bridge.go rename to vendor/github.com/sigma/vmw-guestinfo/bridge/bridge.go diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/dynbuf.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/dynbuf.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/dynbuf.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/dynbuf.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/hostinfo.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/hostinfo.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/hostinfo.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/hostinfo.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/hostinfoHV.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/hostinfoHV.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/hostinfoHV.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/hostinfoHV.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/message.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/message.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/message.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/message.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/utilMem.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/utilMem.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/utilMem.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/utilMem.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/vmcheck.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/vmcheck.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/vmcheck.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/vmcheck.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/vmsignal.c b/vendor/github.com/sigma/vmw-guestinfo/bridge/vmsignal.c similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge/vmsignal.c rename to vendor/github.com/sigma/vmw-guestinfo/bridge/vmsignal.c diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/examples/main.go b/vendor/github.com/sigma/vmw-guestinfo/examples/main.go similarity index 62% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/examples/main.go rename to vendor/github.com/sigma/vmw-guestinfo/examples/main.go index d37bc3d..c78ded9 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/examples/main.go +++ b/vendor/github.com/sigma/vmw-guestinfo/examples/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck" + "github.com/coreos/coreos-cloudinit/github.com/sigma/vmw-guestinfo/rpcvmx" + "github.com/coreos/coreos-cloudinit/github.com/sigma/vmw-guestinfo/vmcheck" ) func main() { diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoor.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoor.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoorInt.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoorInt.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoorInt.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoorInt.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_def.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoor_def.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_def.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoor_def.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_types.h b/vendor/github.com/sigma/vmw-guestinfo/include/backdoor_types.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/backdoor_types.h rename to vendor/github.com/sigma/vmw-guestinfo/include/backdoor_types.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/community_source.h b/vendor/github.com/sigma/vmw-guestinfo/include/community_source.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/community_source.h rename to vendor/github.com/sigma/vmw-guestinfo/include/community_source.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/cpuid_info.h b/vendor/github.com/sigma/vmw-guestinfo/include/cpuid_info.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/cpuid_info.h rename to vendor/github.com/sigma/vmw-guestinfo/include/cpuid_info.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/debug.h b/vendor/github.com/sigma/vmw-guestinfo/include/debug.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/debug.h rename to vendor/github.com/sigma/vmw-guestinfo/include/debug.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/dynbuf.h b/vendor/github.com/sigma/vmw-guestinfo/include/dynbuf.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/dynbuf.h rename to vendor/github.com/sigma/vmw-guestinfo/include/dynbuf.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h b/vendor/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h rename to vendor/github.com/sigma/vmw-guestinfo/include/guest_msg_def.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/hostType.h b/vendor/github.com/sigma/vmw-guestinfo/include/hostType.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/hostType.h rename to vendor/github.com/sigma/vmw-guestinfo/include/hostType.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/hostinfo.h b/vendor/github.com/sigma/vmw-guestinfo/include/hostinfo.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/hostinfo.h rename to vendor/github.com/sigma/vmw-guestinfo/include/hostinfo.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/hostinfoInt.h b/vendor/github.com/sigma/vmw-guestinfo/include/hostinfoInt.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/hostinfoInt.h rename to vendor/github.com/sigma/vmw-guestinfo/include/hostinfoInt.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/message.h b/vendor/github.com/sigma/vmw-guestinfo/include/message.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/message.h rename to vendor/github.com/sigma/vmw-guestinfo/include/message.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/mul64.h b/vendor/github.com/sigma/vmw-guestinfo/include/mul64.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/mul64.h rename to vendor/github.com/sigma/vmw-guestinfo/include/mul64.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/safetime.h b/vendor/github.com/sigma/vmw-guestinfo/include/safetime.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/safetime.h rename to vendor/github.com/sigma/vmw-guestinfo/include/safetime.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/unicodeTypes.h b/vendor/github.com/sigma/vmw-guestinfo/include/unicodeTypes.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/unicodeTypes.h rename to vendor/github.com/sigma/vmw-guestinfo/include/unicodeTypes.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/util.h b/vendor/github.com/sigma/vmw-guestinfo/include/util.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/util.h rename to vendor/github.com/sigma/vmw-guestinfo/include/util.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_assert.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_assert.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_assert.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_assert.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_asm.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_asm.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_asm.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_asm.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86_64.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86_64.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86_64.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_asm_x86_64.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_defs.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_defs.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_defs.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_defs.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h b/vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vm_basic_types.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmcheck.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmcheck.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmcheck.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmcheck.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmsignal.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmsignal.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmsignal.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmsignal.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmware.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmware.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware_pack_begin.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmware_pack_begin.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware_pack_begin.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmware_pack_begin.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware_pack_end.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmware_pack_end.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware_pack_end.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmware_pack_end.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware_pack_init.h b/vendor/github.com/sigma/vmw-guestinfo/include/vmware_pack_init.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/vmware_pack_init.h rename to vendor/github.com/sigma/vmw-guestinfo/include/vmware_pack_init.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86_basic_defs.h b/vendor/github.com/sigma/vmw-guestinfo/include/x86_basic_defs.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86_basic_defs.h rename to vendor/github.com/sigma/vmw-guestinfo/include/x86_basic_defs.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86cpuid.h b/vendor/github.com/sigma/vmw-guestinfo/include/x86cpuid.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86cpuid.h rename to vendor/github.com/sigma/vmw-guestinfo/include/x86cpuid.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86cpuid_asm.h b/vendor/github.com/sigma/vmw-guestinfo/include/x86cpuid_asm.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86cpuid_asm.h rename to vendor/github.com/sigma/vmw-guestinfo/include/x86cpuid_asm.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86vendor.h b/vendor/github.com/sigma/vmw-guestinfo/include/x86vendor.h similarity index 100% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/include/x86vendor.h rename to vendor/github.com/sigma/vmw-guestinfo/include/x86vendor.h diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message/message.go b/vendor/github.com/sigma/vmw-guestinfo/message/message.go similarity index 93% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message/message.go rename to vendor/github.com/sigma/vmw-guestinfo/message/message.go index 0ece8fa..e61359a 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message/message.go +++ b/vendor/github.com/sigma/vmw-guestinfo/message/message.go @@ -3,7 +3,7 @@ package message import ( "errors" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge" + "github.com/sigma/vmw-guestinfo/bridge" ) var ( diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go b/vendor/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go similarity index 94% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go rename to vendor/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go index 68a5744..294edd1 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go +++ b/vendor/github.com/sigma/vmw-guestinfo/rpcout/rpcout.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/message" + "github.com/sigma/vmw-guestinfo/message" ) // ErrRpciFormat represents an invalid result format diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go b/vendor/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go similarity index 92% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go rename to vendor/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go index 7f8093d..6b2cb64 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go +++ b/vendor/github.com/sigma/vmw-guestinfo/rpcvmx/rpcvmx.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/rpcout" + "github.com/sigma/vmw-guestinfo/rpcout" ) // Config gives access to the vmx config through the VMware backdoor diff --git a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go b/vendor/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go similarity index 76% rename from Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go rename to vendor/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go index 736b929..408e07c 100644 --- a/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go +++ b/vendor/github.com/sigma/vmw-guestinfo/vmcheck/vmcheck.go @@ -1,7 +1,7 @@ package vmcheck import ( - "github.com/coreos/coreos-cloudinit/Godeps/_workspace/src/github.com/sigma/vmw-guestinfo/bridge" + "github.com/sigma/vmw-guestinfo/bridge" ) // IsVirtualWorld returns whether the code is running in a VMware virtual machine or no