From f0b7abf42e90e5a8b47237ae4524a130647fcbf8 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 24 Aug 2016 17:16:00 +0200
Subject: [PATCH 01/40] initial commit

---
 CONTRIBUTING.md                               |  77 ++++
 Config.in                                     |   1 +
 DCO                                           |  36 ++
 LICENSE                                       | 202 ++++++++++
 NOTICE                                        |   5 +
 README.md                                     |  22 ++
 board/coreos/minikube/isolinux.cfg            |   5 +
 board/coreos/minikube/linux-4.7_defconfig     | 373 ++++++++++++++++++
 .../coreos/minikube/rootfs-overlay/etc/fstab  |   5 +
 .../rootfs-overlay/etc/rkt/net.d/k8s.conf     |  19 +
 .../minikube/rootfs-overlay/etc/sudoers       |   2 +
 .../etc/systemd/network/dhcp.network          |   5 +
 .../getty.target.wants/getty@tty1.service     |   1 +
 .../etc/udev/rules.d/80-net-setup-link.rules  |   1 +
 board/coreos/minikube/users                   |   2 +
 code-of-conduct.md                            |  63 +++
 configs/minikube_defconfig                    |  34 ++
 external.mk                                   |   1 +
 package/Config.in                             |   6 +
 package/automount/Config.in                   |   3 +
 package/automount/automount.mk                |  22 ++
 package/automount/minikube-automount          | 159 ++++++++
 package/automount/minikube-automount.service  |   8 +
 package/cni-bin/Config.in                     |   4 +
 package/cni-bin/cni-bin.hash                  |   1 +
 package/cni-bin/cni-bin.mk                    |  17 +
 package/docker-bin/Config.in                  |   4 +
 package/docker-bin/docker-bin.hash            |   1 +
 package/docker-bin/docker-bin.mk              |  50 +++
 package/docker-bin/docker.service             |  33 ++
 package/docker-bin/docker.socket              |  12 +
 package/rkt-bin/Config.in                     |   4 +
 package/rkt-bin/rkt-bin.hash                  |   3 +
 package/rkt-bin/rkt-bin.mk                    |  71 ++++
 34 files changed, 1252 insertions(+)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 Config.in
 create mode 100644 DCO
 create mode 100644 LICENSE
 create mode 100644 NOTICE
 create mode 100644 README.md
 create mode 100644 board/coreos/minikube/isolinux.cfg
 create mode 100644 board/coreos/minikube/linux-4.7_defconfig
 create mode 100644 board/coreos/minikube/rootfs-overlay/etc/fstab
 create mode 100644 board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf
 create mode 100644 board/coreos/minikube/rootfs-overlay/etc/sudoers
 create mode 100644 board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network
 create mode 120000 board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service
 create mode 120000 board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules
 create mode 100644 board/coreos/minikube/users
 create mode 100644 code-of-conduct.md
 create mode 100644 configs/minikube_defconfig
 create mode 100644 external.mk
 create mode 100644 package/Config.in
 create mode 100644 package/automount/Config.in
 create mode 100644 package/automount/automount.mk
 create mode 100755 package/automount/minikube-automount
 create mode 100644 package/automount/minikube-automount.service
 create mode 100644 package/cni-bin/Config.in
 create mode 100644 package/cni-bin/cni-bin.hash
 create mode 100644 package/cni-bin/cni-bin.mk
 create mode 100644 package/docker-bin/Config.in
 create mode 100644 package/docker-bin/docker-bin.hash
 create mode 100644 package/docker-bin/docker-bin.mk
 create mode 100644 package/docker-bin/docker.service
 create mode 100644 package/docker-bin/docker.socket
 create mode 100644 package/rkt-bin/Config.in
 create mode 100644 package/rkt-bin/rkt-bin.hash
 create mode 100644 package/rkt-bin/rkt-bin.mk

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000000..0551ed53d3f5
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,77 @@
+# How to Contribute
+
+CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
+GitHub pull requests.  This document outlines some of the conventions on
+development workflow, commit message formatting, contact points and other
+resources to make it easier to get your contribution accepted.
+
+# Certificate of Origin
+
+By contributing to this project you agree to the Developer Certificate of
+Origin (DCO). This document was created by the Linux Kernel community and is a
+simple statement that you, as a contributor, have the legal right to make the
+contribution. See the [DCO](DCO) file for details.
+
+# Email and Chat
+
+The project currently uses the general CoreOS email list and IRC channel:
+- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
+- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
+
+Please avoid emailing maintainers found in the MAINTAINERS file directly. They
+are very busy and read the mailing lists.
+
+## Getting Started
+
+- Fork the repository on GitHub
+- Read the [README](README.md) for build and test instructions
+- Play with the project, submit bugs, submit patches!
+
+## Contribution Flow
+
+This is a rough outline of what a contributor's workflow looks like:
+
+- Create a topic branch from where you want to base your work (usually master).
+- Make commits of logical units.
+- Make sure your commit messages are in the proper format (see below).
+- Push your changes to a topic branch in your fork of the repository.
+- Make sure the tests pass, and add any new tests as appropriate.
+- Submit a pull request to the original repository.
+
+Thanks for your contributions!
+
+### Coding Style
+
+CoreOS projects written in Go follow a set of style guidelines that we've documented 
+[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when 
+working on your contributions.
+
+### Format of the Commit Message
+
+We follow a rough convention for commit messages that is designed to answer two
+questions: what changed and why. The subject line should feature the what and
+the body of the commit should describe the why.
+
+```
+scripts: add the test-cluster command
+
+this uses tmux to setup a test cluster that you can easily kill and
+start for debugging.
+
+Fixes #38
+```
+
+The format can be described more formally as follows:
+
+```
+<subsystem>: <what changed>
+<BLANK LINE>
+<why this change was made>
+<BLANK LINE>
+<footer>
+```
+
+The first line is the subject and should be no longer than 70 characters, the
+second line is always blank, and other lines should be wrapped at 80 characters.
+This allows the message to be easier to read on GitHub as well as in various
+git tools.
diff --git a/Config.in b/Config.in
new file mode 100644
index 000000000000..9472dc7469a5
--- /dev/null
+++ b/Config.in
@@ -0,0 +1 @@
+source "$BR2_EXTERNAL/package/Config.in"
diff --git a/DCO b/DCO
new file mode 100644
index 000000000000..716561d5d282
--- /dev/null
+++ b/DCO
@@ -0,0 +1,36 @@
+Developer Certificate of Origin
+Version 1.1
+
+Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
+660 York Street, Suite 102,
+San Francisco, CA 94110 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+
+Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the open source license
+    indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the same open source license (unless I am
+    permitted to submit under a different license), as indicated
+    in the file; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a), (b) or (c) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the contribution
+    are public and that a record of the contribution (including all
+    personal information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed consistent with
+    this project or the open source license(s) involved.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..e06d2081865a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 000000000000..e520005cdda3
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,5 @@
+CoreOS Project
+Copyright 2015 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..705511871b8f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+## minikube ISO image
+
+This includes the configuration for an alternative bootable ISO image meant to be used in conjection with https://github.com/kubernetes/minikube.
+
+It includes:
+- systemd as the init system
+- rkt
+- docker
+
+### Build instructions
+```
+$ cd $HOME
+$ git clone https://github.com/s-urbaniak/rktminikube
+$ cd ..
+$ git clone https://github.com/buildroot/buildroot
+$ cd buildroot
+$ git checkout 2016.08-rc2
+$ make BR2_EXTERNAL=../rktminikube minikube_defconfig
+$ make
+```
+
+The bootable ISO image will be available in `output/images/rootfs.iso9660`.
diff --git a/board/coreos/minikube/isolinux.cfg b/board/coreos/minikube/isolinux.cfg
new file mode 100644
index 000000000000..af21d4595605
--- /dev/null
+++ b/board/coreos/minikube/isolinux.cfg
@@ -0,0 +1,5 @@
+default 1
+label 1
+      kernel /boot/bzImage
+      initrd /boot/initrd
+      append root=/dev/sr0 loglevel=3 console=tty0 noembed nomodeset norestore waitusb=10
diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
new file mode 100644
index 000000000000..be69aa7d6039
--- /dev/null
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -0,0 +1,373 @@
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_CGROUPS=y
+CONFIG_MEMCG=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_PROFILING=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_SGI_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_SMP=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_KVM_DEBUG_FS=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_SCHED_SMT=y
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+CONFIG_NUMA=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+# CONFIG_MTRR_SANITIZER is not set
+CONFIG_EFI=y
+CONFIG_HZ_1000=y
+CONFIG_KEXEC=y
+CONFIG_CRASH_DUMP=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_ACPI_DOCK=y
+CONFIG_CPU_FREQ=y
+# CONFIG_CPU_FREQ_STAT is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_PCCARD=y
+CONFIG_YENTA=y
+CONFIG_BINFMT_MISC=y
+CONFIG_IA32_EMULATION=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_XFRM_USER=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+CONFIG_TCP_MD5SIG=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_NETLABEL=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_NETLINK_ACCT=y
+CONFIG_NETFILTER_NETLINK_QUEUE=y
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_NF_CONNTRACK_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=y
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=y
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=y
+CONFIG_IP6_NF_MATCH_IPV6HEADER=y
+CONFIG_IP6_NF_FILTER=y
+CONFIG_IP6_NF_TARGET_REJECT=y
+CONFIG_IP6_NF_MANGLE=y
+CONFIG_BRIDGE=m
+CONFIG_NET_SCHED=y
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_EMATCH=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_HAMRADIO=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_RFKILL=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DEBUG_DEVRES=y
+CONFIG_CONNECTOR=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_ATA_PIIX=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_SCH=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_MIRROR=y
+CONFIG_DM_ZERO=y
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_NETCONSOLE=y
+CONFIG_VETH=y
+CONFIG_VIRTIO_NET=y
+CONFIG_TIGON3=y
+CONFIG_NET_TULIP=y
+CONFIG_E100=y
+CONFIG_E1000=y
+CONFIG_E1000E=y
+CONFIG_SKY2=y
+CONFIG_FORCEDETH=y
+CONFIG_8139CP=y
+CONFIG_8139TOO=y
+CONFIG_FDDI=y
+CONFIG_INPUT_POLLDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_INPUT_TABLET=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT_MISC=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_HW_RANDOM=y
+# CONFIG_HW_RANDOM_INTEL is not set
+# CONFIG_HW_RANDOM_AMD is not set
+CONFIG_NVRAM=y
+CONFIG_HPET=y
+# CONFIG_HPET_MMAP is not set
+CONFIG_I2C_I801=y
+CONFIG_WATCHDOG=y
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_DRM=y
+CONFIG_DRM_I915=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+CONFIG_FB_EFI=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQ_DUMMY=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_HIDRAW=y
+CONFIG_HID_GYRATION=y
+CONFIG_LOGITECH_FF=y
+CONFIG_HID_NTRIG=y
+CONFIG_HID_PANTHERLORD=y
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=y
+CONFIG_HID_SAMSUNG=y
+CONFIG_HID_SONY=y
+CONFIG_HID_SUNPLUS=y
+CONFIG_HID_TOPSEED=y
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_MON=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_STORAGE=y
+CONFIG_EDAC=y
+CONFIG_RTC_CLASS=y
+# CONFIG_RTC_HCTOSYS is not set
+CONFIG_DMADEVICES=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_EEEPC_LAPTOP=y
+CONFIG_AMD_IOMMU=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_EFI_VARS=y
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+CONFIG_QFMT_V2=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_OVERLAY_FS=m
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_HUGETLBFS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_UTF8=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_DEBUG_STACKOVERFLOW=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+CONFIG_DEBUG_BOOT_PARAMS=y
+CONFIG_OPTIMIZE_INLINING=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DISABLE=y
diff --git a/board/coreos/minikube/rootfs-overlay/etc/fstab b/board/coreos/minikube/rootfs-overlay/etc/fstab
new file mode 100644
index 000000000000..8c56808aa3c6
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/fstab
@@ -0,0 +1,5 @@
+# <file system>	<mount pt>	<type>	<options>	<dump>	<pass>
+/dev/root	/		ext2	rw,noauto	0	1
+proc		/proc		proc	defaults	0	0
+devpts		/dev/pts	devpts	defaults,gid=5,mode=620	0	0
+sysfs		/sys		sysfs	defaults	0	0
diff --git a/board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf b/board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf
new file mode 100644
index 000000000000..7b5404e53bf2
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf
@@ -0,0 +1,19 @@
+{
+  "name": "rkt.kubernetes.io",
+  "type": "bridge",
+  "bridge": "mybridge",
+  "mtu": 1460,
+  "addIf": "true",
+  "isGateway": true,
+  "ipMasq": true,
+  "ipam": {
+    "type": "host-local",
+    "subnet": "10.1.0.0/16",
+    "gateway": "10.1.0.1",
+    "routes": [
+      {
+        "dst": "0.0.0.0/0"
+      }
+    ]
+  }
+}
diff --git a/board/coreos/minikube/rootfs-overlay/etc/sudoers b/board/coreos/minikube/rootfs-overlay/etc/sudoers
new file mode 100644
index 000000000000..eb6a2d3d9237
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/sudoers
@@ -0,0 +1,2 @@
+root ALL=(ALL) ALL
+%wheel ALL=(ALL) NOPASSWD: ALL
diff --git a/board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network b/board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network
new file mode 100644
index 000000000000..2d5891906692
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network
@@ -0,0 +1,5 @@
+[Match]
+Name=eth*
+
+[Network]
+DHCP=ipv4
diff --git a/board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service b/board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service
new file mode 120000
index 000000000000..7bfe0808b1e2
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service
@@ -0,0 +1 @@
+/usr/lib/systemd/system/getty@.service
\ No newline at end of file
diff --git a/board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules b/board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules
new file mode 120000
index 000000000000..f69baf4515cc
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules
@@ -0,0 +1 @@
+80-net-setup-link.rules
\ No newline at end of file
diff --git a/board/coreos/minikube/users b/board/coreos/minikube/users
new file mode 100644
index 000000000000..bc64e649f4ff
--- /dev/null
+++ b/board/coreos/minikube/users
@@ -0,0 +1,2 @@
+rkt    -1 rkt    -1 - /home/rkt    /bin/bash rkt-admin,wheel     -
+docker -1 docker -1 - /home/docker /bin/bash rkt,rkt-admin,wheel -
diff --git a/code-of-conduct.md b/code-of-conduct.md
new file mode 100644
index 000000000000..c0c20dd81565
--- /dev/null
+++ b/code-of-conduct.md
@@ -0,0 +1,63 @@
+## CoreOS Community Code of Conduct
+
+### Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of
+fostering an open and welcoming community, we pledge to respect all people who
+contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing others' private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct. By adopting this Code of Conduct,
+project maintainers commit themselves to fairly and consistently applying these
+principles to every aspect of managing this project. Project maintainers who do
+not follow or enforce the Code of Conduct may be permanently removed from the
+project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting a project maintainer, Brandon Philips
+<brandon.philips@coreos.com>, and/or Meghan Schofield
+<meghan.schofield@coreos.com>.
+
+This Code of Conduct is adapted from the Contributor Covenant
+(http://contributor-covenant.org), version 1.2.0, available at
+http://contributor-covenant.org/version/1/2/0/
+
+### CoreOS Events Code of Conduct
+
+CoreOS events are working conferences intended for professional networking and
+collaboration in the CoreOS community. Attendees are expected to behave
+according to professional standards and in accordance with their employer’s
+policies on appropriate workplace behavior.
+
+While at CoreOS events or related social networking opportunities, attendees
+should not engage in discriminatory or offensive speech or actions including
+but not limited to gender, sexuality, race, age, disability, or religion.
+Speakers should be especially aware of these concerns.
+
+CoreOS does not condone any statements by speakers contrary to these standards.
+CoreOS reserves the right to deny entrance and/or eject from an event (without
+refund) any individual found to be engaging in discriminatory or offensive
+speech or actions.
+
+Please bring any concerns to the immediate attention of designated on-site
+staff, Brandon Philips <brandon.philips@coreos.com>, and/or Meghan Schofield
+<meghan.schofield@coreos.com>.
diff --git a/configs/minikube_defconfig b/configs/minikube_defconfig
new file mode 100644
index 000000000000..cd1bd0792522
--- /dev/null
+++ b/configs/minikube_defconfig
@@ -0,0 +1,34 @@
+BR2_x86_64=y
+BR2_CCACHE=y
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="minikube"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TARGET_GENERIC_HOSTNAME="minikube"
+BR2_TARGET_GENERIC_ISSUE="Welcome to minikube"
+BR2_TARGET_GENERIC_PASSWD_SHA512=y
+BR2_INIT_SYSTEMD=y
+BR2_SYSTEM_BIN_SH_BASH=y
+# BR2_TARGET_GENERIC_GETTY is not set
+BR2_ROOTFS_USERS_TABLES="$(BR2_EXTERNAL)/board/coreos/minikube/users"
+BR2_ROOTFS_OVERLAY="$(BR2_EXTERNAL)/board/coreos/minikube/rootfs-overlay"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL)/board/coreos/minikube/linux-4.7_defconfig"
+BR2_PACKAGE_XZ=y
+BR2_PACKAGE_E2FSPROGS=y
+BR2_PACKAGE_PARTED=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_BRIDGE_UTILS=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_SOCAT=y
+BR2_PACKAGE_SUDO=y
+BR2_PACKAGE_ACL=y
+# BR2_PACKAGE_SYSTEMD_HWDB is not set
+BR2_PACKAGE_SYSTEMD_LOGIND=y
+BR2_PACKAGE_SYSTEMD_MACHINED=y
+# BR2_PACKAGE_SYSTEMD_TIMESYNCD is not set
+BR2_PACKAGE_UTIL_LINUX_NSENTER=y
+BR2_TARGET_ROOTFS_CPIO_BZIP2=y
+BR2_TARGET_ROOTFS_ISO9660=y
+BR2_TARGET_SYSLINUX=y
diff --git a/external.mk b/external.mk
new file mode 100644
index 000000000000..40f7eae326c4
--- /dev/null
+++ b/external.mk
@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL)/package/*/*.mk))
diff --git a/package/Config.in b/package/Config.in
new file mode 100644
index 000000000000..cf3a4c791aff
--- /dev/null
+++ b/package/Config.in
@@ -0,0 +1,6 @@
+menu "System tools"
+    source "$BR2_EXTERNAL/package/rkt-bin/Config.in"
+    source "$BR2_EXTERNAL/package/automount/Config.in"
+    source "$BR2_EXTERNAL/package/docker-bin/Config.in"
+    source "$BR2_EXTERNAL/package/cni-bin/Config.in"
+endmenu
diff --git a/package/automount/Config.in b/package/automount/Config.in
new file mode 100644
index 000000000000..9b09614fc4b5
--- /dev/null
+++ b/package/automount/Config.in
@@ -0,0 +1,3 @@
+config BR2_PACKAGE_AUTOMOUNT
+	bool "automount"
+	default y
diff --git a/package/automount/automount.mk b/package/automount/automount.mk
new file mode 100644
index 000000000000..62c5f91e7b8e
--- /dev/null
+++ b/package/automount/automount.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# minikube automount
+#
+################################################################################
+
+define AUTOMOUNT_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 \
+		$(BR2_EXTERNAL)/package/automount/minikube-automount.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/minikube-automount.service
+
+	ln -fs /usr/lib/systemd/system/minikube-automount.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minikube-automount.service
+endef
+
+define AUTOMOUNT_INSTALL_TARGET_CMDS
+	install -Dm755 \
+		$(BR2_EXTERNAL)/package/automount/minikube-automount \
+		$(TARGET_DIR)/usr/sbin/minikube-automount
+endef
+
+$(eval $(generic-package))
diff --git a/package/automount/minikube-automount b/package/automount/minikube-automount
new file mode 100755
index 000000000000..42877bdb0d73
--- /dev/null
+++ b/package/automount/minikube-automount
@@ -0,0 +1,159 @@
+#!/bin/bash
+
+set -x
+
+echo "automount ...";
+LABEL=boot2docker-data
+MAGIC="boot2docker, please format-me"
+
+# If there is a partition with `boot2docker-data` as its label, use it and be
+# very happy. Thus, you can come along if you feel like a room without a roof.
+BOOT2DOCKER_DATA=`blkid -o device -l -t LABEL=$LABEL`
+echo $BOOT2DOCKER_DATA
+if [ ! -n "$BOOT2DOCKER_DATA" ]; then
+    echo "Is the disk unpartitioned?, test for the 'boot2docker format-me' string"
+
+    # Is the disk unpartitioned?, test for the 'boot2docker format-me' string
+    UNPARTITIONED_HD="/dev/$(lsblk | grep disk | cut -f1 -d' ')"
+    parted --script "$UNPARTITIONED_HD" print | grep "Partition Table: unknown"
+
+    if [ $? -eq 0 ]; then
+        # Test for our magic string (it means that the disk was made by ./boot2docker init)
+        HEADER=`dd if=$UNPARTITIONED_HD bs=1 count=${#MAGIC} 2>/dev/null`
+
+        if [ "$HEADER" = "$MAGIC" ]; then
+            # save the preload userdata.tar file
+            dd if=$UNPARTITIONED_HD of=/userdata.tar bs=1 count=4096 2>/dev/null
+            # Create the partition, format it and then mount it
+            echo "NEW boot2docker managed disk image ($UNPARTITIONED_HD): formatting it for use"
+
+            # Add a swap partition (so Docker doesn't complain about it missing)
+            (echo n; echo p; echo 2; echo ; echo +1000M ; echo w) | fdisk $UNPARTITIONED_HD
+            # Let kernel re-read partition table
+            partprobe
+            (echo t; echo 82; echo w) | fdisk $UNPARTITIONED_HD
+            # Let kernel re-read partition table
+            partprobe
+            # wait for the partition to actually exist, timeout after about 5 seconds
+            local timer=0
+            while [ "$timer" -lt 10 -a ! -b "${UNPARTITIONED_HD}2" ]; do
+                timer=$((timer + 1))
+                sleep 0.5
+            done
+            mkswap "${UNPARTITIONED_HD}2"
+            # Add the data partition
+            (echo n; echo p; echo 1; echo ; echo ; echo w) | fdisk $UNPARTITIONED_HD
+            # Let kernel re-read partition table
+            partprobe
+            # wait for the partition to actually exist, timeout after about 5 seconds
+            timer=0
+            while [ "$timer" -lt 10 -a ! -b "${UNPARTITIONED_HD}1" ]; do
+                timer=$((timer + 1))
+                sleep 0.5
+            done
+            BOOT2DOCKER_DATA=`echo "${UNPARTITIONED_HD}1"`
+            mkfs.ext4 -i 8192 -L $LABEL $BOOT2DOCKER_DATA
+            swapon "${UNPARTITIONED_HD}2"
+        fi
+
+        DISK_VENDOR=$(cat /sys/class/block/$(basename $UNPARTITIONED_HD /dev/)/device/vendor /sys/class/block/$(basename $UNPARTITIONED_HD /dev/)/device/model | tr -d "\n")
+        # Test if disk is "VMware, VMware Virtual S" and empty.
+        if [ "$DISK_VENDOR" = "VMware, VMware Virtual S" ] || [ "$DISK_VENDOR" = "VMware  Virtual disk    " ]; then
+            # Check whether the disk has any known partitions on it
+            blkid -o device $UNPARTITIONED_HD
+            if [ $? == 2 ]; then
+                # As there are no partitions, let's make sure the disk is empty for real
+                dd if=$UNPARTITIONED_HD of=device_test_file bs=1k count=256 > /dev/null 2>&1
+                NON_NUL=$(<device_test_file tr -d '\0\n' | wc -c)
+                if [ $NON_NUL == 0 ]; then                    
+                    # Create the partition, format it and then mount it
+                    echo "NEW VMware boot2docker managed disk image ($UNPARTITIONED_HD): formatting it for use"
+
+                    # Add a swap partition (so Docker doesn't complain about it missing)
+                    (echo n; echo p; echo 2; echo ; echo +1000M ; echo w) | fdisk $UNPARTITIONED_HD
+                    (echo t; echo 82) | fdisk $UNPARTITIONED_HD
+                    mkswap "${UNPARTITIONED_HD}2"
+                    # Add the data partition
+                    (echo n; echo p; echo 1; echo ; echo ; echo w) | fdisk $UNPARTITIONED_HD
+                    BOOT2DOCKER_DATA=`echo "${UNPARTITIONED_HD}1"`
+                    mkfs.ext4 -i 8192 -L $LABEL $BOOT2DOCKER_DATA
+                    swapon "${UNPARTITIONED_HD}2"
+                else
+                    echo "Disk unpartitioned but something is there... not doing anything"
+                fi
+            else
+                echo "Partition table found on disk, not doing anything"
+            fi
+        fi
+    else
+        # Pick the first ext4 as a fallback
+        # TODO: mount all Linux partitions and look for a /var/lib/docker...
+        BOOT2DOCKER_DATA=`blkid | grep -e 'TYPE="btrfs"'  -e 'TYPE="ext4"' | head -n 1 | sed 's/:.*//'`
+    fi
+fi
+
+echo $BOOT2DOCKER_DATA
+
+if [ -n "$BOOT2DOCKER_DATA" ]; then
+    PARTNAME=`echo "$BOOT2DOCKER_DATA" | sed 's/.*\///'`
+    echo "mount p:$PARTNAME ..."
+    mkdir -p /mnt/$PARTNAME
+    if ! mount $BOOT2DOCKER_DATA /mnt/$PARTNAME 2>/dev/null; then
+        # for some reason, mount doesn't like to modprobe btrfs
+        BOOT2DOCKER_FSTYPE=`blkid -o export $BOOT2DOCKER_DATA | grep TYPE= | cut -d= -f2`
+        modprobe $BOOT2DOCKER_FSTYPE || true
+        umount -f /mnt/$PARTNAME || true
+        mount $BOOT2DOCKER_DATA /mnt/$PARTNAME
+    fi
+
+    # Just in case, the links will fail if not
+    umount -f /var/lib/docker || true
+    rm -rf /var/lib/docker /var/lib/boot2docker
+    mkdir -p /var/lib
+
+    mkdir -p /mnt/$PARTNAME/var/lib/boot2docker
+    ln -s /mnt/$PARTNAME/var/lib/boot2docker /var/lib/boot2docker
+
+    mkdir -p /mnt/$PARTNAME/var/lib/docker
+    ln -s /mnt/$PARTNAME/var/lib/docker /var/lib/docker
+
+    mkdir -p /mnt/$PARTNAME/var/lib/kubelet
+    ln -s /mnt/$PARTNAME/var/lib/kubelet /var/lib/kubelet
+
+    mkdir -p /mnt/$PARTNAME/var/lib/cni
+    ln -s /mnt/$PARTNAME/var/lib/cni /var/lib/cni
+
+    rm -rf /var/lib/rkt
+    if [ ! -d /mnt/$PARTNAME/var/lib/rkt ]; then
+        mkdir -p /mnt/$PARTNAME/var/lib/rkt
+        chown root:rkt /mnt/$PARTNAME/var/lib/rkt
+    fi
+    ln -s /mnt/$PARTNAME/var/lib/rkt /var/lib/rkt
+
+    if [ ! -d /mnt/$PARTNAME/var/lib/rkt-etc ]; then
+        mkdir -p /mnt/$PARTNAME/var/lib/rkt-etc
+        cp -rp /etc/rkt/* /mnt/$PARTNAME/var/lib/rkt-etc
+        chown root:rkt-admin /mnt/$PARTNAME/var/lib/rkt-etc
+        chmod ug+rw /mnt/$PARTNAME/var/lib/rkt-etc
+    fi
+    rm -rf /etc/rkt
+    ln -s /mnt/$PARTNAME/var/lib/rkt-etc /etc/rkt
+
+    if [ ! -d /var/lib/rkt/pods ]; then
+        systemd-tmpfiles --create rkt.conf
+    fi
+
+    if [ -e "/userdata.tar" ]; then
+        mv /userdata.tar /var/lib/boot2docker/
+    fi
+
+    tar xf /var/lib/boot2docker/userdata.tar -C /home/docker/
+    chown -R docker:docker /home/docker/.ssh
+    rm -f '/home/docker/boot2docker, please format-me'
+
+    mkdir -p /mnt/$PARTNAME/var/lib/localkube
+    ln -s /mnt/$PARTNAME/var/lib/localkube /var/lib/localkube
+fi
+
+# /etc dirs are initialised from /usr/local, to allow the user/admin to customise
+mkdir -p /var/lib/boot2docker/etc/
diff --git a/package/automount/minikube-automount.service b/package/automount/minikube-automount.service
new file mode 100644
index 000000000000..4f5a6ce6fa29
--- /dev/null
+++ b/package/automount/minikube-automount.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=minikube automount
+Before=docker.service rkt-api.service rkt-metadata.service
+
+[Service]
+ExecStart=/usr/sbin/minikube-automount
+Type=oneshot
+RemainAfterExit=true
diff --git a/package/cni-bin/Config.in b/package/cni-bin/Config.in
new file mode 100644
index 000000000000..9a0f860c6754
--- /dev/null
+++ b/package/cni-bin/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_CNI_BIN
+	bool "cni-bin"
+	default y
+	depends on BR2_x86_64
diff --git a/package/cni-bin/cni-bin.hash b/package/cni-bin/cni-bin.hash
new file mode 100644
index 000000000000..53a1317956a2
--- /dev/null
+++ b/package/cni-bin/cni-bin.hash
@@ -0,0 +1 @@
+sha256 b1ae09833a238c51161918a8849031efdb46cf0068ea5b752e362d9836e2af7d  cni-v0.3.0.tgz
diff --git a/package/cni-bin/cni-bin.mk b/package/cni-bin/cni-bin.mk
new file mode 100644
index 000000000000..d592e04aa978
--- /dev/null
+++ b/package/cni-bin/cni-bin.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# cni-bin
+#
+################################################################################
+
+CNI_BIN_VERSION = 0.3.0
+CNI_BIN_SITE = https://github.com/containernetworking/cni/releases/download/v$(CNI_BIN_VERSION)
+CNI_BIN_SOURCE = cni-v$(CNI_BIN_VERSION).tgz
+
+define CNI_BIN_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/bridge \
+		$(TARGET_DIR)/bin/bridge
+endef
+
+$(eval $(generic-package))
diff --git a/package/docker-bin/Config.in b/package/docker-bin/Config.in
new file mode 100644
index 000000000000..3284d1c7ad4b
--- /dev/null
+++ b/package/docker-bin/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_DOCKER_BIN
+	bool "docker-bin"
+	default y
+	depends on BR2_x86_64
diff --git a/package/docker-bin/docker-bin.hash b/package/docker-bin/docker-bin.hash
new file mode 100644
index 000000000000..12c6284338ac
--- /dev/null
+++ b/package/docker-bin/docker-bin.hash
@@ -0,0 +1 @@
+sha256 893e3c6e89c0cd2c5f1e51ea41bc2dd97f5e791fcfa3cee28445df277836339d  docker-1.11.1.tgz
diff --git a/package/docker-bin/docker-bin.mk b/package/docker-bin/docker-bin.mk
new file mode 100644
index 000000000000..c30b693cb978
--- /dev/null
+++ b/package/docker-bin/docker-bin.mk
@@ -0,0 +1,50 @@
+################################################################################
+#
+# docker-bin
+#
+################################################################################
+
+DOCKER_BIN_VERSION = 1.11.1
+DOCKER_BIN_SITE = https://get.docker.com/builds/Linux/x86_64
+DOCKER_BIN_SOURCE = docker-$(DOCKER_BIN_VERSION).tgz
+
+define DOCKER_BIN_USERS
+	- -1 docker -1 - - - - -
+endef
+
+define DOCKER_BIN_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker \
+		$(TARGET_DIR)/bin/docker
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker-containerd-shim \
+		$(TARGET_DIR)/bin/docker-containerd-shim
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker-containerd \
+		$(TARGET_DIR)/bin/docker-containerd
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker-runc \
+		$(TARGET_DIR)/bin/docker-runc
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/docker-containerd-ctr \
+		$(TARGET_DIR)/bin/docker-containerd-ctr
+endef
+
+define DOCKER_BIN_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 \
+		$(BR2_EXTERNAL)/package/docker-bin/docker.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/docker.service
+
+	$(INSTALL) -D -m 644 \
+		$(BR2_EXTERNAL)/package/docker-bin/docker.socket \
+		$(TARGET_DIR)/usr/lib/systemd/system/docker.socket
+
+	ln -fs /usr/lib/systemd/system/docker.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service
+endef
+
+$(eval $(generic-package))
diff --git a/package/docker-bin/docker.service b/package/docker-bin/docker.service
new file mode 100644
index 000000000000..dd6e2ba283f1
--- /dev/null
+++ b/package/docker-bin/docker.service
@@ -0,0 +1,33 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=https://docs.docker.com
+After=network.target docker.socket
+Requires=docker.socket
+
+[Service]
+Type=notify
+
+# DOCKER_RAMDISK disable pivot_root in Docker, using MS_MOVE instead.
+Environment=DOCKER_RAMDISK=yes
+
+# the default is not to use systemd for cgroups because the delegate issues still
+# exists and systemd currently does not support the cgroup feature set required
+# for containers run by docker
+ExecStart=/usr/bin/docker daemon -H fd://
+ExecReload=/bin/kill -s HUP $MAINPID
+# Having non-zero Limit*s causes performance problems due to accounting overhead
+# in the kernel. We recommend using cgroups to do container-local accounting.
+LimitNOFILE=infinity
+LimitNPROC=infinity
+LimitCORE=infinity
+# Uncomment TasksMax if your systemd version supports it.
+# Only systemd 226 and above support this version.
+#TasksMax=infinity
+TimeoutStartSec=0
+# set delegate yes so that systemd does not reset the cgroups of docker containers
+Delegate=yes
+# kill only the docker process, not all processes in the cgroup
+KillMode=process
+
+[Install]
+WantedBy=multi-user.target
diff --git a/package/docker-bin/docker.socket b/package/docker-bin/docker.socket
new file mode 100644
index 000000000000..7dd95098e4ad
--- /dev/null
+++ b/package/docker-bin/docker.socket
@@ -0,0 +1,12 @@
+[Unit]
+Description=Docker Socket for the API
+PartOf=docker.service
+
+[Socket]
+ListenStream=/var/run/docker.sock
+SocketMode=0660
+SocketUser=root
+SocketGroup=docker
+
+[Install]
+WantedBy=sockets.target
diff --git a/package/rkt-bin/Config.in b/package/rkt-bin/Config.in
new file mode 100644
index 000000000000..b449b1802f00
--- /dev/null
+++ b/package/rkt-bin/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_RKT_BIN
+	bool "rkt-bin"
+	default y
+	depends on BR2_x86_64
diff --git a/package/rkt-bin/rkt-bin.hash b/package/rkt-bin/rkt-bin.hash
new file mode 100644
index 000000000000..f2569e4a8fc1
--- /dev/null
+++ b/package/rkt-bin/rkt-bin.hash
@@ -0,0 +1,3 @@
+sha256 8cc7819b460f45e8e15904132ada1994fc794c6337c0de554cb2daa9c02249fb  rkt-v1.13.0.tar.gz
+sha256 d993729255dea7ed36aa4372390ced40c953035b3322b4f303d72bc281241514  rkt-v1.13.0.tar.gz.asc
+sha256 56eb40918ba8dfbfc30bfddb3d235c3485825af1e7bd9816bdc478716d40544b  app-signing-pubkey.gpg
diff --git a/package/rkt-bin/rkt-bin.mk b/package/rkt-bin/rkt-bin.mk
new file mode 100644
index 000000000000..a967ad63db42
--- /dev/null
+++ b/package/rkt-bin/rkt-bin.mk
@@ -0,0 +1,71 @@
+################################################################################
+#
+# rkt
+#
+################################################################################
+
+RKT_BIN_VERSION = 1.13.0
+RKT_BIN_SITE = https://github.com/coreos/rkt/releases/download/v$(RKT_BIN_VERSION)
+RKT_BIN_SOURCE = rkt-v$(RKT_BIN_VERSION).tar.gz
+
+RKT_BIN_EXTRA_DOWNLOADS = \
+	https://github.com/coreos/rkt/releases/download/v$(RKT_BIN_VERSION)/rkt-v$(RKT_BIN_VERSION).tar.gz.asc \
+	https://coreos.com/dist/pubkeys/app-signing-pubkey.gpg
+
+define RKT_BIN_USERS
+	- -1 rkt-admin -1 - - - - -
+	- -1 rkt       -1 - - - - -
+endef
+
+define RKT_BIN_BUILD_CMDS
+	gpg2 --import $(BR2_DL_DIR)/app-signing-pubkey.gpg
+
+	gpg2 \
+		--trusted-key $(shell gpg2 --with-colons --keyid-format LONG -k security@coreos.com | egrep ^pub | cut -d ':' -f5) \
+		--verify-files $(BR2_DL_DIR)/rkt-v$(RKT_BIN_VERSION).tar.gz.asc
+
+	mkdir -p $(GO_ROOT)/var/lib/rkt
+endef
+
+define RKT_BIN_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 \
+		$(@D)/rkt \
+		$(TARGET_DIR)/bin/rkt
+
+	mkdir -p $(TARGET_DIR)/etc/bash_completion.d
+
+	$(INSTALL) -D -m 644 \
+		$(@D)/bash_completion/rkt.bash \
+		$(TARGET_DIR)/etc/bash_completion.d/rkt
+
+	mkdir -p $(TARGET_DIR)/usr/lib/rkt/stage1-images
+
+	install -Dm644 \
+		$(@D)/stage1-coreos.aci \
+		$(TARGET_DIR)/usr/lib/rkt/stage1-images/stage1-coreos.aci
+endef
+
+define RKT_BIN_INSTALL_INIT_SYSTEMD
+	mkdir -p $(TARGET_DIR)/usr/lib/tmpfiles.d
+
+	$(INSTALL) -D -m 644 \
+		$(@D)/init/systemd/tmpfiles.d/rkt.conf \
+		$(TARGET_DIR)/usr/lib/tmpfiles.d/rkt.conf
+
+	$(call install-service,rkt-api.service)
+	$(call install-service,rkt-gc.timer)
+	$(call install-service,rkt-gc.service)
+	$(call install-service,rkt-metadata.socket)
+	$(call install-service,rkt-metadata.service)
+endef
+
+define install-service
+	$(INSTALL) -D -m 644 \
+		$(@D)/init/systemd/$(1) \
+		$(TARGET_DIR)/usr/lib/systemd/system/$(1)
+
+	ln -fs /usr/lib/systemd/system/$(1) \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/$(1)
+endef
+
+$(eval $(generic-package))

From d1c7f74200169670b163e63ed8599508aded2d63 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 24 Aug 2016 18:46:47 +0200
Subject: [PATCH 02/40] readme: add disclaimer regarding CoreOS-slim

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 705511871b8f..f0c808407e56 100644
--- a/README.md
+++ b/README.md
@@ -20,3 +20,5 @@ $ make
 ```
 
 The bootable ISO image will be available in `output/images/rootfs.iso9660`.
+
+**Note**: This is currently intended to be a stop-gap solution. In the middleterm this is meant to be replaced by a "slim" version of a bootable CoreOS image.

From 7b29b148c4da077f9b3a4186e264109d4e63611a Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Wed, 24 Aug 2016 18:47:19 +0200
Subject: [PATCH 03/40] kernel: add CONFIG_CFS_BANDWIDTH for k8s kubelet
 compliance

---
 board/coreos/minikube/linux-4.7_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index be69aa7d6039..186bd7206ce3 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -12,13 +12,18 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y

From a6dd92ff772ab79f0295da11d5792d2e9213725c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 25 Aug 2016 10:51:42 +0200
Subject: [PATCH 04/40] readme: add instructions for running this image

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index f0c808407e56..0e0f40680a05 100644
--- a/README.md
+++ b/README.md
@@ -22,3 +22,21 @@ $ make
 The bootable ISO image will be available in `output/images/rootfs.iso9660`.
 
 **Note**: This is currently intended to be a stop-gap solution. In the middleterm this is meant to be replaced by a "slim" version of a bootable CoreOS image.
+
+## Quickstart
+
+To use this ISO image in minikube, use the `--iso-url` flag in minikube:
+
+```
+$ minikube start --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+```
+
+To test the minikube rkt container runtime support, make sure you have a locally built version of minikube including https://github.com/kubernetes/minikube/pull/511, and execute:
+
+```
+$ cd $HOME/src/minikube/src/k8s.io/minikube
+$ ./out/mininikube start \
+    --container-runtime=rkt \
+    --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+```

From 5f5b8edbb44b56102e74ff6599b4e886bd2b3f82 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 25 Aug 2016 10:52:43 +0200
Subject: [PATCH 05/40] readme: remove stutter

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e0f40680a05..8ccc81b1c125 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ The bootable ISO image will be available in `output/images/rootfs.iso9660`.
 
 ## Quickstart
 
-To use this ISO image in minikube, use the `--iso-url` flag in minikube:
+To use this ISO image, use the `--iso-url` flag in minikube:
 
 ```
 $ minikube start --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso

From 656ad1ade79bc0757c9d0bf2b7ae766482442920 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 26 Aug 2016 13:50:48 +0200
Subject: [PATCH 06/40] kernel: add 9P support

fixes #1
---
 board/coreos/minikube/linux-4.7_defconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index 186bd7206ce3..c847b475a2e9 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -210,6 +210,8 @@ CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_MAC80211_LEDS=y
 CONFIG_RFKILL=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -350,6 +352,9 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_ROOT_NFS=y
+CONFIG_9P_FS=m
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y

From 985be305cebd21957e042412c0e2a91ea8a07eb0 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 19:56:27 +0200
Subject: [PATCH 07/40] readme: use correct repository for building
 minikube-iso

Fixes #4
---
 README.md | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8ccc81b1c125..5a412ece7502 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,11 @@ It includes:
 ### Build instructions
 ```
 $ cd $HOME
-$ git clone https://github.com/s-urbaniak/rktminikube
-$ cd ..
+$ git clone https://github.com/coreos/minikube-iso
 $ git clone https://github.com/buildroot/buildroot
 $ cd buildroot
-$ git checkout 2016.08-rc2
-$ make BR2_EXTERNAL=../rktminikube minikube_defconfig
+$ git checkout 2016.08-rc3
+$ make BR2_EXTERNAL=../minikube-iso minikube_defconfig
 $ make
 ```
 

From 8dca461c27c79e0951743f2d3edf9fe9a6c252d3 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 1 Sep 2016 14:16:48 +0200
Subject: [PATCH 08/40] rkt: bump to v1.14.0

Fixes #3
---
 package/rkt-bin/rkt-bin.hash | 4 ++--
 package/rkt-bin/rkt-bin.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/rkt-bin/rkt-bin.hash b/package/rkt-bin/rkt-bin.hash
index f2569e4a8fc1..4418c2dd94cb 100644
--- a/package/rkt-bin/rkt-bin.hash
+++ b/package/rkt-bin/rkt-bin.hash
@@ -1,3 +1,3 @@
-sha256 8cc7819b460f45e8e15904132ada1994fc794c6337c0de554cb2daa9c02249fb  rkt-v1.13.0.tar.gz
-sha256 d993729255dea7ed36aa4372390ced40c953035b3322b4f303d72bc281241514  rkt-v1.13.0.tar.gz.asc
+sha256 7e7c122f92f1dd8e621580869903a367e6ba2dd80f3ab9bf40b089d972d0c827  rkt-v1.14.0.tar.gz
+sha256 dd514db743e9f8bdae9169bf416d6ed8a83e862e0621ce57a9d20a4f7bb1adbb  rkt-v1.14.0.tar.gz.asc
 sha256 56eb40918ba8dfbfc30bfddb3d235c3485825af1e7bd9816bdc478716d40544b  app-signing-pubkey.gpg
diff --git a/package/rkt-bin/rkt-bin.mk b/package/rkt-bin/rkt-bin.mk
index a967ad63db42..592185f95a4c 100644
--- a/package/rkt-bin/rkt-bin.mk
+++ b/package/rkt-bin/rkt-bin.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RKT_BIN_VERSION = 1.13.0
+RKT_BIN_VERSION = 1.14.0
 RKT_BIN_SITE = https://github.com/coreos/rkt/releases/download/v$(RKT_BIN_VERSION)
 RKT_BIN_SOURCE = rkt-v$(RKT_BIN_VERSION).tar.gz
 

From 81b0e224468e602bc093ccacdff29a7bf638ef98 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 1 Sep 2016 14:21:49 +0200
Subject: [PATCH 09/40] README: add more buildroot instruction

---
 README.md | 69 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 5a412ece7502..32782f025ff0 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,26 @@ It includes:
 - rkt
 - docker
 
+## Quickstart
+
+To use this ISO image, use the `--iso-url` flag in minikube:
+
+```
+$ minikube start --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+```
+
+To test the minikube rkt container runtime support, make sure you have a locally built version of minikube including https://github.com/kubernetes/minikube/pull/511, and execute:
+
+```
+$ cd $HOME/src/minikube/src/k8s.io/minikube
+$ ./out/mininikube start \
+    --container-runtime=rkt \
+    --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+```
+
+## Hacking
+
 ### Build instructions
 ```
 $ cd $HOME
@@ -22,20 +42,51 @@ The bootable ISO image will be available in `output/images/rootfs.iso9660`.
 
 **Note**: This is currently intended to be a stop-gap solution. In the middleterm this is meant to be replaced by a "slim" version of a bootable CoreOS image.
 
-## Quickstart
+### Buildroot configuration
 
-To use this ISO image, use the `--iso-url` flag in minikube:
+To change the buildroot configuration, execute:
 
 ```
-$ minikube start --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+$ cd buildroot
+$ make menuconfig
+$ make
 ```
 
-To test the minikube rkt container runtime support, make sure you have a locally built version of minikube including https://github.com/kubernetes/minikube/pull/511, and execute:
+To change the kernel configuration, execute:
 
 ```
-$ cd $HOME/src/minikube/src/k8s.io/minikube
-$ ./out/mininikube start \
-    --container-runtime=rkt \
-    --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+$ cd buildroot
+$ make linux-menuconfig
+$ make
+```
+
+The last commands copies changes made to the kernel configuration to the minikube-iso defconfig.
+
+### Saving buildroot/kernel configuration changes
+
+To save any buildroot configuration changes made with `make menuconfig`, execute:
+
 ```
+$ cd buildroot
+$ make savedefconfig
+```
+
+The changes will be reflected in the `minikube-iso/configs/minikube_defconfig` file.
+
+```
+$ cd minikube-iso
+$ git stat
+## master
+ M configs/minikube_defconfig
+```
+
+To save any kernel configuration changes made with `make linux-menuconfig`, execute:
+
+```
+$ cd buildroot
+$ make linux-savedefconfig
+$ cp output/build/linux-4.7.2/defconfig \
+    ../minikube-iso/board/coreos/minikube/linux-4.7_defconfig
+```
+
+The changes will be reflected in the `minikube-iso/configs/minikube_defconfig` file.

From 8903d8b629fe017797dd929e1d29e9b8ef067050 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 8 Sep 2016 13:34:16 +0200
Subject: [PATCH 10/40] package: add iproute2

---
 configs/minikube_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/minikube_defconfig b/configs/minikube_defconfig
index cd1bd0792522..a46064f5530a 100644
--- a/configs/minikube_defconfig
+++ b/configs/minikube_defconfig
@@ -19,6 +19,7 @@ BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_BRIDGE_UTILS=y
+BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_SOCAT=y

From d24dfd4c967b4791d6de38c9877080f67b915990 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 8 Sep 2016 13:34:36 +0200
Subject: [PATCH 11/40] cni: add missing plugings

---
 package/cni-bin/cni-bin.mk | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/package/cni-bin/cni-bin.mk b/package/cni-bin/cni-bin.mk
index d592e04aa978..0b0cc556dd75 100644
--- a/package/cni-bin/cni-bin.mk
+++ b/package/cni-bin/cni-bin.mk
@@ -11,7 +11,27 @@ CNI_BIN_SOURCE = cni-v$(CNI_BIN_VERSION).tgz
 define CNI_BIN_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0755 \
 		$(@D)/bridge \
-		$(TARGET_DIR)/bin/bridge
+		$(TARGET_DIR)/opt/cni/bin/bridge
+
+	ln -sf \
+		../../opt/cni/bin/bridge \
+		$(TARGET_DIR)/usr/bin/bridge
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/host-local \
+		$(TARGET_DIR)/opt/cni/bin/host-local
+
+	ln -sf \
+		../../opt/cni/bin/host-local \
+		$(TARGET_DIR)/usr/bin/host-local
+
+	$(INSTALL) -D -m 0755 \
+		$(@D)/loopback \
+		$(TARGET_DIR)/opt/cni/bin/loopback
+
+	ln -sf \
+		../../opt/cni/bin/loopback \
+		$(TARGET_DIR)/usr/bin/loopback
 endef
 
 $(eval $(generic-package))

From 8175ba3ef5f5ba4e6da4a34bd6e7426c261555dd Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 8 Sep 2016 13:34:41 +0200
Subject: [PATCH 12/40] cni: configure default network

---
 .../rootfs-overlay/etc/cni/net.d/k8s.conf     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf

diff --git a/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf b/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
new file mode 100644
index 000000000000..7b5404e53bf2
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
@@ -0,0 +1,19 @@
+{
+  "name": "rkt.kubernetes.io",
+  "type": "bridge",
+  "bridge": "mybridge",
+  "mtu": 1460,
+  "addIf": "true",
+  "isGateway": true,
+  "ipMasq": true,
+  "ipam": {
+    "type": "host-local",
+    "subnet": "10.1.0.0/16",
+    "gateway": "10.1.0.1",
+    "routes": [
+      {
+        "dst": "0.0.0.0/0"
+      }
+    ]
+  }
+}

From 226a728abacbf0645addd90748db8aa6596790cc Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 8 Sep 2016 14:11:09 +0200
Subject: [PATCH 13/40] rootfs: fix wrong default location of k8s CNI
 configuration

---
 .../libexec/kubernetes/kubelet-plugins/net/exec}/k8s.conf         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename board/coreos/minikube/rootfs-overlay/{etc/cni/net.d => usr/libexec/kubernetes/kubelet-plugins/net/exec}/k8s.conf (100%)

diff --git a/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf b/board/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
rename to board/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf

From ed748bd8932dead418db943e8609c0aed3101156 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 8 Sep 2016 14:27:23 +0200
Subject: [PATCH 14/40] readme: update newest release, and CNI usage

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 32782f025ff0..d3e945762845 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,8 @@ It includes:
 To use this ISO image, use the `--iso-url` flag in minikube:
 
 ```
-$ minikube start --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+$ minikube start \
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
 ```
 
 To test the minikube rkt container runtime support, make sure you have a locally built version of minikube including https://github.com/kubernetes/minikube/pull/511, and execute:
@@ -21,10 +22,13 @@ To test the minikube rkt container runtime support, make sure you have a locally
 $ cd $HOME/src/minikube/src/k8s.io/minikube
 $ ./out/mininikube start \
     --container-runtime=rkt \
+    --network-plugin=cni \
     --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.1.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.3.iso
 ```
 
+Note that the above statement includes `--network-plugin=cni` which is the recommended way of starting rtk+Kubernetes.
+
 ## Hacking
 
 ### Build instructions

From 890372a32328eeca5130818df39b90e21ffa3c53 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 9 Sep 2016 12:14:41 +0200
Subject: [PATCH 15/40] MAINTAINERS: initial commit

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
new file mode 100644
index 000000000000..7418a8b7d2c9
--- /dev/null
+++ b/MAINTAINERS
@@ -0,0 +1 @@
+Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak)

From 45e1f550e658368221debfcd9dbce48f9abf3a2c Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Fri, 9 Sep 2016 18:53:07 +0200
Subject: [PATCH 16/40] README: update installation description

---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d3e945762845..361d20afbcd3 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,9 @@ It includes:
 - rkt
 - docker
 
+**Note**: This is currently intended to be a stop-gap solution. In the middleterm this is meant to be replaced by a "slim" version of a bootable CoreOS image.
+
+
 ## Quickstart
 
 To use this ISO image, use the `--iso-url` flag in minikube:
@@ -16,7 +19,7 @@ $ minikube start \
     --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
 ```
 
-To test the minikube rkt container runtime support, make sure you have a locally built version of minikube including https://github.com/kubernetes/minikube/pull/511, and execute:
+To test the minikube rkt container runtime support, make sure you have a locally built version of the minikube master branch, and execute:
 
 ```
 $ cd $HOME/src/minikube/src/k8s.io/minikube
@@ -44,8 +47,6 @@ $ make
 
 The bootable ISO image will be available in `output/images/rootfs.iso9660`.
 
-**Note**: This is currently intended to be a stop-gap solution. In the middleterm this is meant to be replaced by a "slim" version of a bootable CoreOS image.
-
 ### Buildroot configuration
 
 To change the buildroot configuration, execute:

From fdcc34d713d8bf1ca7daf8602eb63926cd409453 Mon Sep 17 00:00:00 2001
From: aprindle <aprindle@google.com>
Date: Fri, 16 Sep 2016 14:23:28 -0400
Subject: [PATCH 17/40] Fixed README.md Quickstart minikube command

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 361d20afbcd3..1fd57d81733e 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ To test the minikube rkt container runtime support, make sure you have a locally
 
 ```
 $ cd $HOME/src/minikube/src/k8s.io/minikube
-$ ./out/mininikube start \
+$ ./out/minikube start \
     --container-runtime=rkt \
     --network-plugin=cni \
     --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \

From cf5b6974b62b2330cca77c99d9513d7d6a735aeb Mon Sep 17 00:00:00 2001
From: ryan jarvinen <ryan.jarvinen@gmail.com>
Date: Fri, 16 Sep 2016 17:56:56 -0700
Subject: [PATCH 18/40] Build from src no longer required for testing rkt
 support, fixing iso path

Local build no longer required after the Minikube v0.10 release
---
 README.md | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 1fd57d81733e..e362bffdd5d9 100644
--- a/README.md
+++ b/README.md
@@ -19,21 +19,30 @@ $ minikube start \
     --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
 ```
 
-To test the minikube rkt container runtime support, make sure you have a locally built version of the minikube master branch, and execute:
+To test the minikube rkt container runtime support, make sure you have minikube v0.10 or later, and execute:
 
 ```
-$ cd $HOME/src/minikube/src/k8s.io/minikube
-$ ./out/minikube start \
+$ minikube start \
     --container-runtime=rkt \
     --network-plugin=cni \
-    --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.1/minikube-v0.0.3.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
 ```
 
 Note that the above statement includes `--network-plugin=cni` which is the recommended way of starting rtk+Kubernetes.
 
 ## Hacking
 
+To test a locally-built version of the minikube master branch, include a `kubernetes-version` flag with a path to the `localkube` output from your source build directory:
+
+```
+$ cd $HOME/src/minikube/src/k8s.io/minikube
+$ ./out/minikube start \
+    --container-runtime=rkt \
+    --network-plugin=cni \
+    --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
+```
+
 ### Build instructions
 ```
 $ cd $HOME

From 235e9018165afd9039e5b37f263486b63cc4f0f6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sat, 17 Sep 2016 06:58:50 +0200
Subject: [PATCH 19/40] kernel: add vmxnet3 driver

Fixes #13
---
 board/coreos/minikube/linux-4.7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index c847b475a2e9..b4b5a021cac0 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -252,6 +252,7 @@ CONFIG_FORCEDETH=y
 CONFIG_8139CP=y
 CONFIG_8139TOO=y
 CONFIG_FDDI=y
+CONFIG_VMXNET3=y
 CONFIG_INPUT_POLLDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y

From f75b9bd43aaae3bf21714909d20b0490c52b61e2 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sat, 17 Sep 2016 07:15:15 +0200
Subject: [PATCH 20/40] README: use buildroot 2016.08

Fixes #15
---
 README.md    |  2 +-
 changelog.sh | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100755 changelog.sh

diff --git a/README.md b/README.md
index e362bffdd5d9..2969bc75267b 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ $ cd $HOME
 $ git clone https://github.com/coreos/minikube-iso
 $ git clone https://github.com/buildroot/buildroot
 $ cd buildroot
-$ git checkout 2016.08-rc3
+$ git checkout 2016.08
 $ make BR2_EXTERNAL=../minikube-iso minikube_defconfig
 $ make
 ```
diff --git a/changelog.sh b/changelog.sh
new file mode 100755
index 000000000000..e7805d981de9
--- /dev/null
+++ b/changelog.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+#
+# Create a changelog.
+#
+# The env variable RANGE specifies the range of commits to be searched for the changelog.
+# If unset the latest tag until origin/master will be set.
+#
+# The env variable GITHUB_AUTH can be set in the form user:token to specify a GitHub
+# personal access token. Otherwise one could run into GitHub rate limits.
+# Go to https://github.com/settings/tokens to generate a token.
+#
+set -e
+
+jq --version >/dev/null 2>&1 || {
+    echo "could not find jq (JSON command line processor), is it installed?"
+    exit 255
+}
+
+if [ -z "${RANGE}" ]; then
+    LATEST_TAG=$(git describe --abbrev=0)
+    RANGE="${LATEST_TAG}..origin/master"
+fi
+
+if [ ! -z "${GITHUB_AUTH}" ]; then
+    GITHUB_AUTH="-u ${GITHUB_AUTH}"
+fi
+
+for pr in $(git log --pretty=%s --first-parent "${RANGE}" | egrep -o '#\w+' | tr -d '#'); do
+    body=$(curl -s "${GITHUB_AUTH}" https://api.github.com/repos/coreos/minikube-iso/pulls/"${pr}" | \
+                  jq -r '{title: .title, body: .body}')
+
+    echo "-" \
+         "$(echo "${body}" | jq -r .title | sed 's/\.$//g')" \
+         "([#${pr}](https://github.com/coreos/rkt/pull/$pr))." \
+         "$(echo "${body}" | jq -r .body | awk -v RS='\r\n\r\n' NR==1 | tr -d '\r')"
+done

From 1985cabf6048f96ead955c663c3a8e8ca2788eef Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sun, 18 Sep 2016 06:58:47 +0200
Subject: [PATCH 21/40] README: update known configurations

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 2969bc75267b..6edbc2ddf4aa 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,23 @@ $ minikube start \
 
 Note that the above statement includes `--network-plugin=cni` which is the recommended way of starting rtk+Kubernetes.
 
+## Configurations
+
+The following configurations have been tested:
+
+* OSX
+  * Virtualbox
+
+* Linux
+  * Virtualbox
+  * KVM
+
+The following configurations are known to have issues currently:
+
+* OSX
+  * xhyve (https://github.com/kubernetes/minikube/issues/603)
+  * vmwarefusion (https://github.com/kubernetes/minikube/issues/571)
+
 ## Hacking
 
 To test a locally-built version of the minikube master branch, include a `kubernetes-version` flag with a path to the `localkube` output from your source build directory:

From 54ac1fa4ad6258177eea1562280b9f319cc67f0e Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sun, 18 Sep 2016 07:05:37 +0200
Subject: [PATCH 22/40] README: use internal issue links

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6edbc2ddf4aa..e7c3ebe40ece 100644
--- a/README.md
+++ b/README.md
@@ -44,8 +44,8 @@ The following configurations have been tested:
 The following configurations are known to have issues currently:
 
 * OSX
-  * xhyve (https://github.com/kubernetes/minikube/issues/603)
-  * vmwarefusion (https://github.com/kubernetes/minikube/issues/571)
+  * xhyve (https://github.com/coreos/minikube-iso/issues/17)
+  * vmwarefusion (https://github.com/coreos/minikube-iso/issues/18)
 
 ## Hacking
 

From b663c9ac7036de700e23e2b276fb4869d6bef3b6 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sun, 18 Sep 2016 07:11:02 +0200
Subject: [PATCH 23/40] package: add openvmtools

---
 configs/minikube_defconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configs/minikube_defconfig b/configs/minikube_defconfig
index a46064f5530a..5f18d4082375 100644
--- a/configs/minikube_defconfig
+++ b/configs/minikube_defconfig
@@ -18,6 +18,7 @@ BR2_PACKAGE_XZ=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBFUSE=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES=y
@@ -25,6 +26,8 @@ BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_SOCAT=y
 BR2_PACKAGE_SUDO=y
 BR2_PACKAGE_ACL=y
+BR2_PACKAGE_OPENVMTOOLS=y
+BR2_PACKAGE_OPENVMTOOLS_PROCPS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_SYSTEMD_MACHINED=y

From f88c44d27e5a8dae6af45ed02f219ce1ee36fae1 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Sun, 18 Sep 2016 07:11:22 +0200
Subject: [PATCH 24/40] rootfs: add /var/lib/boot2docker

---
 board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep

diff --git a/board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep b/board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep
new file mode 100644
index 000000000000..e69de29bb2d1

From ce36680200d9f82e28d8a0e3c642553fc033dc03 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 19:58:20 +0200
Subject: [PATCH 25/40] kernel: add vmware modules

---
 board/coreos/minikube/linux-4.7_defconfig | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index b4b5a021cac0..e4167dffe4f1 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -218,13 +218,22 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEBUG_DEVRES=y
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_VMWARE_BALLOON=m
+CONFIG_VMWARE_VMCI=m
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_BLK_DEV_SR_VENDOR=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_SPI_ATTRS=y
-# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_VMWARE_PVSCSI=y
 CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_ATA_PIIX=y
@@ -236,12 +245,21 @@ CONFIG_BLK_DEV_MD=y
 CONFIG_BLK_DEV_DM=y
 CONFIG_DM_MIRROR=y
 CONFIG_DM_ZERO=y
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LOGGING=y
 CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
 CONFIG_NETCONSOLE=y
 CONFIG_VETH=y
 CONFIG_VIRTIO_NET=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
 CONFIG_TIGON3=y
 CONFIG_NET_TULIP=y
 CONFIG_E100=y
@@ -335,11 +353,14 @@ CONFIG_EFI_VARS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_QFMT_V2=y
 CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=y
 CONFIG_OVERLAY_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y

From bb7179f2acf21aab9ec66c0a5b6bb6f29c77c1f4 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 19:59:07 +0200
Subject: [PATCH 26/40] users: set password for docker (needed by vmware)

---
 board/coreos/minikube/users | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/coreos/minikube/users b/board/coreos/minikube/users
index bc64e649f4ff..ed1f4702ce49 100644
--- a/board/coreos/minikube/users
+++ b/board/coreos/minikube/users
@@ -1,2 +1,2 @@
-rkt    -1 rkt    -1 - /home/rkt    /bin/bash rkt-admin,wheel     -
-docker -1 docker -1 - /home/docker /bin/bash rkt,rkt-admin,wheel -
+rkt    -1 rkt    -1 -       /home/rkt    /bin/bash rkt-admin,wheel     -
+docker -1 docker -1 =tcuser /home/docker /bin/bash rkt,rkt-admin,wheel -

From 2aa107cb246a0c9939786a5cbc30c4cdc7799439 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 19:59:20 +0200
Subject: [PATCH 27/40] package: add openvmtools 10.0.7

---
 configs/minikube_defconfig             |  4 +-
 package/Config.in                      |  1 +
 package/openvmtools10/Config.in        | 54 +++++++++++++++
 package/openvmtools10/S10vmtoolsd      | 33 +++++++++
 package/openvmtools10/openvmtools.hash |  2 +
 package/openvmtools10/openvmtools.mk   | 92 ++++++++++++++++++++++++++
 package/openvmtools10/shutdown         |  7 ++
 package/openvmtools10/vmtoolsd.service | 14 ++++
 8 files changed, 205 insertions(+), 2 deletions(-)
 create mode 100644 package/openvmtools10/Config.in
 create mode 100644 package/openvmtools10/S10vmtoolsd
 create mode 100644 package/openvmtools10/openvmtools.hash
 create mode 100644 package/openvmtools10/openvmtools.mk
 create mode 100644 package/openvmtools10/shutdown
 create mode 100644 package/openvmtools10/vmtoolsd.service

diff --git a/configs/minikube_defconfig b/configs/minikube_defconfig
index 5f18d4082375..dfaa70f7a0be 100644
--- a/configs/minikube_defconfig
+++ b/configs/minikube_defconfig
@@ -26,8 +26,6 @@ BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_SOCAT=y
 BR2_PACKAGE_SUDO=y
 BR2_PACKAGE_ACL=y
-BR2_PACKAGE_OPENVMTOOLS=y
-BR2_PACKAGE_OPENVMTOOLS_PROCPS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_SYSTEMD_MACHINED=y
@@ -36,3 +34,5 @@ BR2_PACKAGE_UTIL_LINUX_NSENTER=y
 BR2_TARGET_ROOTFS_CPIO_BZIP2=y
 BR2_TARGET_ROOTFS_ISO9660=y
 BR2_TARGET_SYSLINUX=y
+BR2_PACKAGE_OPENVMTOOLS10=y
+BR2_PACKAGE_OPENVMTOOLS10_PROCPS=y
diff --git a/package/Config.in b/package/Config.in
index cf3a4c791aff..e93510dd58fa 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -3,4 +3,5 @@ menu "System tools"
     source "$BR2_EXTERNAL/package/automount/Config.in"
     source "$BR2_EXTERNAL/package/docker-bin/Config.in"
     source "$BR2_EXTERNAL/package/cni-bin/Config.in"
+    source "$BR2_EXTERNAL/package/openvmtools10/Config.in"
 endmenu
diff --git a/package/openvmtools10/Config.in b/package/openvmtools10/Config.in
new file mode 100644
index 000000000000..684eb4e3e5cf
--- /dev/null
+++ b/package/openvmtools10/Config.in
@@ -0,0 +1,54 @@
+config BR2_PACKAGE_OPENVMTOOLS10
+	bool "openvmtools10"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_ENABLE_LOCALE
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBDNET
+	help
+	  Open Virtual Machine Tools for VMware guest OS
+
+	  http://open-vm-tools.sourceforge.net/
+
+	  ICU locales, Xerces, and X11 tools are currently not supported.
+
+	  NOTE: Support for vmblock-fuse will be enabled in openvmtools if the
+		libfuse package is selected.
+
+if BR2_PACKAGE_OPENVMTOOLS10
+
+config BR2_PACKAGE_OPENVMTOOLS10_PROCPS
+	bool "procps support"
+	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_PROCPS_NG
+	help
+	  Enable support for procps / meminfo
+
+comment "procps support needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS"
+	depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+
+config BR2_PACKAGE_OPENVMTOOLS10_PAM
+	bool "PAM support"
+	select BR2_PACKAGE_LINUX_PAM
+	# linux-pam needs locale and wchar, but we already have this
+	# dependency on the main symbol, above.
+	depends on !BR2_STATIC_LIBS
+	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
+	help
+	  Support for PAM in openvmtools
+
+comment "PAM support needs a glibc toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
+
+endif
+
+comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \
+		BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/openvmtools10/S10vmtoolsd b/package/openvmtools10/S10vmtoolsd
new file mode 100644
index 000000000000..6afb9ca08ac0
--- /dev/null
+++ b/package/openvmtools10/S10vmtoolsd
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# Starts vmtoolsd for openvmtools
+#
+
+EXEC="/usr/bin/vmtoolsd"
+ARGS="-b"
+PID="/var/run/vmtoolsd.pid"
+
+case "$1" in
+  start)
+    printf "Starting vmtoolsd: "
+    start-stop-daemon -S -q -x $EXEC -- $ARGS $PID
+    if [ $? != 0 ]; then
+      echo "FAILED"
+      exit 1
+    else
+      echo "OK"
+    fi
+  ;;
+  stop)
+    printf "Stopping vmtoolsd: "
+    start-stop-daemon -K -q -p $PID
+    echo "OK"
+  ;;
+  restart|reload)
+    $0 stop
+    $0 start
+  ;;
+  *)
+    echo "Usage: $0 {start|stop|restart}"
+    exit 1
+esac
diff --git a/package/openvmtools10/openvmtools.hash b/package/openvmtools10/openvmtools.hash
new file mode 100644
index 000000000000..d5f630ed680e
--- /dev/null
+++ b/package/openvmtools10/openvmtools.hash
@@ -0,0 +1,2 @@
+# locally computed
+sha256  87d76dc3affd39dccfae80c7210ac89e8f14cb493a651709780f67b1b5a92ec8  open-vm-tools-stable-10.0.7.tar.gz
diff --git a/package/openvmtools10/openvmtools.mk b/package/openvmtools10/openvmtools.mk
new file mode 100644
index 000000000000..2864c6e3cd40
--- /dev/null
+++ b/package/openvmtools10/openvmtools.mk
@@ -0,0 +1,92 @@
+################################################################################
+#
+# openvmtools
+#
+################################################################################
+
+OPENVMTOOLS10_VERSION = stable-10.0.7
+OPENVMTOOLS10_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS10_VERSION))
+OPENVMTOOLS10_SUBDIR = open-vm-tools
+OPENVMTOOLS10_LICENSE = LGPLv2.1
+OPENVMTOOLS10_LICENSE_FILES = $(OPENVMTOOLS10_SUBDIR)/COPYING
+# Autoreconf needed or config/missing will run configure again at buildtime
+
+define OPENVMTOOLS10_RUN_AUTOCONF
+    cd $(@D)/open-vm-tools; $(HOST_DIR)/usr/bin/autoreconf -i
+endef
+
+OPENVMTOOLS10_PRE_PATCH_HOOKS += OPENVMTOOLS10_RUN_AUTOCONF
+
+OPENVMTOOLS10_CONF_OPTS = --with-dnet \
+	--without-icu --without-x --without-gtk2 \
+	--without-gtkmm --without-kernel-modules \
+	--disable-deploypkg --without-xerces
+OPENVMTOOLS10_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" "
+OPENVMTOOLS10_DEPENDENCIES = libglib2 libdnet
+
+# When libfuse is available, openvmtools can build vmblock-fuse, so
+# make sure that libfuse gets built first
+ifeq ($(BR2_PACKAGE_LIBFUSE),y)
+OPENVMTOOLS10_DEPENDENCIES += libfuse
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+OPENVMTOOLS10_CONF_OPTS += --with-ssl
+OPENVMTOOLS10_DEPENDENCIES += openssl
+else
+OPENVMTOOLS10_CONF_OPTS += --without-ssl
+endif
+
+ifeq ($(BR2_PACKAGE_OPENVMTOOLS10_PROCPS),y)
+OPENVMTOOLS10_CONF_OPTS += --with-procps
+OPENVMTOOLS10_DEPENDENCIES += procps-ng
+else
+OPENVMTOOLS10_CONF_OPTS += --without-procps
+endif
+
+ifeq ($(BR2_PACKAGE_OPENVMTOOLS10_PAM),y)
+OPENVMTOOLS10_CONF_OPTS += --with-pam
+OPENVMTOOLS10_DEPENDENCIES += linux-pam
+else
+OPENVMTOOLS10_CONF_OPTS += --without-pam
+endif
+
+# configure needs execution permission
+define OPENVMTOOLS10_PRE_CONFIGURE_CHMOD
+	chmod 0755 $(@D)/$(OPENVMTOOLS10_SUBDIR)/configure
+endef
+
+OPENVMTOOLS10_PRE_CONFIGURE_HOOKS += OPENVMTOOLS10_PRE_CONFIGURE_CHMOD
+
+# symlink needed by lib/system/systemLinux.c (or will cry in /var/log/messages)
+# defined in lib/misc/hostinfoPosix.c
+# /sbin/shutdown needed for Guest OS restart/shutdown from hypervisor
+define OPENVMTOOLS10_POST_INSTALL_TARGET_THINGIES
+	ln -fs os-release $(TARGET_DIR)/etc/lfs-release
+	if [ ! -e $(TARGET_DIR)/sbin/shutdown ]; then \
+		$(INSTALL) -D -m 755 package/openvmtools/shutdown \
+			$(TARGET_DIR)/sbin/shutdown; \
+	fi
+
+	mkdir -p $(TARGET_DIR)/usr/local/bin
+
+	ln -fs ../../bin/vmhgfs-fuse \
+		$(TARGET_DIR)/usr/local/bin/vmhgfs-fuse
+endef
+
+OPENVMTOOLS10_POST_INSTALL_TARGET_HOOKS += OPENVMTOOLS10_POST_INSTALL_TARGET_THINGIES
+
+define OPENVMTOOLS10_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/openvmtools/S10vmtoolsd \
+		$(TARGET_DIR)/etc/init.d/S10vmtoolsd
+endef
+
+define OPENVMTOOLS10_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/openvmtools/vmtoolsd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/vmtoolsd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../../../../usr/lib/systemd/system/vmtoolsd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vmtoolsd.service
+endef
+
+$(eval $(autotools-package))
diff --git a/package/openvmtools10/shutdown b/package/openvmtools10/shutdown
new file mode 100644
index 000000000000..bca9765a387e
--- /dev/null
+++ b/package/openvmtools10/shutdown
@@ -0,0 +1,7 @@
+#!/bin/sh
+#compatibility script for openvmtools
+if [ "$1" == "-r" ]; then
+/sbin/reboot
+else
+/sbin/poweroff
+fi
diff --git a/package/openvmtools10/vmtoolsd.service b/package/openvmtools10/vmtoolsd.service
new file mode 100644
index 000000000000..17a4df44c2d1
--- /dev/null
+++ b/package/openvmtools10/vmtoolsd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=vmtoolsd for openvmtools
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/vmtoolsd.pid
+ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid
+Restart=on-failure
+KillMode=process
+KillSignal=SIGKILL
+
+[Install]
+WantedBy=multi-user.target

From d0ae66f29e494ede4e402af623a362c6b832a5cc Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 20 Sep 2016 09:18:29 +0200
Subject: [PATCH 28/40] declare vmware fusion as working config

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e7c3ebe40ece..727977228713 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ To use this ISO image, use the `--iso-url` flag in minikube:
 
 ```
 $ minikube start \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.4/minikube-v0.0.4.iso
 ```
 
 To test the minikube rkt container runtime support, make sure you have minikube v0.10 or later, and execute:
@@ -25,7 +25,7 @@ To test the minikube rkt container runtime support, make sure you have minikube
 $ minikube start \
     --container-runtime=rkt \
     --network-plugin=cni \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.4/minikube-v0.0.4.iso
 ```
 
 Note that the above statement includes `--network-plugin=cni` which is the recommended way of starting rtk+Kubernetes.
@@ -36,6 +36,7 @@ The following configurations have been tested:
 
 * OSX
   * Virtualbox
+  * VMware Fusion
 
 * Linux
   * Virtualbox
@@ -45,7 +46,6 @@ The following configurations are known to have issues currently:
 
 * OSX
   * xhyve (https://github.com/coreos/minikube-iso/issues/17)
-  * vmwarefusion (https://github.com/coreos/minikube-iso/issues/18)
 
 ## Hacking
 

From 41452cd30ba02f0a8a83dd2920c892ce86c24ba0 Mon Sep 17 00:00:00 2001
From: Brad Ison <bison@coreos.com>
Date: Wed, 21 Sep 2016 16:10:38 -0400
Subject: [PATCH 29/40] Fix creation of rkt directory

---
 package/rkt-bin/rkt-bin.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/rkt-bin/rkt-bin.mk b/package/rkt-bin/rkt-bin.mk
index 592185f95a4c..e7793c90d9e2 100644
--- a/package/rkt-bin/rkt-bin.mk
+++ b/package/rkt-bin/rkt-bin.mk
@@ -24,7 +24,7 @@ define RKT_BIN_BUILD_CMDS
 		--trusted-key $(shell gpg2 --with-colons --keyid-format LONG -k security@coreos.com | egrep ^pub | cut -d ':' -f5) \
 		--verify-files $(BR2_DL_DIR)/rkt-v$(RKT_BIN_VERSION).tar.gz.asc
 
-	mkdir -p $(GO_ROOT)/var/lib/rkt
+	mkdir -p $(TARGET_DIR)/var/lib/rkt
 endef
 
 define RKT_BIN_INSTALL_TARGET_CMDS

From 9395ca7ed48b83eedee9dd0a2ca471e3a39343fc Mon Sep 17 00:00:00 2001
From: Brad Ison <bison@coreos.com>
Date: Wed, 21 Sep 2016 19:27:34 -0400
Subject: [PATCH 30/40] Add VirtualBox Linux guest drivers package

---
 package/Config.in                  |  1 +
 package/vbox-guest/Config.in       |  4 ++++
 package/vbox-guest/vbox-guest.hash |  4 ++++
 package/vbox-guest/vbox-guest.mk   | 38 ++++++++++++++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 package/vbox-guest/Config.in
 create mode 100644 package/vbox-guest/vbox-guest.hash
 create mode 100644 package/vbox-guest/vbox-guest.mk

diff --git a/package/Config.in b/package/Config.in
index e93510dd58fa..72d17dea3eaf 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -4,4 +4,5 @@ menu "System tools"
     source "$BR2_EXTERNAL/package/docker-bin/Config.in"
     source "$BR2_EXTERNAL/package/cni-bin/Config.in"
     source "$BR2_EXTERNAL/package/openvmtools10/Config.in"
+    source "$BR2_EXTERNAL/package/vbox-guest/Config.in"
 endmenu
diff --git a/package/vbox-guest/Config.in b/package/vbox-guest/Config.in
new file mode 100644
index 000000000000..14f5de70e960
--- /dev/null
+++ b/package/vbox-guest/Config.in
@@ -0,0 +1,4 @@
+config BR2_PACKAGE_VBOX_GUEST
+	bool "vbox-guest"
+	default y
+	depends on BR2_LINUX_KERNEL
diff --git a/package/vbox-guest/vbox-guest.hash b/package/vbox-guest/vbox-guest.hash
new file mode 100644
index 000000000000..c69f9ae072e7
--- /dev/null
+++ b/package/vbox-guest/vbox-guest.hash
@@ -0,0 +1,4 @@
+# From http://download.virtualbox.org/virtualbox/5.1.6/MD5SUMS
+md5 8c2331a718cfc038963c1214c2ba9811  VirtualBox-5.1.6.tar.bz2
+# From http://download.virtualbox.org/virtualbox/5.1.6/SHA256SUMS
+sha256 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911  VirtualBox-5.1.6.tar.bz2
diff --git a/package/vbox-guest/vbox-guest.mk b/package/vbox-guest/vbox-guest.mk
new file mode 100644
index 000000000000..9853d15081c6
--- /dev/null
+++ b/package/vbox-guest/vbox-guest.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# VirtualBox Linux Guest Drivers
+#
+################################################################################
+
+VBOX_GUEST_VERSION = 5.1.6
+VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2
+VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION)
+VBOX_GUEST_LICENSE = GPLv2
+VBOX_GUEST_LICENSE_FILES = COPYING
+
+define VBOX_GUEST_EXPORT_MODULES
+	( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz )
+	mkdir -p $(@D)/vbox-modules
+	tar -C $(@D)/vbox-modules -xzf $(@D)/src/VBox/Additions/linux/modules.tar.gz
+endef
+
+VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES
+
+VBOX_GUEST_MODULE_SUBDIRS = vbox-modules
+VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED)
+
+define VBOX_GUEST_BUILD_CMDS
+	$(TARGET_CC) -Wall -O2 -D_GNU_SOURCE -DIN_RING3 \
+		-I$(@D)/vbox-modules/vboxsf/include \
+		-I$(@D)/vbox-modules/vboxsf \
+		-o $(@D)/vbox-modules/mount.vboxsf \
+		$(@D)/src/VBox/Additions/linux/sharedfolders/vbsfmount.c \
+		$(@D)/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c
+endef
+
+define VBOX_GUEST_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/vbox-modules/mount.vboxsf $(TARGET_DIR)/sbin
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))

From 6fa4d344f26806e639439fba133894f6ec770c5f Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 22 Sep 2016 18:54:16 +0200
Subject: [PATCH 31/40] rootfs: symlink k8s.conf to retain k8s compatibility
 (#25)

This symlinks /etc/cni/net.d/k8s.conf to
/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf.

This retains compatibility with k8s 1.4

Fixes #22
---
 board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf

diff --git a/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf b/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
new file mode 120000
index 000000000000..816796081d88
--- /dev/null
+++ b/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
@@ -0,0 +1 @@
+../../../usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf
\ No newline at end of file

From cb5b47557999504b449203cc5ce3eefc48ab8471 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 27 Sep 2016 17:54:13 +0200
Subject: [PATCH 32/40] vbox-guest: enable VBoxService for automounting host
 shares (#27)

Fixes #21
---
 board/coreos/minikube/users            |  4 ++--
 package/automount/automount.mk         |  2 +-
 package/vbox-guest/vbox-guest.hash     |  1 +
 package/vbox-guest/vbox-guest.mk       | 28 ++++++++++++++++++++++++--
 package/vbox-guest/vboxservice.service | 12 +++++++++++
 5 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 package/vbox-guest/vboxservice.service

diff --git a/board/coreos/minikube/users b/board/coreos/minikube/users
index ed1f4702ce49..2bc83baf7bef 100644
--- a/board/coreos/minikube/users
+++ b/board/coreos/minikube/users
@@ -1,2 +1,2 @@
-rkt    -1 rkt    -1 -       /home/rkt    /bin/bash rkt-admin,wheel     -
-docker -1 docker -1 =tcuser /home/docker /bin/bash rkt,rkt-admin,wheel -
+rkt    -1 rkt    -1 -       /home/rkt    /bin/bash rkt-admin,wheel,vboxsf     -
+docker -1 docker -1 =tcuser /home/docker /bin/bash rkt,rkt-admin,wheel,vboxsf -
diff --git a/package/automount/automount.mk b/package/automount/automount.mk
index 62c5f91e7b8e..497b241e7c23 100644
--- a/package/automount/automount.mk
+++ b/package/automount/automount.mk
@@ -14,7 +14,7 @@ define AUTOMOUNT_INSTALL_INIT_SYSTEMD
 endef
 
 define AUTOMOUNT_INSTALL_TARGET_CMDS
-	install -Dm755 \
+	$(INSTALL) -Dm755 \
 		$(BR2_EXTERNAL)/package/automount/minikube-automount \
 		$(TARGET_DIR)/usr/sbin/minikube-automount
 endef
diff --git a/package/vbox-guest/vbox-guest.hash b/package/vbox-guest/vbox-guest.hash
index c69f9ae072e7..f3729d720817 100644
--- a/package/vbox-guest/vbox-guest.hash
+++ b/package/vbox-guest/vbox-guest.hash
@@ -2,3 +2,4 @@
 md5 8c2331a718cfc038963c1214c2ba9811  VirtualBox-5.1.6.tar.bz2
 # From http://download.virtualbox.org/virtualbox/5.1.6/SHA256SUMS
 sha256 2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911  VirtualBox-5.1.6.tar.bz2
+sha256 cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed VBoxGuestAdditions_5.1.6.iso
diff --git a/package/vbox-guest/vbox-guest.mk b/package/vbox-guest/vbox-guest.mk
index 9853d15081c6..5d468083afca 100644
--- a/package/vbox-guest/vbox-guest.mk
+++ b/package/vbox-guest/vbox-guest.mk
@@ -5,10 +5,11 @@
 ################################################################################
 
 VBOX_GUEST_VERSION = 5.1.6
-VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2
 VBOX_GUEST_SITE = http://download.virtualbox.org/virtualbox/$(VBOX_GUEST_VERSION)
 VBOX_GUEST_LICENSE = GPLv2
 VBOX_GUEST_LICENSE_FILES = COPYING
+VBOX_GUEST_SOURCE = VirtualBox-$(VBOX_GUEST_VERSION).tar.bz2
+VBOX_GUEST_EXTRA_DOWNLOADS = http://download.virtualbox.org/virtualbox/${VBOX_GUEST_VERSION}/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso
 
 define VBOX_GUEST_EXPORT_MODULES
 	( cd $(@D)/src/VBox/Additions/linux; ./export_modules modules.tar.gz )
@@ -21,7 +22,24 @@ VBOX_GUEST_POST_EXTRACT_HOOKS += VBOX_GUEST_EXPORT_MODULES
 VBOX_GUEST_MODULE_SUBDIRS = vbox-modules
 VBOX_GUEST_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED)
 
+define VBOX_GUEST_USERS
+	- -1 vboxsf -1 - - - - -
+endef
+
+define VBOX_GUEST_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 \
+		$(BR2_EXTERNAL)/package/vbox-guest/vboxservice.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/vboxservice.service
+
+	ln -fs /usr/lib/systemd/system/vboxservice.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vboxservice.service
+endef
+
 define VBOX_GUEST_BUILD_CMDS
+	7z x $(BR2_DL_DIR)/VBoxGuestAdditions_${VBOX_GUEST_VERSION}.iso -ir'!VBoxLinuxAdditions.run' -o"$(@D)"
+	sh $(@D)/VBoxLinuxAdditions.run --noexec --target $(@D)
+	tar -C $(@D) -xjf $(@D)/VBoxGuestAdditions-amd64.tar.bz2 sbin/VBoxService
+
 	$(TARGET_CC) -Wall -O2 -D_GNU_SOURCE -DIN_RING3 \
 		-I$(@D)/vbox-modules/vboxsf/include \
 		-I$(@D)/vbox-modules/vboxsf \
@@ -31,7 +49,13 @@ define VBOX_GUEST_BUILD_CMDS
 endef
 
 define VBOX_GUEST_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/vbox-modules/mount.vboxsf $(TARGET_DIR)/sbin
+	$(INSTALL) -Dm755 \
+		$(@D)/vbox-modules/mount.vboxsf \
+		$(TARGET_DIR)/sbin
+
+	$(INSTALL) -Dm755 \
+		$(@D)/sbin/VBoxService \
+		$(TARGET_DIR)/sbin
 endef
 
 $(eval $(kernel-module))
diff --git a/package/vbox-guest/vboxservice.service b/package/vbox-guest/vboxservice.service
new file mode 100644
index 000000000000..a1450a464ecf
--- /dev/null
+++ b/package/vbox-guest/vboxservice.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=VirtualBox Guest Service
+ConditionVirtualization=oracle
+
+[Service]
+ExecStartPre=-/usr/sbin/modprobe vboxguest
+ExecStartPre=-/usr/sbin/modprobe vboxvideo
+ExecStartPre=-/usr/sbin/modprobe vboxsf
+ExecStart=/usr/sbin/VBoxService -f
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file

From 6415958d1b0a9993a2afcbf158d6d5224ecd7731 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Tue, 4 Oct 2016 20:07:42 +0200
Subject: [PATCH 33/40] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 727977228713..8b16d910343d 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ To use this ISO image, use the `--iso-url` flag in minikube:
 
 ```
 $ minikube start \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.4/minikube-v0.0.4.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.5/minikube-v0.0.5.iso
 ```
 
 To test the minikube rkt container runtime support, make sure you have minikube v0.10 or later, and execute:
@@ -25,7 +25,7 @@ To test the minikube rkt container runtime support, make sure you have minikube
 $ minikube start \
     --container-runtime=rkt \
     --network-plugin=cni \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.4/minikube-v0.0.4.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.5/minikube-v0.0.5.iso
 ```
 
 Note that the above statement includes `--network-plugin=cni` which is the recommended way of starting rtk+Kubernetes.

From 12d058573abb04db033a30e41e81b54102af4244 Mon Sep 17 00:00:00 2001
From: Koichi Shiraishi <zchee.io@gmail.com>
Date: Sun, 9 Oct 2016 08:01:55 +0900
Subject: [PATCH 34/40] xhyve/virtio-blk: enable virtio-blk block devices
 driver for xhyve

- xhyve driver now supports the use of QEMU qcow2 disk image to a
  virtual disk.
  It mounts on top of the virtio-blk, we need to enable it.

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
---
 board/coreos/minikube/linux-4.7_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index e4167dffe4f1..c7c3deb7fff3 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -218,6 +218,7 @@ CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_DEBUG_DEVRES=y
 CONFIG_CONNECTOR=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_VIRTIO_BLK=y
 CONFIG_VMWARE_BALLOON=m
 CONFIG_VMWARE_VMCI=m
 CONFIG_BLK_DEV_SD=y

From 8e457d45d7ceea7a51764428b65b9b8860a596b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 11 Oct 2016 16:17:01 +0200
Subject: [PATCH 35/40] kernel: enable CONFIG_IKCONFIG and CONFIG_IKCONFIG_PROC

To easily find out which kernel options are enabled.
---
 board/coreos/minikube/linux-4.7_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index c7c3deb7fff3..09c2bf6409ff 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -404,3 +404,5 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y

From 3e6df838fdbe73648f7015a60905f7cdd9571fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iago=20L=C3=B3pez=20Galeiras?= <iago@kinvolk.io>
Date: Tue, 11 Oct 2016 16:04:04 +0200
Subject: [PATCH 36/40] kernel: enable eBPF options

As specified in
https://github.com/iovisor/bcc/blob/master/INSTALL.md#kernel-configuration
---
 board/coreos/minikube/linux-4.7_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/board/coreos/minikube/linux-4.7_defconfig b/board/coreos/minikube/linux-4.7_defconfig
index 09c2bf6409ff..eec6e1f8e137 100644
--- a/board/coreos/minikube/linux-4.7_defconfig
+++ b/board/coreos/minikube/linux-4.7_defconfig
@@ -406,3 +406,10 @@ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
+CONFIG_BPF=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_BPF_JIT=y
+CONFIG_HAVE_BPF_JIT=y
+CONFIG_BPF_EVENTS=y

From ec5d707a597d01a677f630d5c7bedf5d3cd71a48 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 13:59:59 +0200
Subject: [PATCH 37/40] minikube-iso: move to deploy/iso/minikube-iso

---
 CONTRIBUTING.md => deploy/iso/minikube-iso/CONTRIBUTING.md        | 0
 Config.in => deploy/iso/minikube-iso/Config.in                    | 0
 DCO => deploy/iso/minikube-iso/DCO                                | 0
 LICENSE => deploy/iso/minikube-iso/LICENSE                        | 0
 MAINTAINERS => deploy/iso/minikube-iso/MAINTAINERS                | 0
 NOTICE => deploy/iso/minikube-iso/NOTICE                          | 0
 README.md => deploy/iso/minikube-iso/README.md                    | 0
 .../iso/minikube-iso/board}/coreos/minikube/isolinux.cfg          | 0
 .../iso/minikube-iso/board}/coreos/minikube/linux-4.7_defconfig   | 0
 .../board}/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf  | 0
 .../minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/fstab  | 0
 .../board}/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf  | 0
 .../board}/coreos/minikube/rootfs-overlay/etc/sudoers             | 0
 .../minikube/rootfs-overlay/etc/systemd/network/dhcp.network      | 0
 .../etc/systemd/system/getty.target.wants/getty@tty1.service      | 0
 .../rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules       | 0
 .../usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf      | 0
 .../coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep      | 0
 {board => deploy/iso/minikube-iso/board}/coreos/minikube/users    | 0
 changelog.sh => deploy/iso/minikube-iso/changelog.sh              | 0
 code-of-conduct.md => deploy/iso/minikube-iso/code-of-conduct.md  | 0
 {configs => deploy/iso/minikube-iso/configs}/minikube_defconfig   | 0
 external.mk => deploy/iso/minikube-iso/external.mk                | 0
 {package => deploy/iso/minikube-iso/package}/Config.in            | 0
 {package => deploy/iso/minikube-iso/package}/automount/Config.in  | 0
 .../iso/minikube-iso/package}/automount/automount.mk              | 0
 .../iso/minikube-iso/package}/automount/minikube-automount        | 0
 .../minikube-iso/package}/automount/minikube-automount.service    | 0
 {package => deploy/iso/minikube-iso/package}/cni-bin/Config.in    | 0
 {package => deploy/iso/minikube-iso/package}/cni-bin/cni-bin.hash | 0
 {package => deploy/iso/minikube-iso/package}/cni-bin/cni-bin.mk   | 0
 {package => deploy/iso/minikube-iso/package}/docker-bin/Config.in | 0
 .../iso/minikube-iso/package}/docker-bin/docker-bin.hash          | 0
 .../iso/minikube-iso/package}/docker-bin/docker-bin.mk            | 0
 .../iso/minikube-iso/package}/docker-bin/docker.service           | 0
 .../iso/minikube-iso/package}/docker-bin/docker.socket            | 0
 .../iso/minikube-iso/package}/openvmtools10/Config.in             | 0
 .../iso/minikube-iso/package}/openvmtools10/S10vmtoolsd           | 0
 .../iso/minikube-iso/package}/openvmtools10/openvmtools.hash      | 0
 .../iso/minikube-iso/package}/openvmtools10/openvmtools.mk        | 0
 .../iso/minikube-iso/package}/openvmtools10/shutdown              | 0
 .../iso/minikube-iso/package}/openvmtools10/vmtoolsd.service      | 0
 {package => deploy/iso/minikube-iso/package}/rkt-bin/Config.in    | 0
 {package => deploy/iso/minikube-iso/package}/rkt-bin/rkt-bin.hash | 0
 {package => deploy/iso/minikube-iso/package}/rkt-bin/rkt-bin.mk   | 0
 {package => deploy/iso/minikube-iso/package}/vbox-guest/Config.in | 0
 .../iso/minikube-iso/package}/vbox-guest/vbox-guest.hash          | 0
 .../iso/minikube-iso/package}/vbox-guest/vbox-guest.mk            | 0
 .../iso/minikube-iso/package}/vbox-guest/vboxservice.service      | 0
 49 files changed, 0 insertions(+), 0 deletions(-)
 rename CONTRIBUTING.md => deploy/iso/minikube-iso/CONTRIBUTING.md (100%)
 rename Config.in => deploy/iso/minikube-iso/Config.in (100%)
 rename DCO => deploy/iso/minikube-iso/DCO (100%)
 rename LICENSE => deploy/iso/minikube-iso/LICENSE (100%)
 rename MAINTAINERS => deploy/iso/minikube-iso/MAINTAINERS (100%)
 rename NOTICE => deploy/iso/minikube-iso/NOTICE (100%)
 rename README.md => deploy/iso/minikube-iso/README.md (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/isolinux.cfg (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/linux-4.7_defconfig (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/fstab (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/sudoers (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep (100%)
 rename {board => deploy/iso/minikube-iso/board}/coreos/minikube/users (100%)
 rename changelog.sh => deploy/iso/minikube-iso/changelog.sh (100%)
 rename code-of-conduct.md => deploy/iso/minikube-iso/code-of-conduct.md (100%)
 rename {configs => deploy/iso/minikube-iso/configs}/minikube_defconfig (100%)
 rename external.mk => deploy/iso/minikube-iso/external.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/automount/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/automount/automount.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/automount/minikube-automount (100%)
 rename {package => deploy/iso/minikube-iso/package}/automount/minikube-automount.service (100%)
 rename {package => deploy/iso/minikube-iso/package}/cni-bin/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/cni-bin/cni-bin.hash (100%)
 rename {package => deploy/iso/minikube-iso/package}/cni-bin/cni-bin.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/docker-bin/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/docker-bin/docker-bin.hash (100%)
 rename {package => deploy/iso/minikube-iso/package}/docker-bin/docker-bin.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/docker-bin/docker.service (100%)
 rename {package => deploy/iso/minikube-iso/package}/docker-bin/docker.socket (100%)
 rename {package => deploy/iso/minikube-iso/package}/openvmtools10/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/openvmtools10/S10vmtoolsd (100%)
 rename {package => deploy/iso/minikube-iso/package}/openvmtools10/openvmtools.hash (100%)
 rename {package => deploy/iso/minikube-iso/package}/openvmtools10/openvmtools.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/openvmtools10/shutdown (100%)
 rename {package => deploy/iso/minikube-iso/package}/openvmtools10/vmtoolsd.service (100%)
 rename {package => deploy/iso/minikube-iso/package}/rkt-bin/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/rkt-bin/rkt-bin.hash (100%)
 rename {package => deploy/iso/minikube-iso/package}/rkt-bin/rkt-bin.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/vbox-guest/Config.in (100%)
 rename {package => deploy/iso/minikube-iso/package}/vbox-guest/vbox-guest.hash (100%)
 rename {package => deploy/iso/minikube-iso/package}/vbox-guest/vbox-guest.mk (100%)
 rename {package => deploy/iso/minikube-iso/package}/vbox-guest/vboxservice.service (100%)

diff --git a/CONTRIBUTING.md b/deploy/iso/minikube-iso/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to deploy/iso/minikube-iso/CONTRIBUTING.md
diff --git a/Config.in b/deploy/iso/minikube-iso/Config.in
similarity index 100%
rename from Config.in
rename to deploy/iso/minikube-iso/Config.in
diff --git a/DCO b/deploy/iso/minikube-iso/DCO
similarity index 100%
rename from DCO
rename to deploy/iso/minikube-iso/DCO
diff --git a/LICENSE b/deploy/iso/minikube-iso/LICENSE
similarity index 100%
rename from LICENSE
rename to deploy/iso/minikube-iso/LICENSE
diff --git a/MAINTAINERS b/deploy/iso/minikube-iso/MAINTAINERS
similarity index 100%
rename from MAINTAINERS
rename to deploy/iso/minikube-iso/MAINTAINERS
diff --git a/NOTICE b/deploy/iso/minikube-iso/NOTICE
similarity index 100%
rename from NOTICE
rename to deploy/iso/minikube-iso/NOTICE
diff --git a/README.md b/deploy/iso/minikube-iso/README.md
similarity index 100%
rename from README.md
rename to deploy/iso/minikube-iso/README.md
diff --git a/board/coreos/minikube/isolinux.cfg b/deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg
similarity index 100%
rename from board/coreos/minikube/isolinux.cfg
rename to deploy/iso/minikube-iso/board/coreos/minikube/isolinux.cfg
diff --git a/board/coreos/minikube/linux-4.7_defconfig b/deploy/iso/minikube-iso/board/coreos/minikube/linux-4.7_defconfig
similarity index 100%
rename from board/coreos/minikube/linux-4.7_defconfig
rename to deploy/iso/minikube-iso/board/coreos/minikube/linux-4.7_defconfig
diff --git a/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/cni/net.d/k8s.conf
diff --git a/board/coreos/minikube/rootfs-overlay/etc/fstab b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/fstab
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/fstab
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/fstab
diff --git a/board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/rkt/net.d/k8s.conf
diff --git a/board/coreos/minikube/rootfs-overlay/etc/sudoers b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/sudoers
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/sudoers
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/sudoers
diff --git a/board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/network/dhcp.network
diff --git a/board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/systemd/system/getty.target.wants/getty@tty1.service
diff --git a/board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/etc/udev/rules.d/80-net-setup-link.rules
diff --git a/board/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf
diff --git a/board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep b/deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep
similarity index 100%
rename from board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep
rename to deploy/iso/minikube-iso/board/coreos/minikube/rootfs-overlay/var/lib/boot2docker/.keep
diff --git a/board/coreos/minikube/users b/deploy/iso/minikube-iso/board/coreos/minikube/users
similarity index 100%
rename from board/coreos/minikube/users
rename to deploy/iso/minikube-iso/board/coreos/minikube/users
diff --git a/changelog.sh b/deploy/iso/minikube-iso/changelog.sh
similarity index 100%
rename from changelog.sh
rename to deploy/iso/minikube-iso/changelog.sh
diff --git a/code-of-conduct.md b/deploy/iso/minikube-iso/code-of-conduct.md
similarity index 100%
rename from code-of-conduct.md
rename to deploy/iso/minikube-iso/code-of-conduct.md
diff --git a/configs/minikube_defconfig b/deploy/iso/minikube-iso/configs/minikube_defconfig
similarity index 100%
rename from configs/minikube_defconfig
rename to deploy/iso/minikube-iso/configs/minikube_defconfig
diff --git a/external.mk b/deploy/iso/minikube-iso/external.mk
similarity index 100%
rename from external.mk
rename to deploy/iso/minikube-iso/external.mk
diff --git a/package/Config.in b/deploy/iso/minikube-iso/package/Config.in
similarity index 100%
rename from package/Config.in
rename to deploy/iso/minikube-iso/package/Config.in
diff --git a/package/automount/Config.in b/deploy/iso/minikube-iso/package/automount/Config.in
similarity index 100%
rename from package/automount/Config.in
rename to deploy/iso/minikube-iso/package/automount/Config.in
diff --git a/package/automount/automount.mk b/deploy/iso/minikube-iso/package/automount/automount.mk
similarity index 100%
rename from package/automount/automount.mk
rename to deploy/iso/minikube-iso/package/automount/automount.mk
diff --git a/package/automount/minikube-automount b/deploy/iso/minikube-iso/package/automount/minikube-automount
similarity index 100%
rename from package/automount/minikube-automount
rename to deploy/iso/minikube-iso/package/automount/minikube-automount
diff --git a/package/automount/minikube-automount.service b/deploy/iso/minikube-iso/package/automount/minikube-automount.service
similarity index 100%
rename from package/automount/minikube-automount.service
rename to deploy/iso/minikube-iso/package/automount/minikube-automount.service
diff --git a/package/cni-bin/Config.in b/deploy/iso/minikube-iso/package/cni-bin/Config.in
similarity index 100%
rename from package/cni-bin/Config.in
rename to deploy/iso/minikube-iso/package/cni-bin/Config.in
diff --git a/package/cni-bin/cni-bin.hash b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash
similarity index 100%
rename from package/cni-bin/cni-bin.hash
rename to deploy/iso/minikube-iso/package/cni-bin/cni-bin.hash
diff --git a/package/cni-bin/cni-bin.mk b/deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk
similarity index 100%
rename from package/cni-bin/cni-bin.mk
rename to deploy/iso/minikube-iso/package/cni-bin/cni-bin.mk
diff --git a/package/docker-bin/Config.in b/deploy/iso/minikube-iso/package/docker-bin/Config.in
similarity index 100%
rename from package/docker-bin/Config.in
rename to deploy/iso/minikube-iso/package/docker-bin/Config.in
diff --git a/package/docker-bin/docker-bin.hash b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
similarity index 100%
rename from package/docker-bin/docker-bin.hash
rename to deploy/iso/minikube-iso/package/docker-bin/docker-bin.hash
diff --git a/package/docker-bin/docker-bin.mk b/deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
similarity index 100%
rename from package/docker-bin/docker-bin.mk
rename to deploy/iso/minikube-iso/package/docker-bin/docker-bin.mk
diff --git a/package/docker-bin/docker.service b/deploy/iso/minikube-iso/package/docker-bin/docker.service
similarity index 100%
rename from package/docker-bin/docker.service
rename to deploy/iso/minikube-iso/package/docker-bin/docker.service
diff --git a/package/docker-bin/docker.socket b/deploy/iso/minikube-iso/package/docker-bin/docker.socket
similarity index 100%
rename from package/docker-bin/docker.socket
rename to deploy/iso/minikube-iso/package/docker-bin/docker.socket
diff --git a/package/openvmtools10/Config.in b/deploy/iso/minikube-iso/package/openvmtools10/Config.in
similarity index 100%
rename from package/openvmtools10/Config.in
rename to deploy/iso/minikube-iso/package/openvmtools10/Config.in
diff --git a/package/openvmtools10/S10vmtoolsd b/deploy/iso/minikube-iso/package/openvmtools10/S10vmtoolsd
similarity index 100%
rename from package/openvmtools10/S10vmtoolsd
rename to deploy/iso/minikube-iso/package/openvmtools10/S10vmtoolsd
diff --git a/package/openvmtools10/openvmtools.hash b/deploy/iso/minikube-iso/package/openvmtools10/openvmtools.hash
similarity index 100%
rename from package/openvmtools10/openvmtools.hash
rename to deploy/iso/minikube-iso/package/openvmtools10/openvmtools.hash
diff --git a/package/openvmtools10/openvmtools.mk b/deploy/iso/minikube-iso/package/openvmtools10/openvmtools.mk
similarity index 100%
rename from package/openvmtools10/openvmtools.mk
rename to deploy/iso/minikube-iso/package/openvmtools10/openvmtools.mk
diff --git a/package/openvmtools10/shutdown b/deploy/iso/minikube-iso/package/openvmtools10/shutdown
similarity index 100%
rename from package/openvmtools10/shutdown
rename to deploy/iso/minikube-iso/package/openvmtools10/shutdown
diff --git a/package/openvmtools10/vmtoolsd.service b/deploy/iso/minikube-iso/package/openvmtools10/vmtoolsd.service
similarity index 100%
rename from package/openvmtools10/vmtoolsd.service
rename to deploy/iso/minikube-iso/package/openvmtools10/vmtoolsd.service
diff --git a/package/rkt-bin/Config.in b/deploy/iso/minikube-iso/package/rkt-bin/Config.in
similarity index 100%
rename from package/rkt-bin/Config.in
rename to deploy/iso/minikube-iso/package/rkt-bin/Config.in
diff --git a/package/rkt-bin/rkt-bin.hash b/deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.hash
similarity index 100%
rename from package/rkt-bin/rkt-bin.hash
rename to deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.hash
diff --git a/package/rkt-bin/rkt-bin.mk b/deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk
similarity index 100%
rename from package/rkt-bin/rkt-bin.mk
rename to deploy/iso/minikube-iso/package/rkt-bin/rkt-bin.mk
diff --git a/package/vbox-guest/Config.in b/deploy/iso/minikube-iso/package/vbox-guest/Config.in
similarity index 100%
rename from package/vbox-guest/Config.in
rename to deploy/iso/minikube-iso/package/vbox-guest/Config.in
diff --git a/package/vbox-guest/vbox-guest.hash b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash
similarity index 100%
rename from package/vbox-guest/vbox-guest.hash
rename to deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.hash
diff --git a/package/vbox-guest/vbox-guest.mk b/deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk
similarity index 100%
rename from package/vbox-guest/vbox-guest.mk
rename to deploy/iso/minikube-iso/package/vbox-guest/vbox-guest.mk
diff --git a/package/vbox-guest/vboxservice.service b/deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service
similarity index 100%
rename from package/vbox-guest/vboxservice.service
rename to deploy/iso/minikube-iso/package/vbox-guest/vboxservice.service

From 6fe5d996448ec1b147817161de48403ed5604d6d Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 14:04:56 +0200
Subject: [PATCH 38/40] minikube-iso: remove project files from old repository

---
 deploy/iso/minikube-iso/CONTRIBUTING.md    |  77 --------
 deploy/iso/minikube-iso/DCO                |  36 ----
 deploy/iso/minikube-iso/LICENSE            | 202 ---------------------
 deploy/iso/minikube-iso/MAINTAINERS        |   1 -
 deploy/iso/minikube-iso/NOTICE             |   5 -
 deploy/iso/minikube-iso/README.md          |  81 ++++-----
 deploy/iso/minikube-iso/changelog.sh       |  36 ----
 deploy/iso/minikube-iso/code-of-conduct.md |  63 -------
 8 files changed, 37 insertions(+), 464 deletions(-)
 delete mode 100644 deploy/iso/minikube-iso/CONTRIBUTING.md
 delete mode 100644 deploy/iso/minikube-iso/DCO
 delete mode 100644 deploy/iso/minikube-iso/LICENSE
 delete mode 100644 deploy/iso/minikube-iso/MAINTAINERS
 delete mode 100644 deploy/iso/minikube-iso/NOTICE
 delete mode 100755 deploy/iso/minikube-iso/changelog.sh
 delete mode 100644 deploy/iso/minikube-iso/code-of-conduct.md

diff --git a/deploy/iso/minikube-iso/CONTRIBUTING.md b/deploy/iso/minikube-iso/CONTRIBUTING.md
deleted file mode 100644
index 0551ed53d3f5..000000000000
--- a/deploy/iso/minikube-iso/CONTRIBUTING.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# How to Contribute
-
-CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
-GitHub pull requests.  This document outlines some of the conventions on
-development workflow, commit message formatting, contact points and other
-resources to make it easier to get your contribution accepted.
-
-# Certificate of Origin
-
-By contributing to this project you agree to the Developer Certificate of
-Origin (DCO). This document was created by the Linux Kernel community and is a
-simple statement that you, as a contributor, have the legal right to make the
-contribution. See the [DCO](DCO) file for details.
-
-# Email and Chat
-
-The project currently uses the general CoreOS email list and IRC channel:
-- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
-- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
-
-Please avoid emailing maintainers found in the MAINTAINERS file directly. They
-are very busy and read the mailing lists.
-
-## Getting Started
-
-- Fork the repository on GitHub
-- Read the [README](README.md) for build and test instructions
-- Play with the project, submit bugs, submit patches!
-
-## Contribution Flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work (usually master).
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Push your changes to a topic branch in your fork of the repository.
-- Make sure the tests pass, and add any new tests as appropriate.
-- Submit a pull request to the original repository.
-
-Thanks for your contributions!
-
-### Coding Style
-
-CoreOS projects written in Go follow a set of style guidelines that we've documented 
-[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when 
-working on your contributions.
-
-### Format of the Commit Message
-
-We follow a rough convention for commit messages that is designed to answer two
-questions: what changed and why. The subject line should feature the what and
-the body of the commit should describe the why.
-
-```
-scripts: add the test-cluster command
-
-this uses tmux to setup a test cluster that you can easily kill and
-start for debugging.
-
-Fixes #38
-```
-
-The format can be described more formally as follows:
-
-```
-<subsystem>: <what changed>
-<BLANK LINE>
-<why this change was made>
-<BLANK LINE>
-<footer>
-```
-
-The first line is the subject and should be no longer than 70 characters, the
-second line is always blank, and other lines should be wrapped at 80 characters.
-This allows the message to be easier to read on GitHub as well as in various
-git tools.
diff --git a/deploy/iso/minikube-iso/DCO b/deploy/iso/minikube-iso/DCO
deleted file mode 100644
index 716561d5d282..000000000000
--- a/deploy/iso/minikube-iso/DCO
+++ /dev/null
@@ -1,36 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/deploy/iso/minikube-iso/LICENSE b/deploy/iso/minikube-iso/LICENSE
deleted file mode 100644
index e06d2081865a..000000000000
--- a/deploy/iso/minikube-iso/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
diff --git a/deploy/iso/minikube-iso/MAINTAINERS b/deploy/iso/minikube-iso/MAINTAINERS
deleted file mode 100644
index 7418a8b7d2c9..000000000000
--- a/deploy/iso/minikube-iso/MAINTAINERS
+++ /dev/null
@@ -1 +0,0 @@
-Sergiusz Urbaniak <sergiusz.urbaniak@coreos.com> (@s-urbaniak)
diff --git a/deploy/iso/minikube-iso/NOTICE b/deploy/iso/minikube-iso/NOTICE
deleted file mode 100644
index e520005cdda3..000000000000
--- a/deploy/iso/minikube-iso/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-CoreOS Project
-Copyright 2015 CoreOS, Inc
-
-This product includes software developed at CoreOS, Inc.
-(http://www.coreos.com/).
diff --git a/deploy/iso/minikube-iso/README.md b/deploy/iso/minikube-iso/README.md
index 8b16d910343d..76655229652a 100644
--- a/deploy/iso/minikube-iso/README.md
+++ b/deploy/iso/minikube-iso/README.md
@@ -1,35 +1,12 @@
 ## minikube ISO image
 
-This includes the configuration for an alternative bootable ISO image meant to be used in conjection with https://github.com/kubernetes/minikube.
+This includes the configuration for an alternative bootable ISO image meant to be used in conjection with minikube.
 
 It includes:
 - systemd as the init system
 - rkt
 - docker
 
-**Note**: This is currently intended to be a stop-gap solution. In the middleterm this is meant to be replaced by a "slim" version of a bootable CoreOS image.
-
-
-## Quickstart
-
-To use this ISO image, use the `--iso-url` flag in minikube:
-
-```
-$ minikube start \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.5/minikube-v0.0.5.iso
-```
-
-To test the minikube rkt container runtime support, make sure you have minikube v0.10 or later, and execute:
-
-```
-$ minikube start \
-    --container-runtime=rkt \
-    --network-plugin=cni \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.5/minikube-v0.0.5.iso
-```
-
-Note that the above statement includes `--network-plugin=cni` which is the recommended way of starting rtk+Kubernetes.
-
 ## Configurations
 
 The following configurations have been tested:
@@ -49,36 +26,53 @@ The following configurations are known to have issues currently:
 
 ## Hacking
 
-To test a locally-built version of the minikube master branch, include a `kubernetes-version` flag with a path to the `localkube` output from your source build directory:
+### Build instructions
+
+```
+$ git clone https://github.com/kubernetes/minikube
+$ cd minikube
+$ make minikube-iso
+```
+
+The bootable ISO image will be available in `out/buildroot/output/images/rootfs.iso9660`.
+
+### Testing local minikube changes
+
+To test a local build of minikube, include a `kubernetes-version` flag with a path to the `localkube` output from your source build directory:
 
 ```
-$ cd $HOME/src/minikube/src/k8s.io/minikube
+$ cd minikube
 $ ./out/minikube start \
     --container-runtime=rkt \
     --network-plugin=cni \
     --kubernetes-version=file://$HOME/minikube/src/k8s.io/minikube/out/localkube \
-    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.3/minikube-v0.0.3.iso
+    --iso-url=https://github.com/coreos/minikube-iso/releases/download/v0.0.5/minikube-v0.0.5.iso
 ```
 
-### Build instructions
+### Testing local minikube-iso changes
+
+To test a local build of minikube-iso, start a web server (i.e. Caddy) to serve the ISO image, and start `minikube` with an `--iso-url` pointing to localhost:
+
 ```
-$ cd $HOME
-$ git clone https://github.com/coreos/minikube-iso
-$ git clone https://github.com/buildroot/buildroot
-$ cd buildroot
-$ git checkout 2016.08
-$ make BR2_EXTERNAL=../minikube-iso minikube_defconfig
-$ make
+$ cd $HOME/src/minikube/src/k8s.io/minikube
+$ cd ./out/buildroot/output/images
+$ caddy browse "log stdout"
+Activating privacy features... done.
+http://:2015
 ```
 
-The bootable ISO image will be available in `output/images/rootfs.iso9660`.
+In another terminal:
+
+```
+$ minikube start --iso-url=http://localhost:2015/rootfs.iso9660
+```
 
 ### Buildroot configuration
 
 To change the buildroot configuration, execute:
 
 ```
-$ cd buildroot
+$ cd out/buildroot
 $ make menuconfig
 $ make
 ```
@@ -86,7 +80,7 @@ $ make
 To change the kernel configuration, execute:
 
 ```
-$ cd buildroot
+$ cd out/buildroot
 $ make linux-menuconfig
 $ make
 ```
@@ -98,26 +92,25 @@ The last commands copies changes made to the kernel configuration to the minikub
 To save any buildroot configuration changes made with `make menuconfig`, execute:
 
 ```
-$ cd buildroot
+$ cd out/buildroot
 $ make savedefconfig
 ```
 
 The changes will be reflected in the `minikube-iso/configs/minikube_defconfig` file.
 
 ```
-$ cd minikube-iso
 $ git stat
 ## master
- M configs/minikube_defconfig
+ M deploy/iso/minikube-iso/configs/minikube_defconfig
 ```
 
 To save any kernel configuration changes made with `make linux-menuconfig`, execute:
 
 ```
-$ cd buildroot
+$ cd out/buildroot
 $ make linux-savedefconfig
 $ cp output/build/linux-4.7.2/defconfig \
-    ../minikube-iso/board/coreos/minikube/linux-4.7_defconfig
+    ../../deploy/iso/minikube-iso/board/coreos/minikube/linux-4.7_defconfig
 ```
 
-The changes will be reflected in the `minikube-iso/configs/minikube_defconfig` file.
+The changes will be reflected in the `deploy/iso/minikube-iso/configs/minikube_defconfig` file.
diff --git a/deploy/iso/minikube-iso/changelog.sh b/deploy/iso/minikube-iso/changelog.sh
deleted file mode 100755
index e7805d981de9..000000000000
--- a/deploy/iso/minikube-iso/changelog.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-#
-# Create a changelog.
-#
-# The env variable RANGE specifies the range of commits to be searched for the changelog.
-# If unset the latest tag until origin/master will be set.
-#
-# The env variable GITHUB_AUTH can be set in the form user:token to specify a GitHub
-# personal access token. Otherwise one could run into GitHub rate limits.
-# Go to https://github.com/settings/tokens to generate a token.
-#
-set -e
-
-jq --version >/dev/null 2>&1 || {
-    echo "could not find jq (JSON command line processor), is it installed?"
-    exit 255
-}
-
-if [ -z "${RANGE}" ]; then
-    LATEST_TAG=$(git describe --abbrev=0)
-    RANGE="${LATEST_TAG}..origin/master"
-fi
-
-if [ ! -z "${GITHUB_AUTH}" ]; then
-    GITHUB_AUTH="-u ${GITHUB_AUTH}"
-fi
-
-for pr in $(git log --pretty=%s --first-parent "${RANGE}" | egrep -o '#\w+' | tr -d '#'); do
-    body=$(curl -s "${GITHUB_AUTH}" https://api.github.com/repos/coreos/minikube-iso/pulls/"${pr}" | \
-                  jq -r '{title: .title, body: .body}')
-
-    echo "-" \
-         "$(echo "${body}" | jq -r .title | sed 's/\.$//g')" \
-         "([#${pr}](https://github.com/coreos/rkt/pull/$pr))." \
-         "$(echo "${body}" | jq -r .body | awk -v RS='\r\n\r\n' NR==1 | tr -d '\r')"
-done
diff --git a/deploy/iso/minikube-iso/code-of-conduct.md b/deploy/iso/minikube-iso/code-of-conduct.md
deleted file mode 100644
index c0c20dd81565..000000000000
--- a/deploy/iso/minikube-iso/code-of-conduct.md
+++ /dev/null
@@ -1,63 +0,0 @@
-## CoreOS Community Code of Conduct
-
-### Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of
-fostering an open and welcoming community, we pledge to respect all people who
-contribute through reporting issues, posting feature requests, updating
-documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free
-experience for everyone, regardless of level of experience, gender, gender
-identity and expression, sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing others' private information, such as physical or electronic addresses, without explicit permission
-* Other unethical or unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct. By adopting this Code of Conduct,
-project maintainers commit themselves to fairly and consistently applying these
-principles to every aspect of managing this project. Project maintainers who do
-not follow or enforce the Code of Conduct may be permanently removed from the
-project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting a project maintainer, Brandon Philips
-<brandon.philips@coreos.com>, and/or Meghan Schofield
-<meghan.schofield@coreos.com>.
-
-This Code of Conduct is adapted from the Contributor Covenant
-(http://contributor-covenant.org), version 1.2.0, available at
-http://contributor-covenant.org/version/1/2/0/
-
-### CoreOS Events Code of Conduct
-
-CoreOS events are working conferences intended for professional networking and
-collaboration in the CoreOS community. Attendees are expected to behave
-according to professional standards and in accordance with their employer’s
-policies on appropriate workplace behavior.
-
-While at CoreOS events or related social networking opportunities, attendees
-should not engage in discriminatory or offensive speech or actions including
-but not limited to gender, sexuality, race, age, disability, or religion.
-Speakers should be especially aware of these concerns.
-
-CoreOS does not condone any statements by speakers contrary to these standards.
-CoreOS reserves the right to deny entrance and/or eject from an event (without
-refund) any individual found to be engaging in discriminatory or offensive
-speech or actions.
-
-Please bring any concerns to the immediate attention of designated on-site
-staff, Brandon Philips <brandon.philips@coreos.com>, and/or Meghan Schofield
-<meghan.schofield@coreos.com>.

From c1783ca733898f6791f95ca9d7334c8cffa86b64 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 14:05:37 +0200
Subject: [PATCH 39/40] boot2docker: move build files into separate directory

---
 deploy/iso/{ => boot2docker}/Dockerfile           | 0
 deploy/iso/{ => boot2docker}/Dockerfile.conntrack | 0
 deploy/iso/{ => boot2docker}/Dockerfile.ethtool   | 0
 deploy/iso/{ => boot2docker}/Dockerfile.socat     | 0
 deploy/iso/{ => boot2docker}/README.md            | 0
 deploy/iso/{ => boot2docker}/bootlocal.sh         | 0
 deploy/iso/{ => boot2docker}/build.sh             | 0
 deploy/iso/{ => boot2docker}/conntrack.sh         | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename deploy/iso/{ => boot2docker}/Dockerfile (100%)
 rename deploy/iso/{ => boot2docker}/Dockerfile.conntrack (100%)
 rename deploy/iso/{ => boot2docker}/Dockerfile.ethtool (100%)
 rename deploy/iso/{ => boot2docker}/Dockerfile.socat (100%)
 rename deploy/iso/{ => boot2docker}/README.md (100%)
 rename deploy/iso/{ => boot2docker}/bootlocal.sh (100%)
 rename deploy/iso/{ => boot2docker}/build.sh (100%)
 rename deploy/iso/{ => boot2docker}/conntrack.sh (100%)

diff --git a/deploy/iso/Dockerfile b/deploy/iso/boot2docker/Dockerfile
similarity index 100%
rename from deploy/iso/Dockerfile
rename to deploy/iso/boot2docker/Dockerfile
diff --git a/deploy/iso/Dockerfile.conntrack b/deploy/iso/boot2docker/Dockerfile.conntrack
similarity index 100%
rename from deploy/iso/Dockerfile.conntrack
rename to deploy/iso/boot2docker/Dockerfile.conntrack
diff --git a/deploy/iso/Dockerfile.ethtool b/deploy/iso/boot2docker/Dockerfile.ethtool
similarity index 100%
rename from deploy/iso/Dockerfile.ethtool
rename to deploy/iso/boot2docker/Dockerfile.ethtool
diff --git a/deploy/iso/Dockerfile.socat b/deploy/iso/boot2docker/Dockerfile.socat
similarity index 100%
rename from deploy/iso/Dockerfile.socat
rename to deploy/iso/boot2docker/Dockerfile.socat
diff --git a/deploy/iso/README.md b/deploy/iso/boot2docker/README.md
similarity index 100%
rename from deploy/iso/README.md
rename to deploy/iso/boot2docker/README.md
diff --git a/deploy/iso/bootlocal.sh b/deploy/iso/boot2docker/bootlocal.sh
similarity index 100%
rename from deploy/iso/bootlocal.sh
rename to deploy/iso/boot2docker/bootlocal.sh
diff --git a/deploy/iso/build.sh b/deploy/iso/boot2docker/build.sh
similarity index 100%
rename from deploy/iso/build.sh
rename to deploy/iso/boot2docker/build.sh
diff --git a/deploy/iso/conntrack.sh b/deploy/iso/boot2docker/conntrack.sh
similarity index 100%
rename from deploy/iso/conntrack.sh
rename to deploy/iso/boot2docker/conntrack.sh

From 528dd36c875a07f06c37eb89188b530eb6d25744 Mon Sep 17 00:00:00 2001
From: Sergiusz Urbaniak <sur@coreos.com>
Date: Thu, 13 Oct 2016 14:06:31 +0200
Subject: [PATCH 40/40] Makefile: add minikube-iso target

---
 Makefile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1e126cd4fe6f..214864730553 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,17 @@ localkube-image: out/localkube
 	make -C deploy/docker VERSION=$(VERSION)
 
 iso:
-	cd deploy/iso && ./build.sh
+	cd deploy/iso/boot2docker && ./build.sh
+
+minikube-iso:
+	[ ! -e $(BUILD_DIR)/buildroot ] && \
+		mkdir -p $(BUILD_DIR) && \
+		git clone https://github.com/buildroot/buildroot $(BUILD_DIR)/buildroot && \
+		cd $(BUILD_DIR)/buildroot && \
+		git checkout 2016.08 && \
+		make BR2_EXTERNAL=../../deploy/iso/minikube-iso minikube_defconfig && \
+		cd ../..
+	cd $(BUILD_DIR)/buildroot && make
 
 .PHONY: integration
 integration: out/minikube