diff --git a/.dockerignore b/.dockerignore index 7d4e8672..f1567f4e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,7 +12,6 @@ tests/integration/.tox */*/*/*.pyc */*/*/__pycache__ .trash-cache -#.dapper vendor/*/*/*/.git tmp docs/_site diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 8596e8fb..00000000 --- a/.drone.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -kind: pipeline -name: default - -platform: - os: linux - arch: amd64 - -steps: -- name: build - pull: default - image: rancher/dapper:1.10.3 - commands: - - KERNEL_CHECK=0 dapper ci - volumes: - - name: socket - path: /var/run/docker.sock - -volumes: -- name: socket - host: - path: /var/run/docker.sock diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index a85db5ce..c213716a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,5 +1,20 @@ -**RancherOS Version: (ros os version)** +**BurmillaOS Version: (ros os version)** -**Where are you running RancherOS? (docker-machine, AWS, GCE, baremetal, etc.)** +**Where are you running BurmillaOS? (docker-machine, AWS, GCE, baremetal, etc.)** +**Which processor architecture you are using?** +**Do you use some extra hardware? (GPU, etc)?** + +**Which console you use (default, ubuntu, centos, etc..)** + +**Do you use some service(s) which are not enabled by default?** + +**Have you installed some extra tools to console?** + +**Do you use some other customizations?** + +**Please share copy of your cloud-init (remember remove all sensitive data first)** +```yaml + +``` diff --git a/.github/workflows/add-platform-specific.yml b/.github/workflows/add-platform-specific.yml new file mode 100644 index 00000000..0dca0a5f --- /dev/null +++ b/.github/workflows/add-platform-specific.yml @@ -0,0 +1,44 @@ +name: add-platform-spefific + +on: + workflow_dispatch: + inputs: + platform: + description: 'Platform' + default: 'vmware' + required: true + +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: '0' + + - name: Install github-release + run: | + wget -O - -o /dev/null https://github.com/github-release/github-release/releases/download/v0.9.0/linux-amd64-github-release.bz2 | bunzip2 | sudo tee /usr/local/bin/github-release + sudo chmod 0755 /usr/local/bin/github-release + + - name: Build OS + run: | + export VERSION=$(git describe --exact-match --tags $(git log -n1 --pretty='%h')) + if [ -z "$VERSION" ]; then + echo "Build is not started from tag. Will exit..." + exit 1 + fi + export ARCH=amd64 + export APPEND_SYSTEM_IMAGES="burmilla/os-debianconsole:$VERSION" + make ${{ github.event.inputs.platform }} + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Publish release + run: ${PWD}/dist/publish.sh + env: + GITHUB_TOKEN: ${{ secrets.OS_RELEASE_TOKEN }} diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml new file mode 100644 index 00000000..c019b32a --- /dev/null +++ b/.github/workflows/create-release.yml @@ -0,0 +1,48 @@ +name: release + +on: + workflow_dispatch: + inputs: + arch: + description: 'Architecture' + default: 'amd64' + required: true + +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: '0' + + - name: Install github-release + run: | + wget -O - -o /dev/null https://github.com/github-release/github-release/releases/download/v0.9.0/linux-amd64-github-release.bz2 | bunzip2 | sudo tee /usr/local/bin/github-release + sudo chmod 0755 /usr/local/bin/github-release + + - name: Build OS + run: | + export VERSION=$(git describe --exact-match --tags $(git log -n1 --pretty='%h')) + if [ -z "$VERSION" ]; then + echo "Build is not started from tag. Will exit..." + exit 1 + fi + export ARCH=${{ github.event.inputs.arch }} + export APPEND_SYSTEM_IMAGES="burmilla/os-debianconsole:$VERSION" + make release + + if [ "$ARCH" == "arm64" ]; then + make rpi64 + fi + + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Publish release + run: ${PWD}/dist/publish.sh + env: + GITHUB_TOKEN: ${{ secrets.OS_RELEASE_TOKEN }} diff --git a/.gitignore b/.gitignore index e79b1e03..428f237d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ __pycache__ /trash.lock .idea .trash-conf +/Dockerfile.dapper* +!/Dockerfile.dapper diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 878e389c..fca252cf 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -42,7 +42,7 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox ENV DAPPER_ENV VERSION DEV_BUILD RUNTEST DEBUG APTPROXY ENGINE_REGISTRY_MIRROR KERNEL_CHECK APPEND_SYSTEM_IMAGES APPEND_USER_IMAGES ENV DAPPER_DOCKER_SOCKET true -ENV DAPPER_SOURCE /go/src/github.com/rancher/os +ENV DAPPER_SOURCE /go/src/github.com/burmilla/os ENV DAPPER_OUTPUT ./bin ./dist ./build/initrd ./build/kernel ENV DAPPER_RUN_ARGS --privileged ENV TRASH_CACHE ${DAPPER_SOURCE}/.trash-cache @@ -54,38 +54,39 @@ ARG DAPPER_HOST_ARCH=amd64 ARG HOST_ARCH=${DAPPER_HOST_ARCH} ARG ARCH=${HOST_ARCH} -ARG OS_REPO=rancher -ARG HOSTNAME_DEFAULT=rancher -ARG DISTRIB_ID=RancherOS +ARG OS_REPO=burmilla +ARG HOSTNAME_DEFAULT=burmilla +ARG DISTRIB_ID=BurmillaOS -ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29 +ARG SELINUX_POLICY_URL=https://github.com/burmilla/refpolicy/releases/download/v0.0.3/policy.29 -ARG KERNEL_VERSION=4.14.176-rancher -ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz -ARG KERNEL_URL_arm64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz +ARG KERNEL_VERSION=4.14.206-burmilla +ARG KERNEL_URL_amd64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-x86.tar.gz +ARG KERNEL_URL_arm64=https://github.com/burmilla/os-kernel/releases/download/v${KERNEL_VERSION}/linux-${KERNEL_VERSION}-arm64.tar.gz ARG BUILD_DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 -ARG BUILD_DOCKER_URL_arm64=https://github.com/rancher/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 +ARG BUILD_DOCKER_URL_arm64=https://github.com/burmilla/docker/releases/download/v1.10.3-ros1/docker-1.10.3_arm64 -ARG OS_RELEASES_YML=https://releases.rancher.com/os +ARG OS_RELEASES_YML=https://raw.githubusercontent.com/burmilla/releases/kernel-4.14.x ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services ARG IMAGE_NAME=${OS_REPO}/os -ARG OS_CONSOLE=default +ARG OS_CONSOLE=debian ARG OS_AUTOFORMAT=false +ARG OS_FIRMWARE=true -ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2018.02.11-1/os-base_amd64.tar.xz -ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2018.02.11-1/os-base_arm64.tar.xz +ARG OS_BASE_URL_amd64=https://github.com/burmilla/os-base/releases/download/v2018.02.11-1/os-base_amd64.tar.xz +ARG OS_BASE_URL_arm64=https://github.com/burmilla/os-base/releases/download/v2018.02.11-1/os-base_arm64.tar.xz -ARG OS_INITRD_BASE_URL_amd64=https://github.com/rancher/os-initrd-base/releases/download/v2018.02.11-1/os-initrd-base-amd64.tar.gz -ARG OS_INITRD_BASE_URL_arm64=https://github.com/rancher/os-initrd-base/releases/download/v2018.02.11-1/os-initrd-base-arm64.tar.gz +ARG OS_INITRD_BASE_URL_amd64=https://github.com/burmilla/os-initrd-base/releases/download/v2018.02.11-1/os-initrd-base-amd64.tar.gz +ARG OS_INITRD_BASE_URL_arm64=https://github.com/burmilla/os-initrd-base/releases/download/v2018.02.11-1/os-initrd-base-arm64.tar.gz ARG SYSTEM_DOCKER_VERSION=17.06-ros6 -ARG SYSTEM_DOCKER_URL_amd64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz -ARG SYSTEM_DOCKER_URL_arm64=https://github.com/rancher/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz +ARG SYSTEM_DOCKER_URL_amd64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz +ARG SYSTEM_DOCKER_URL_arm64=https://github.com/burmilla/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz -ARG USER_DOCKER_VERSION=19.03.8 +ARG USER_DOCKER_VERSION=19.03.13 ARG USER_DOCKER_ENGINE_VERSION=docker-${USER_DOCKER_VERSION} ARG AZURE_SERVICE=false @@ -123,6 +124,7 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \ OS_SERVICES_REPO=${OS_SERVICES_REPO} \ OS_CONSOLE=${OS_CONSOLE} \ OS_AUTOFORMAT=${OS_AUTOFORMAT} \ + OS_FIRMWARE=${OS_FIRMWARE} \ REPO_VERSION=master \ SELINUX_POLICY_URL=${SELINUX_POLICY_URL} \ SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \ @@ -148,7 +150,7 @@ RUN curl -pfL ${SELINUX_POLICY_URL} > ${DOWNLOADS}/$(basename ${SELINUX_POLICY_U # Install Go RUN wget -O - https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz | tar -xzf - -C /usr/local && \ - go get github.com/rancher/trash + go get github.com/burmilla/trash RUN mkdir -p ${GOPATH}/src/golang.org/x && cd ${GOPATH}/src/golang.org/x/ && git clone https://github.com/golang/tools && \ cd tools && git checkout 6adeb8aab2ded9eb693b831d5fd090c10a6ebdfa -b temp && go get golang.org/x/lint/golint diff --git a/Makefile b/Makefile index 14e299e6..0b11f27d 100755 --- a/Makefile +++ b/Makefile @@ -48,36 +48,35 @@ rpi64: .dapper vmware: .dapper mkdir -p dist - APPEND_SYSTEM_IMAGES="rancher/os-openvmtools:10.3.10-2" \ + OS_FIRMWARE="false" \ + APPEND_SYSTEM_IMAGES="$(APPEND_SYSTEM_IMAGES) burmilla/os-openvmtools:11.2.0-1" \ ./.dapper release-vmware hyperv: .dapper mkdir -p dist - APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.138-rancher-1" \ + OS_FIRMWARE="false" \ + APPEND_SYSTEM_IMAGES="$(APPEND_SYSTEM_IMAGES) burmilla/os-hypervvmtools:v4.14.206-burmilla-1" \ ./.dapper release-hyperv azurebase: .dapper mkdir -p dist AZURE_SERVICE="true" \ - APPEND_SYSTEM_IMAGES="rancher/os-hypervvmtools:v4.14.138-rancher-1 rancher/os-waagent:v2.2.34-1" \ + OS_FIRMWARE="false" \ + APPEND_SYSTEM_IMAGES="$(APPEND_SYSTEM_IMAGES) burmilla/os-hypervvmtools:v4.14.206-burmilla-1 burmilla/os-waagent:v2.2.49.2-1" \ ./.dapper release-azurebase 4glte: .dapper mkdir -p dist - APPEND_SYSTEM_IMAGES="rancher/os-modemmanager:v1.6.4-1" \ + APPEND_SYSTEM_IMAGES="$(APPEND_SYSTEM_IMAGES) burmilla/os-modemmanager:v1.6.4-1" \ ./.dapper release-4glte proxmoxve: .dapper mkdir -p dist PROXMOXVE_SERVICE="true" \ - APPEND_SYSTEM_IMAGES="rancher/os-qemuguestagent:v2.8.1-2" \ + OS_FIRMWARE="false" \ + APPEND_SYSTEM_IMAGES="$(APPEND_SYSTEM_IMAGES) burmilla/os-qemuguestagent:v3.1.0-1" \ ./.dapper release-proxmoxve -pingan: .dapper - mkdir -p dist - APPEND_SYSTEM_IMAGES="cnrancher/os-pingan-amc:v0.0.6-1" \ - ./.dapper release-pingan - help: @./scripts/help diff --git a/README.md b/README.md index 67ef7897..19f0e483 100644 --- a/README.md +++ b/README.md @@ -1,123 +1,34 @@ -# RancherOS +# BurmillaOS -[![Build Status](https://drone-pr.rancher.io/api/badges/rancher/os/status.svg?branch=master)](https://drone-pr.rancher.io/rancher/os) -[![Docker Pulls](https://img.shields.io/docker/pulls/rancher/os.svg)](https://store.docker.com/community/images/rancher/os) -[![Go Report Card](https://goreportcard.com/badge/github.com/rancher/os)](https://goreportcard.com/badge/github.com/rancher/os) +BurmillaOS is successor of [RancherOS](//github.com/rancher/os) which reached end of life. -The smallest, easiest way to run Docker in production at scale. Everything in RancherOS is a container managed by Docker. This includes system services such as udev and rsyslog. RancherOS includes only the bare minimum amount of software needed to run Docker. This keeps the binary download of RancherOS very small. Everything else can be pulled in dynamically through Docker. +![GitHub release](https://img.shields.io/github/v/release/burmilla/os.svg) +[![Docker Pulls](https://img.shields.io/docker/pulls/burmilla/os.svg)](https://store.docker.com/community/images/burmilla/os) +[![Go Report Card](https://goreportcard.com/badge/github.com/burmilla/os)](https://goreportcard.com/badge/github.com/burmilla/os) + +The smallest, easiest way to run Docker in production at scale. Everything in BurmillaOS is a container managed by Docker. This includes system services such as udev and rsyslog. BurmillaOS includes only the bare minimum amount of software needed to run Docker. This keeps the binary download of BurmillaOS very small. Everything else can be pulled in dynamically through Docker. ## How this works -Everything in RancherOS is a Docker container. We accomplish this by launching two instances of +Everything in BurmillaOS is a Docker container. We accomplish this by launching two instances of Docker. One is what we call the system Docker which runs as the first process. System Docker then launches a container that runs the user Docker. The user Docker is then the instance that gets primarily used to create containers. We created this separation because it seemed logical and also it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and deleted the entire OS. -![How it works](./rancheros.png "How it works") +![How it works](./howitworks.png "How it works") -## Release +## Documentation for BurmillaOS -- **v1.5.6 - Docker 19.03.11 - Linux 4.14.138** +Please refer to our [BurmillaOS Documentation](https://burmilla.github.io) website to read all about BurmillaOS. It has detailed information on how BurmillaOS works, getting-started and other details. -### ISO - -- https://releases.rancher.com/os/v1.5.6/rancheros.iso -- https://releases.rancher.com/os/v1.5.6/hyperv/rancheros.iso -- https://releases.rancher.com/os/v1.5.6/4glte/rancheros.iso -- https://releases.rancher.com/os/v1.5.6/vmware/rancheros.iso - -#### Special docker-machine Links - -- https://releases.rancher.com/os/v1.5.6/vmware/rancheros-autoformat.iso -- https://releases.rancher.com/os/v1.5.6/proxmoxve/rancheros-autoformat.iso - -### Additional Downloads - -#### AMD64 Links - -* https://releases.rancher.com/os/v1.5.6/initrd -* https://releases.rancher.com/os/v1.5.6/vmlinuz -* https://releases.rancher.com/os/v1.5.6/rancheros.ipxe -* https://releases.rancher.com/os/v1.5.6/rootfs.tar.gz - -#### Cloud Links - -* https://releases.rancher.com/os/v1.5.6/rancheros-gce.tar.gz - -#### VMware Links - -* https://releases.rancher.com/os/v1.5.6/vmware/initrd -* https://releases.rancher.com/os/v1.5.6/vmware/rancheros.vmdk -* https://releases.rancher.com/os/v1.5.6/vmware/rootfs.tar.gz - -#### Hyper-V Links - -* https://releases.rancher.com/os/v1.5.6/hyperv/initrd -* https://releases.rancher.com/os/v1.5.6/hyperv/rootfs.tar.gz - -#### Proxmox VE Links - -* https://releases.rancher.com/os/v1.5.6/proxmoxve/initrd -* https://releases.rancher.com/os/v1.5.6/proxmoxve/rootfs.tar.gz - -#### 4G-LTE Links - -* https://releases.rancher.com/os/v1.5.6/4glte/initrd -* https://releases.rancher.com/os/v1.5.6/4glte/rootfs.tar.gz - -**Note**: -1. you can use `http` instead of `https` in the above URLs, e.g. for iPXE. -2. you can use `latest` instead of `v1.5.6` in the above URLs if you want to get the latest version. - -### Amazon - -SSH keys are added to the **`rancher`** user, so you must log in using the **rancher** user. - -**HVM** - -Region | Type | AMI --------|------|------ -eu-north-1 | HVM | [ami-0b28754e9e36e8e07](https://eu-north-1.console.aws.amazon.com/ec2/home?region=eu-north-1#launchInstanceWizard:ami=ami-0b28754e9e36e8e07) -ap-south-1 | HVM | [ami-0a8d6fd80f6647904](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-0a8d6fd80f6647904) -eu-west-3 | HVM | [ami-0a20d2e00be3ce551](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-0a20d2e00be3ce551) -eu-west-2 | HVM | [ami-00d503d7ef22da04a](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-00d503d7ef22da04a) -eu-west-1 | HVM | [ami-01e9e007e7af05e9f](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-01e9e007e7af05e9f) -ap-northeast-2 | HVM | [ami-0798c48ba8aad886b](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-0798c48ba8aad886b) -ap-northeast-1 | HVM | [ami-0a251d44dc78b0f2f](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-0a251d44dc78b0f2f) -sa-east-1 | HVM | [ami-0726b3d19b7868934](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-0726b3d19b7868934) -ca-central-1 | HVM | [ami-0eccf03e8527335c9](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-0eccf03e8527335c9) -ap-southeast-1 | HVM | [ami-0782dcdedcc2aaa11](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-0782dcdedcc2aaa11) -ap-southeast-2 | HVM | [ami-03f9ce52431a00706](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-03f9ce52431a00706) -eu-central-1 | HVM | [ami-0b63175a9bbbcda85](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-0b63175a9bbbcda85) -us-east-1 | HVM | [ami-0e8a3347e4c5959bd](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-0e8a3347e4c5959bd) -us-east-2 | HVM | [ami-08faee1387289d316](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-08faee1387289d316) -us-west-1 | HVM | [ami-030a2ddc7ac6017e4](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-030a2ddc7ac6017e4) -us-west-2 | HVM | [ami-0fb650eb46d1c240f](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-0fb650eb46d1c240f) - -Additionally, images are available with support for Amazon EC2 Container Service (ECS) [here](https://rancher.com/docs/os/v1.x/en/installation/amazon-ecs/#amazon-ecs-enabled-amis). - -### Azure - -You can get RancherOS in the [Azure Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/rancher.rancheros), currently only the `rancher` user can be logged in through SSH keys. - -## Documentation for RancherOS - -Please refer to our [RancherOS Documentation](https://rancher.com/docs/os/v1.x/en/) website to read all about RancherOS. It has detailed information on how RancherOS works, getting-started and other details. - -## Support, Discussion, and Community -If you need any help with RancherOS or Rancher, please join us at either our [Rancher forums](http://forums.rancher.com) or [#rancher IRC channel](http://webchat.freenode.net/?channels=rancher) where most of our team hangs out at. - -For security issues, please email security@rancher.com instead of posting a public issue in GitHub. You may (but are not required to) use the GPG key located on [Keybase](https://keybase.io/rancher). - - -Please submit any **RancherOS** bugs, issues, and feature requests to [rancher/os](//github.com/rancher/os/issues). - -Please submit any **Rancher** bugs, issues, and feature requests to [rancher/rancher](//github.com/rancher/rancher/issues). +Please submit any **BurmillaOS** bugs, issues, and feature requests to [burmilla/os](//github.com/burmilla/os/issues). ## License -Copyright (c) 2014-2019 [Rancher Labs, Inc.](http://rancher.com) +Copyright (c) 2020 Project Burmilla + +Copyright (c) 2014-2020 [Rancher Labs, Inc.](http://rancher.com) Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/cmd/cloudinitexecute/authorize_ssh_keys.go b/cmd/cloudinitexecute/authorize_ssh_keys.go index 22842f7f..494a7865 100644 --- a/cmd/cloudinitexecute/authorize_ssh_keys.go +++ b/cmd/cloudinitexecute/authorize_ssh_keys.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) const ( diff --git a/cmd/cloudinitexecute/cloudinitexecute.go b/cmd/cloudinitexecute/cloudinitexecute.go index c1dd27f2..a6afbfb1 100644 --- a/cmd/cloudinitexecute/cloudinitexecute.go +++ b/cmd/cloudinitexecute/cloudinitexecute.go @@ -9,12 +9,12 @@ import ( "path" "strings" - rancherConfig "github.com/rancher/os/config" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/cloudinit/system" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + rancherConfig "github.com/burmilla/os/config" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/system" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "golang.org/x/net/context" ) diff --git a/cmd/cloudinitsave/cloudinitsave.go b/cmd/cloudinitsave/cloudinitsave.go index cb653ef9..c449065c 100644 --- a/cmd/cloudinitsave/cloudinitsave.go +++ b/cmd/cloudinitsave/cloudinitsave.go @@ -24,30 +24,30 @@ import ( "sync" "time" - "github.com/rancher/os/cmd/control" - "github.com/rancher/os/cmd/network" - rancherConfig "github.com/rancher/os/config" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/configdrive" - "github.com/rancher/os/config/cloudinit/datasource/file" - "github.com/rancher/os/config/cloudinit/datasource/metadata/aliyun" - "github.com/rancher/os/config/cloudinit/datasource/metadata/azure" - "github.com/rancher/os/config/cloudinit/datasource/metadata/cloudstack" - "github.com/rancher/os/config/cloudinit/datasource/metadata/digitalocean" - "github.com/rancher/os/config/cloudinit/datasource/metadata/ec2" - "github.com/rancher/os/config/cloudinit/datasource/metadata/exoscale" - "github.com/rancher/os/config/cloudinit/datasource/metadata/gce" - "github.com/rancher/os/config/cloudinit/datasource/metadata/packet" - "github.com/rancher/os/config/cloudinit/datasource/proccmdline" - "github.com/rancher/os/config/cloudinit/datasource/proxmox" - "github.com/rancher/os/config/cloudinit/datasource/tftp" - "github.com/rancher/os/config/cloudinit/datasource/url" - "github.com/rancher/os/config/cloudinit/datasource/vmware" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/cmd/control" + "github.com/burmilla/os/cmd/network" + rancherConfig "github.com/burmilla/os/config" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/configdrive" + "github.com/burmilla/os/config/cloudinit/datasource/file" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/aliyun" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/azure" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/cloudstack" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/digitalocean" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/ec2" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/exoscale" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/gce" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/packet" + "github.com/burmilla/os/config/cloudinit/datasource/proccmdline" + "github.com/burmilla/os/config/cloudinit/datasource/proxmox" + "github.com/burmilla/os/config/cloudinit/datasource/tftp" + "github.com/burmilla/os/config/cloudinit/datasource/url" + "github.com/burmilla/os/config/cloudinit/datasource/vmware" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" ) diff --git a/cmd/control/autologin.go b/cmd/control/autologin.go index 84ca7711..ad95c83e 100644 --- a/cmd/control/autologin.go +++ b/cmd/control/autologin.go @@ -8,8 +8,8 @@ import ( "runtime" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" ) @@ -57,7 +57,7 @@ func autologinAction(c *cli.Context) error { // replace \n and \l banner := config.Banner banner = strings.Replace(banner, "\\v", config.Version, -1) - banner = strings.Replace(banner, "\\s", "RancherOS "+runtime.GOARCH, -1) + banner = strings.Replace(banner, "\\s", "BurmillaOS "+runtime.GOARCH, -1) banner = strings.Replace(banner, "\\r", config.GetKernelVersion(), -1) banner = strings.Replace(banner, "\\n", cfg.Hostname, -1) banner = strings.Replace(banner, "\\l", tty, -1) diff --git a/cmd/control/bootstrap.go b/cmd/control/bootstrap.go index eb19880e..0a4817ef 100644 --- a/cmd/control/bootstrap.go +++ b/cmd/control/bootstrap.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) func BootstrapMain() { diff --git a/cmd/control/cli.go b/cmd/control/cli.go index 3b15edf5..0cf49bab 100644 --- a/cmd/control/cli.go +++ b/cmd/control/cli.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - "github.com/rancher/os/cmd/control/service" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/cmd/control/service" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" ) @@ -21,7 +21,7 @@ func Main() { app := cli.NewApp() app.Name = os.Args[0] - app.Usage = fmt.Sprintf("Control and configure RancherOS\nbuilt: %s", config.BuildDate) + app.Usage = fmt.Sprintf("Control and configure BurmillaOS\nbuilt: %s", config.BuildDate) app.Version = config.Version app.Author = "Rancher Labs, Inc." app.EnableBashCompletion = true diff --git a/cmd/control/config.go b/cmd/control/config.go index db3c1b9b..2277a4a0 100644 --- a/cmd/control/config.go +++ b/cmd/control/config.go @@ -12,9 +12,9 @@ import ( "strings" "text/template" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" "github.com/codegangsta/cli" diff --git a/cmd/control/console.go b/cmd/control/console.go index 7e4a2afb..4cf79f65 100644 --- a/cmd/control/console.go +++ b/cmd/control/console.go @@ -5,13 +5,13 @@ import ( "sort" "strings" - "github.com/rancher/os/cmd/control/service" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/cmd/control/service" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" + "github.com/burmilla/os/pkg/util/network" "github.com/codegangsta/cli" "github.com/docker/docker/reference" diff --git a/cmd/control/console_init.go b/cmd/control/console_init.go index e2b1b783..a7cc0578 100644 --- a/cmd/control/console_init.go +++ b/cmd/control/console_init.go @@ -12,12 +12,12 @@ import ( "syscall" "text/template" - "github.com/rancher/os/cmd/cloudinitexecute" - "github.com/rancher/os/config" - "github.com/rancher/os/config/cmdline" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/cmd/cloudinitexecute" + "github.com/burmilla/os/config" + "github.com/burmilla/os/config/cmdline" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" "golang.org/x/crypto/ssh/terminal" diff --git a/cmd/control/dev.go b/cmd/control/dev.go index c1dd4037..a3ae5874 100644 --- a/cmd/control/dev.go +++ b/cmd/control/dev.go @@ -3,7 +3,7 @@ package control import ( "fmt" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" ) diff --git a/cmd/control/docker_init.go b/cmd/control/docker_init.go index 5c6b13a4..0ad41c78 100644 --- a/cmd/control/docker_init.go +++ b/cmd/control/docker_init.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" ) diff --git a/cmd/control/engine.go b/cmd/control/engine.go index 169d0dcc..fc688bbf 100644 --- a/cmd/control/engine.go +++ b/cmd/control/engine.go @@ -10,15 +10,15 @@ import ( "strconv" "strings" - "github.com/rancher/os/cmd/control/service" - "github.com/rancher/os/cmd/control/service/app" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" - "github.com/rancher/os/pkg/util/network" - "github.com/rancher/os/pkg/util/versions" + "github.com/burmilla/os/cmd/control/service" + "github.com/burmilla/os/cmd/control/service/app" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" + "github.com/burmilla/os/pkg/util/network" + "github.com/burmilla/os/pkg/util/versions" yaml "github.com/cloudfoundry-incubator/candiedyaml" "github.com/codegangsta/cli" diff --git a/cmd/control/entrypoint.go b/cmd/control/entrypoint.go index 8710db9f..83cb315d 100644 --- a/cmd/control/entrypoint.go +++ b/cmd/control/entrypoint.go @@ -5,11 +5,11 @@ import ( "os/exec" "syscall" - "github.com/rancher/os/cmd/cloudinitexecute" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/cmd/cloudinitexecute" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" "golang.org/x/net/context" diff --git a/cmd/control/env.go b/cmd/control/env.go index 70350a78..1fa39f2c 100644 --- a/cmd/control/env.go +++ b/cmd/control/env.go @@ -6,8 +6,8 @@ import ( "os/exec" "syscall" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" ) diff --git a/cmd/control/install.go b/cmd/control/install.go index 8931961c..bb4bf900 100644 --- a/cmd/control/install.go +++ b/cmd/control/install.go @@ -13,12 +13,12 @@ import ( "runtime" "strings" - "github.com/rancher/os/cmd/control/install" - "github.com/rancher/os/cmd/power" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/dfs" // TODO: move CopyFile into util or something. - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/cmd/control/install" + "github.com/burmilla/os/cmd/power" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/dfs" // TODO: move CopyFile into util or something. + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" "github.com/pkg/errors" @@ -26,7 +26,7 @@ import ( var installCommand = cli.Command{ Name: "install", - Usage: "install RancherOS to disk", + Usage: "install BurmillaOS to disk", HideHelp: true, Action: installAction, Flags: []cli.Flag{ @@ -38,9 +38,9 @@ var installCommand = cli.Command{ }, cli.StringFlag{ Name: "install-type, t", - Usage: `generic: (Default) Creates 1 ext4 partition and installs RancherOS (syslinux) - amazon-ebs: Installs RancherOS and sets up PV-GRUB - gptsyslinux: partition and format disk (gpt), then install RancherOS and setup Syslinux + Usage: `generic: (Default) Creates 1 ext4 partition and installs BurmillaOS (syslinux) + amazon-ebs: Installs BurmillaOS and sets up PV-GRUB + gptsyslinux: partition and format disk (gpt), then install BurmillaOS and setup Syslinux `, }, cli.StringFlag{ @@ -553,7 +553,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap Timeout: 0, Fallback: 0, // need to be conditional on there being a 'rollback'? Entries: []install.MenuEntry{ - install.MenuEntry{"RancherOS-current", config.BootDir, VERSION, kernelArgs, kappend}, + install.MenuEntry{"BurmillaOS-current", config.BootDir, VERSION, kernelArgs, kappend}, }, } install.PvGrubConfig(menu) @@ -859,9 +859,9 @@ func upgradeBootloader(device, baseName, diskType string) error { log.Infof("error read(%s / syslinux.cfg): %s", backupSyslinuxDir, err) } else { cfg := string(oldSyslinux) - //DEFAULT RancherOS-current + //DEFAULT BurmillaOS-current // - //LABEL RancherOS-current + //LABEL BurmillaOS-current // LINUX ../vmlinuz-v0.7.1-rancheros // APPEND rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait console=tty0 rancher.password=rancher // INITRD ../initrd-v0.7.1-rancheros diff --git a/cmd/control/install/grub.go b/cmd/control/install/grub.go index e6c9152e..11f8120b 100644 --- a/cmd/control/install/grub.go +++ b/cmd/control/install/grub.go @@ -6,7 +6,7 @@ import ( "os/exec" "path/filepath" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" ) func RunGrub(baseName, device string) error { @@ -63,7 +63,7 @@ func PvGrubConfig(menu BootVars) error { log.Debugf("pvGrubConfig") filetmpl, err := template.New("grublst").Parse(`{{define "grubmenu"}} -title RancherOS {{.Version}}-({{.Name}}) +title BurmillaOS {{.Version}}-({{.Name}}) root (hd0) kernel /${bootDir}vmlinuz-{{.Version}}-rancheros {{.KernelArgs}} {{.Append}} initrd /${bootDir}initrd-{{.Version}}-rancheros diff --git a/cmd/control/install/install.go b/cmd/control/install/install.go index efa8d9ed..fc45958f 100644 --- a/cmd/control/install/install.go +++ b/cmd/control/install/install.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) type MenuEntry struct { diff --git a/cmd/control/install/service.go b/cmd/control/install/service.go index e7e25af2..aa40b2ef 100644 --- a/cmd/control/install/service.go +++ b/cmd/control/install/service.go @@ -5,10 +5,10 @@ import ( "os" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" + "github.com/burmilla/os/pkg/util/network" yaml "github.com/cloudfoundry-incubator/candiedyaml" ) diff --git a/cmd/control/install/syslinux.go b/cmd/control/install/syslinux.go index ca15acf6..3ab465f2 100644 --- a/cmd/control/install/syslinux.go +++ b/cmd/control/install/syslinux.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" ) func syslinuxConfig(menu BootVars) error { @@ -22,7 +22,7 @@ LABEL {{.Name}} INITRD ../initrd-{{.Version}}-rancheros {{end}} TIMEOUT 20 #2 seconds -DEFAULT RancherOS-current +DEFAULT BurmillaOS-current {{- range .Entries}} {{template "syslinuxmenu" .}} diff --git a/cmd/control/os.go b/cmd/control/os.go index 1b570611..f720dced 100644 --- a/cmd/control/os.go +++ b/cmd/control/os.go @@ -8,13 +8,13 @@ import ( "runtime" "strings" - "github.com/rancher/os/cmd/power" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/cmd/power" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" + "github.com/burmilla/os/pkg/util/network" yaml "github.com/cloudfoundry-incubator/candiedyaml" "github.com/codegangsta/cli" diff --git a/cmd/control/preload.go b/cmd/control/preload.go index ac4992de..b16d1076 100644 --- a/cmd/control/preload.go +++ b/cmd/control/preload.go @@ -11,9 +11,9 @@ import ( "regexp" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" dockerClient "github.com/docker/engine-api/client" diff --git a/cmd/control/recovery_init.go b/cmd/control/recovery_init.go index 659e2cc9..c205ae21 100644 --- a/cmd/control/recovery_init.go +++ b/cmd/control/recovery_init.go @@ -5,7 +5,7 @@ import ( "os/exec" "syscall" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" ) diff --git a/cmd/control/selinux.go b/cmd/control/selinux.go index d1d79916..b3aa4130 100644 --- a/cmd/control/selinux.go +++ b/cmd/control/selinux.go @@ -4,7 +4,7 @@ import ( "fmt" "syscall" - "github.com/rancher/os/config" + "github.com/burmilla/os/config" "github.com/codegangsta/cli" ) diff --git a/cmd/control/service/app/app.go b/cmd/control/service/app/app.go index e0815c09..2b05b0cf 100644 --- a/cmd/control/service/app/app.go +++ b/cmd/control/service/app/app.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" "github.com/docker/libcompose/project" diff --git a/cmd/control/service/command/command.go b/cmd/control/service/command/command.go index 6f661074..0c77f449 100644 --- a/cmd/control/service/command/command.go +++ b/cmd/control/service/command/command.go @@ -3,7 +3,7 @@ package command import ( "errors" - "github.com/rancher/os/cmd/control/service/app" + "github.com/burmilla/os/cmd/control/service/app" "github.com/codegangsta/cli" composeApp "github.com/docker/libcompose/cli/app" diff --git a/cmd/control/service/service.go b/cmd/control/service/service.go index c021b37f..51259cd2 100644 --- a/cmd/control/service/service.go +++ b/cmd/control/service/service.go @@ -4,12 +4,12 @@ import ( "fmt" "strings" - "github.com/rancher/os/cmd/control/service/command" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/cmd/control/service/command" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" + "github.com/burmilla/os/pkg/util/network" "github.com/codegangsta/cli" dockerApp "github.com/docker/libcompose/cli/docker/app" diff --git a/cmd/control/switch_console.go b/cmd/control/switch_console.go index 4c69feaa..57c2c49d 100644 --- a/cmd/control/switch_console.go +++ b/cmd/control/switch_console.go @@ -3,9 +3,9 @@ package control import ( "errors" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" "github.com/docker/libcompose/project/options" diff --git a/cmd/control/tlsconf.go b/cmd/control/tlsconf.go index 6fa7ac02..9f71896f 100644 --- a/cmd/control/tlsconf.go +++ b/cmd/control/tlsconf.go @@ -5,9 +5,9 @@ import ( "os" "path/filepath" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" machineUtil "github.com/docker/machine/utils" diff --git a/cmd/control/udevsettle.go b/cmd/control/udevsettle.go index 8ee3cf3b..ce93a9e3 100644 --- a/cmd/control/udevsettle.go +++ b/cmd/control/udevsettle.go @@ -6,8 +6,8 @@ import ( "os/exec" "path/filepath" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" ) diff --git a/cmd/control/user_docker.go b/cmd/control/user_docker.go index d7ecf7ec..03f320ca 100644 --- a/cmd/control/user_docker.go +++ b/cmd/control/user_docker.go @@ -9,11 +9,11 @@ import ( "syscall" "time" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - rosDocker "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + rosDocker "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/codegangsta/cli" composeClient "github.com/docker/libcompose/docker/client" diff --git a/cmd/control/util.go b/cmd/control/util.go index db23dab3..e899dd99 100644 --- a/cmd/control/util.go +++ b/cmd/control/util.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/pkg/errors" ) diff --git a/cmd/init/init.go b/cmd/init/init.go index dad71e25..7e4fe4a2 100644 --- a/cmd/init/init.go +++ b/cmd/init/init.go @@ -5,25 +5,25 @@ package init import ( "fmt" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/dfs" - "github.com/rancher/os/pkg/init/b2d" - "github.com/rancher/os/pkg/init/cloudinit" - "github.com/rancher/os/pkg/init/configfiles" - "github.com/rancher/os/pkg/init/debug" - "github.com/rancher/os/pkg/init/docker" - "github.com/rancher/os/pkg/init/env" - "github.com/rancher/os/pkg/init/fsmount" - "github.com/rancher/os/pkg/init/hypervisor" - "github.com/rancher/os/pkg/init/modules" - "github.com/rancher/os/pkg/init/one" - "github.com/rancher/os/pkg/init/prepare" - "github.com/rancher/os/pkg/init/recovery" - "github.com/rancher/os/pkg/init/selinux" - "github.com/rancher/os/pkg/init/sharedroot" - "github.com/rancher/os/pkg/init/switchroot" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/sysinit" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/dfs" + "github.com/burmilla/os/pkg/init/b2d" + "github.com/burmilla/os/pkg/init/cloudinit" + "github.com/burmilla/os/pkg/init/configfiles" + "github.com/burmilla/os/pkg/init/debug" + "github.com/burmilla/os/pkg/init/docker" + "github.com/burmilla/os/pkg/init/env" + "github.com/burmilla/os/pkg/init/fsmount" + "github.com/burmilla/os/pkg/init/hypervisor" + "github.com/burmilla/os/pkg/init/modules" + "github.com/burmilla/os/pkg/init/one" + "github.com/burmilla/os/pkg/init/prepare" + "github.com/burmilla/os/pkg/init/recovery" + "github.com/burmilla/os/pkg/init/selinux" + "github.com/burmilla/os/pkg/init/sharedroot" + "github.com/burmilla/os/pkg/init/switchroot" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/sysinit" ) func MainInit() { diff --git a/cmd/network/network.go b/cmd/network/network.go index f4d637fd..010771b5 100644 --- a/cmd/network/network.go +++ b/cmd/network/network.go @@ -10,11 +10,11 @@ import ( "syscall" "text/template" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/hostname" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/hostname" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" "github.com/docker/libnetwork/resolvconf" "golang.org/x/net/context" diff --git a/cmd/power/power.go b/cmd/power/power.go index 780ab244..77e1595d 100644 --- a/cmd/power/power.go +++ b/cmd/power/power.go @@ -10,11 +10,11 @@ import ( "syscall" "time" - "github.com/rancher/os/cmd/control/install" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/cmd/control/install" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/docker/engine-api/types" "github.com/docker/engine-api/types/container" diff --git a/cmd/power/shutdown.go b/cmd/power/shutdown.go index 8a6b7959..457e2e3e 100644 --- a/cmd/power/shutdown.go +++ b/cmd/power/shutdown.go @@ -7,9 +7,9 @@ import ( "path/filepath" "syscall" - "github.com/rancher/os/cmd/control/install" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/cmd/control/install" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" ) diff --git a/cmd/respawn/respawn.go b/cmd/respawn/respawn.go index e1b909f7..5131aa2a 100644 --- a/cmd/respawn/respawn.go +++ b/cmd/respawn/respawn.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/codegangsta/cli" ) diff --git a/cmd/sysinit/sysinit.go b/cmd/sysinit/sysinit.go index 0489a44a..00998563 100644 --- a/cmd/sysinit/sysinit.go +++ b/cmd/sysinit/sysinit.go @@ -4,8 +4,8 @@ import ( "io/ioutil" "os" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/sysinit" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/sysinit" ) func Main() { diff --git a/cmd/wait/wait.go b/cmd/wait/wait.go index 9e2fcbe9..790beac5 100644 --- a/cmd/wait/wait.go +++ b/cmd/wait/wait.go @@ -3,9 +3,9 @@ package wait import ( "os" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" ) func Main() { diff --git a/config/cloudinit/config/validate/rules.go b/config/cloudinit/config/validate/rules.go index 952bf203..1f4f6c5a 100644 --- a/config/cloudinit/config/validate/rules.go +++ b/config/cloudinit/config/validate/rules.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) type rule func(config Node, report *Report) diff --git a/config/cloudinit/config/validate/validate.go b/config/cloudinit/config/validate/validate.go index 5b074dda..9028bc41 100644 --- a/config/cloudinit/config/validate/validate.go +++ b/config/cloudinit/config/validate/validate.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" "github.com/coreos/yaml" ) diff --git a/config/cloudinit/datasource/configdrive/configdrive.go b/config/cloudinit/datasource/configdrive/configdrive.go index 15a37be5..58e6556f 100644 --- a/config/cloudinit/datasource/configdrive/configdrive.go +++ b/config/cloudinit/datasource/configdrive/configdrive.go @@ -22,9 +22,9 @@ import ( "path" "syscall" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/docker/docker/pkg/mount" ) diff --git a/config/cloudinit/datasource/configdrive/configdrive_test.go b/config/cloudinit/datasource/configdrive/configdrive_test.go index 9b66b522..48f76834 100644 --- a/config/cloudinit/datasource/configdrive/configdrive_test.go +++ b/config/cloudinit/datasource/configdrive/configdrive_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/test" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/test" ) func TestFetchMetadata(t *testing.T) { diff --git a/config/cloudinit/datasource/datasource.go b/config/cloudinit/datasource/datasource.go index f21a8dd0..cf52ac73 100644 --- a/config/cloudinit/datasource/datasource.go +++ b/config/cloudinit/datasource/datasource.go @@ -17,7 +17,7 @@ package datasource import ( "net" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/pkg/netconf" ) type Datasource interface { diff --git a/config/cloudinit/datasource/file/file.go b/config/cloudinit/datasource/file/file.go index 43d8aa38..8ed85486 100644 --- a/config/cloudinit/datasource/file/file.go +++ b/config/cloudinit/datasource/file/file.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "os" - "github.com/rancher/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource" ) type LocalFile struct { diff --git a/config/cloudinit/datasource/metadata/aliyun/metadata.go b/config/cloudinit/datasource/metadata/aliyun/metadata.go index e01f1c9a..05792516 100644 --- a/config/cloudinit/datasource/metadata/aliyun/metadata.go +++ b/config/cloudinit/datasource/metadata/aliyun/metadata.go @@ -5,9 +5,9 @@ import ( "log" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/pkg/netconf" ) const ( diff --git a/config/cloudinit/datasource/metadata/aliyun/metadata_test.go b/config/cloudinit/datasource/metadata/aliyun/metadata_test.go index 1d9b2bb0..87dea065 100644 --- a/config/cloudinit/datasource/metadata/aliyun/metadata_test.go +++ b/config/cloudinit/datasource/metadata/aliyun/metadata_test.go @@ -5,10 +5,10 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/azure/metadata.go b/config/cloudinit/datasource/metadata/azure/metadata.go index 1d14b9aa..a34ddb5e 100644 --- a/config/cloudinit/datasource/metadata/azure/metadata.go +++ b/config/cloudinit/datasource/metadata/azure/metadata.go @@ -6,9 +6,9 @@ import ( "net/http" "strconv" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" ) const ( diff --git a/config/cloudinit/datasource/metadata/azure/metadata_test.go b/config/cloudinit/datasource/metadata/azure/metadata_test.go index e9c5f143..993f5b8d 100644 --- a/config/cloudinit/datasource/metadata/azure/metadata_test.go +++ b/config/cloudinit/datasource/metadata/azure/metadata_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/cloudstack/metadata.go b/config/cloudinit/datasource/metadata/cloudstack/metadata.go index 2e61a314..e682adeb 100644 --- a/config/cloudinit/datasource/metadata/cloudstack/metadata.go +++ b/config/cloudinit/datasource/metadata/cloudstack/metadata.go @@ -19,11 +19,11 @@ import ( "strconv" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" ) const ( diff --git a/config/cloudinit/datasource/metadata/cloudstack/metadata_test.go b/config/cloudinit/datasource/metadata/cloudstack/metadata_test.go index 3729da98..ada59151 100644 --- a/config/cloudinit/datasource/metadata/cloudstack/metadata_test.go +++ b/config/cloudinit/datasource/metadata/cloudstack/metadata_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/digitalocean/metadata.go b/config/cloudinit/datasource/metadata/digitalocean/metadata.go index ef47630a..7b80f8ab 100644 --- a/config/cloudinit/datasource/metadata/digitalocean/metadata.go +++ b/config/cloudinit/datasource/metadata/digitalocean/metadata.go @@ -20,9 +20,9 @@ import ( "net" "strconv" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/pkg/netconf" ) const ( diff --git a/config/cloudinit/datasource/metadata/digitalocean/metadata_test.go b/config/cloudinit/datasource/metadata/digitalocean/metadata_test.go index 5a28aa8e..d0df3102 100644 --- a/config/cloudinit/datasource/metadata/digitalocean/metadata_test.go +++ b/config/cloudinit/datasource/metadata/digitalocean/metadata_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/netconf" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/ec2/metadata.go b/config/cloudinit/datasource/metadata/ec2/metadata.go index 25d79a2e..68eb65c9 100644 --- a/config/cloudinit/datasource/metadata/ec2/metadata.go +++ b/config/cloudinit/datasource/metadata/ec2/metadata.go @@ -20,10 +20,10 @@ import ( "net" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/netconf" ) const ( diff --git a/config/cloudinit/datasource/metadata/ec2/metadata_test.go b/config/cloudinit/datasource/metadata/ec2/metadata_test.go index e08c95ac..1dd9e742 100644 --- a/config/cloudinit/datasource/metadata/ec2/metadata_test.go +++ b/config/cloudinit/datasource/metadata/ec2/metadata_test.go @@ -20,11 +20,11 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/netconf" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/exoscale/metadata.go b/config/cloudinit/datasource/metadata/exoscale/metadata.go index f515a091..d04b28f5 100644 --- a/config/cloudinit/datasource/metadata/exoscale/metadata.go +++ b/config/cloudinit/datasource/metadata/exoscale/metadata.go @@ -5,10 +5,10 @@ import ( "strconv" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" ) const ( diff --git a/config/cloudinit/datasource/metadata/exoscale/metadata_test.go b/config/cloudinit/datasource/metadata/exoscale/metadata_test.go index d6039776..6eb4c36f 100644 --- a/config/cloudinit/datasource/metadata/exoscale/metadata_test.go +++ b/config/cloudinit/datasource/metadata/exoscale/metadata_test.go @@ -6,10 +6,10 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/gce/metadata.go b/config/cloudinit/datasource/metadata/gce/metadata.go index 9aac820d..508ea42e 100644 --- a/config/cloudinit/datasource/metadata/gce/metadata.go +++ b/config/cloudinit/datasource/metadata/gce/metadata.go @@ -21,8 +21,8 @@ import ( "strconv" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" ) const ( diff --git a/config/cloudinit/datasource/metadata/gce/metadata_test.go b/config/cloudinit/datasource/metadata/gce/metadata_test.go index 172cfb2b..f29bf015 100644 --- a/config/cloudinit/datasource/metadata/gce/metadata_test.go +++ b/config/cloudinit/datasource/metadata/gce/metadata_test.go @@ -20,10 +20,10 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/metadata.go b/config/cloudinit/datasource/metadata/metadata.go index 70355065..c8f578c5 100644 --- a/config/cloudinit/datasource/metadata/metadata.go +++ b/config/cloudinit/datasource/metadata/metadata.go @@ -21,8 +21,8 @@ import ( "net/http" "strings" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" ) type Service struct { diff --git a/config/cloudinit/datasource/metadata/metadata_test.go b/config/cloudinit/datasource/metadata/metadata_test.go index e4a010fc..958141c4 100644 --- a/config/cloudinit/datasource/metadata/metadata_test.go +++ b/config/cloudinit/datasource/metadata/metadata_test.go @@ -20,8 +20,8 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource/metadata/test" - "github.com/rancher/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/datasource/metadata/test" + "github.com/burmilla/os/config/cloudinit/pkg" ) func TestAvailabilityChanges(t *testing.T) { diff --git a/config/cloudinit/datasource/metadata/packet/metadata.go b/config/cloudinit/datasource/metadata/packet/metadata.go index b522f234..82b4d464 100644 --- a/config/cloudinit/datasource/metadata/packet/metadata.go +++ b/config/cloudinit/datasource/metadata/packet/metadata.go @@ -19,10 +19,10 @@ import ( "strconv" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/datasource/metadata" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource/metadata" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" yaml "github.com/cloudfoundry-incubator/candiedyaml" packetMetadata "github.com/packethost/packngo/metadata" diff --git a/config/cloudinit/datasource/metadata/test/test.go b/config/cloudinit/datasource/metadata/test/test.go index 5bafa7f5..dcc1a7cf 100644 --- a/config/cloudinit/datasource/metadata/test/test.go +++ b/config/cloudinit/datasource/metadata/test/test.go @@ -17,7 +17,7 @@ package test import ( "fmt" - "github.com/rancher/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/pkg" ) type HTTPClient struct { diff --git a/config/cloudinit/datasource/proccmdline/proc_cmdline.go b/config/cloudinit/datasource/proccmdline/proc_cmdline.go index c774f924..e13ac994 100644 --- a/config/cloudinit/datasource/proccmdline/proc_cmdline.go +++ b/config/cloudinit/datasource/proccmdline/proc_cmdline.go @@ -20,9 +20,9 @@ import ( "io/ioutil" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" ) const ( diff --git a/config/cloudinit/datasource/proxmox/proxmox.go b/config/cloudinit/datasource/proxmox/proxmox.go index c6afa664..b1134b67 100644 --- a/config/cloudinit/datasource/proxmox/proxmox.go +++ b/config/cloudinit/datasource/proxmox/proxmox.go @@ -7,9 +7,9 @@ import ( "path" "syscall" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/docker/docker/pkg/mount" ) diff --git a/config/cloudinit/datasource/proxmox/proxmox_test.go b/config/cloudinit/datasource/proxmox/proxmox_test.go index d6022967..090a9632 100644 --- a/config/cloudinit/datasource/proxmox/proxmox_test.go +++ b/config/cloudinit/datasource/proxmox/proxmox_test.go @@ -3,7 +3,7 @@ package proxmox import ( "testing" - "github.com/rancher/os/config/cloudinit/datasource/test" + "github.com/burmilla/os/config/cloudinit/datasource/test" ) func TestFetchUserdata(t *testing.T) { diff --git a/config/cloudinit/datasource/tftp/tftp.go b/config/cloudinit/datasource/tftp/tftp.go index 380b5f3f..87166d83 100644 --- a/config/cloudinit/datasource/tftp/tftp.go +++ b/config/cloudinit/datasource/tftp/tftp.go @@ -7,7 +7,7 @@ import ( "regexp" "strings" - "github.com/rancher/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource" "github.com/pin/tftp" ) diff --git a/config/cloudinit/datasource/url/url.go b/config/cloudinit/datasource/url/url.go index 56ee3e76..d7d62b02 100644 --- a/config/cloudinit/datasource/url/url.go +++ b/config/cloudinit/datasource/url/url.go @@ -17,9 +17,9 @@ package url import ( "fmt" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/util/network" ) type RemoteFile struct { diff --git a/config/cloudinit/datasource/vmware/vmware.go b/config/cloudinit/datasource/vmware/vmware.go index 3d1a6f0e..9e3e7565 100644 --- a/config/cloudinit/datasource/vmware/vmware.go +++ b/config/cloudinit/datasource/vmware/vmware.go @@ -19,10 +19,10 @@ import ( "net" "strings" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" ) type readConfigFunction func(key string) (string, error) diff --git a/config/cloudinit/datasource/vmware/vmware_amd64.go b/config/cloudinit/datasource/vmware/vmware_amd64.go index 9112c907..b8fb86ea 100644 --- a/config/cloudinit/datasource/vmware/vmware_amd64.go +++ b/config/cloudinit/datasource/vmware/vmware_amd64.go @@ -18,9 +18,9 @@ import ( "io/ioutil" "os" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" "github.com/sigma/vmw-guestinfo/rpcvmx" "github.com/sigma/vmw-guestinfo/vmcheck" diff --git a/config/cloudinit/datasource/vmware/vmware_test.go b/config/cloudinit/datasource/vmware/vmware_test.go index 2318921b..5f34e7e9 100644 --- a/config/cloudinit/datasource/vmware/vmware_test.go +++ b/config/cloudinit/datasource/vmware/vmware_test.go @@ -24,8 +24,8 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/pkg/netconf" ) type MockHypervisor map[string]string diff --git a/config/cloudinit/initialize/env.go b/config/cloudinit/initialize/env.go index a0bc41ed..e4209714 100644 --- a/config/cloudinit/initialize/env.go +++ b/config/cloudinit/initialize/env.go @@ -21,9 +21,9 @@ import ( "regexp" "strings" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/system" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/system" ) const DefaultSSHKeyName = "coreos-cloudinit" diff --git a/config/cloudinit/initialize/env_test.go b/config/cloudinit/initialize/env_test.go index 24092cd3..ee54d87c 100644 --- a/config/cloudinit/initialize/env_test.go +++ b/config/cloudinit/initialize/env_test.go @@ -21,8 +21,8 @@ import ( "path" "testing" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/system" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/system" ) func TestEnvironmentApply(t *testing.T) { diff --git a/config/cloudinit/initialize/github.go b/config/cloudinit/initialize/github.go index 46230f37..36bd6190 100644 --- a/config/cloudinit/initialize/github.go +++ b/config/cloudinit/initialize/github.go @@ -17,7 +17,7 @@ package initialize import ( "fmt" - "github.com/rancher/os/config/cloudinit/system" + "github.com/burmilla/os/config/cloudinit/system" ) func SSHImportGithubUser(systemUser string, githubUser string) error { diff --git a/config/cloudinit/initialize/ssh_keys.go b/config/cloudinit/initialize/ssh_keys.go index 9982e94d..6c11ea55 100644 --- a/config/cloudinit/initialize/ssh_keys.go +++ b/config/cloudinit/initialize/ssh_keys.go @@ -18,8 +18,8 @@ import ( "encoding/json" "fmt" - "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/config/cloudinit/system" + "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/config/cloudinit/system" ) type UserKey struct { diff --git a/config/cloudinit/initialize/user_data.go b/config/cloudinit/initialize/user_data.go index fdcb4271..54dad37e 100644 --- a/config/cloudinit/initialize/user_data.go +++ b/config/cloudinit/initialize/user_data.go @@ -18,7 +18,7 @@ import ( "errors" "log" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) var ( diff --git a/config/cloudinit/initialize/user_data_test.go b/config/cloudinit/initialize/user_data_test.go index 0c75aa10..9c6ae8e4 100644 --- a/config/cloudinit/initialize/user_data_test.go +++ b/config/cloudinit/initialize/user_data_test.go @@ -17,7 +17,7 @@ package initialize import ( "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestParseHeaderCRLF(t *testing.T) { diff --git a/config/cloudinit/initialize/workspace.go b/config/cloudinit/initialize/workspace.go index 5aeaae56..11d34669 100644 --- a/config/cloudinit/initialize/workspace.go +++ b/config/cloudinit/initialize/workspace.go @@ -19,8 +19,8 @@ import ( "path" "strings" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/cloudinit/system" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/system" ) func PrepWorkspace(workspace string) error { diff --git a/config/cloudinit/network/packet.go b/config/cloudinit/network/packet.go index 3adde8e6..50fae45a 100644 --- a/config/cloudinit/network/packet.go +++ b/config/cloudinit/network/packet.go @@ -17,7 +17,7 @@ package network import ( "net" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/pkg/netconf" ) func ProcessPacketNetconf(netdata netconf.NetworkConfig) ([]InterfaceGenerator, error) { diff --git a/config/cloudinit/pkg/http_client.go b/config/cloudinit/pkg/http_client.go index 21c3f856..37fc6946 100644 --- a/config/cloudinit/pkg/http_client.go +++ b/config/cloudinit/pkg/http_client.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" ) const ( diff --git a/config/cloudinit/pkg/http_client_test.go b/config/cloudinit/pkg/http_client_test.go index 96322ab5..dfac71ad 100644 --- a/config/cloudinit/pkg/http_client_test.go +++ b/config/cloudinit/pkg/http_client_test.go @@ -109,8 +109,8 @@ coreos: id: test name: CoreOS.box for Test version-id: %VERSION_ID%+%BUILD_ID% - home-url: https://github.com/rancher/os/config/cloudinit - bug-report-url: https://github.com/rancher/os/config/cloudinit + home-url: https://github.com/burmilla/os/config/cloudinit + bug-report-url: https://github.com/burmilla/os/config/cloudinit update: reboot-strategy: best-effort ` diff --git a/config/cloudinit/system/env.go b/config/cloudinit/system/env.go index 6ed81bb0..152a9332 100644 --- a/config/cloudinit/system/env.go +++ b/config/cloudinit/system/env.go @@ -18,7 +18,7 @@ import ( "fmt" "reflect" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // serviceContents generates the contents for a drop-in unit given the config. diff --git a/config/cloudinit/system/env_file_test.go b/config/cloudinit/system/env_file_test.go index f057547e..dff804e6 100644 --- a/config/cloudinit/system/env_file_test.go +++ b/config/cloudinit/system/env_file_test.go @@ -22,7 +22,7 @@ import ( "syscall" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) const ( diff --git a/config/cloudinit/system/etc_hosts.go b/config/cloudinit/system/etc_hosts.go index 8ee4093c..48eda3b1 100644 --- a/config/cloudinit/system/etc_hosts.go +++ b/config/cloudinit/system/etc_hosts.go @@ -20,7 +20,7 @@ import ( "os" "path" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) const DefaultIpv4Address = "127.0.0.1" diff --git a/config/cloudinit/system/etc_hosts_test.go b/config/cloudinit/system/etc_hosts_test.go index c7827a14..38a36587 100644 --- a/config/cloudinit/system/etc_hosts_test.go +++ b/config/cloudinit/system/etc_hosts_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestEtcdHostsFile(t *testing.T) { diff --git a/config/cloudinit/system/etcd.go b/config/cloudinit/system/etcd.go index febdc8e8..de61378c 100644 --- a/config/cloudinit/system/etcd.go +++ b/config/cloudinit/system/etcd.go @@ -15,7 +15,7 @@ package system import ( - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // Etcd is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/etcd2.go b/config/cloudinit/system/etcd2.go index 2d025712..a02952bf 100644 --- a/config/cloudinit/system/etcd2.go +++ b/config/cloudinit/system/etcd2.go @@ -15,7 +15,7 @@ package system import ( - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // Etcd2 is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/etcd_test.go b/config/cloudinit/system/etcd_test.go index dbb39a2f..fe895a5e 100644 --- a/config/cloudinit/system/etcd_test.go +++ b/config/cloudinit/system/etcd_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestEtcdUnits(t *testing.T) { diff --git a/config/cloudinit/system/file.go b/config/cloudinit/system/file.go index 30ce4597..07db6936 100644 --- a/config/cloudinit/system/file.go +++ b/config/cloudinit/system/file.go @@ -23,7 +23,7 @@ import ( "path" "strconv" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // File is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/file_test.go b/config/cloudinit/system/file_test.go index 87aba480..67448b43 100644 --- a/config/cloudinit/system/file_test.go +++ b/config/cloudinit/system/file_test.go @@ -20,7 +20,7 @@ import ( "path" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestWriteFileUnencodedContent(t *testing.T) { diff --git a/config/cloudinit/system/flannel.go b/config/cloudinit/system/flannel.go index bc82c069..d3ce6a11 100644 --- a/config/cloudinit/system/flannel.go +++ b/config/cloudinit/system/flannel.go @@ -18,7 +18,7 @@ import ( "path" "strings" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // Flannel is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/flannel_test.go b/config/cloudinit/system/flannel_test.go index b2eda6d0..516632fe 100644 --- a/config/cloudinit/system/flannel_test.go +++ b/config/cloudinit/system/flannel_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestFlannelEnvVars(t *testing.T) { diff --git a/config/cloudinit/system/fleet.go b/config/cloudinit/system/fleet.go index d1536efd..a5a55f3e 100644 --- a/config/cloudinit/system/fleet.go +++ b/config/cloudinit/system/fleet.go @@ -15,7 +15,7 @@ package system import ( - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // Fleet is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/fleet_test.go b/config/cloudinit/system/fleet_test.go index 235ad1ad..04bd551c 100644 --- a/config/cloudinit/system/fleet_test.go +++ b/config/cloudinit/system/fleet_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestFleetUnits(t *testing.T) { diff --git a/config/cloudinit/system/locksmith.go b/config/cloudinit/system/locksmith.go index 80d5f850..10d8a3c2 100644 --- a/config/cloudinit/system/locksmith.go +++ b/config/cloudinit/system/locksmith.go @@ -15,7 +15,7 @@ package system import ( - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // Locksmith is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/locksmith_test.go b/config/cloudinit/system/locksmith_test.go index 637503bc..f7892d24 100644 --- a/config/cloudinit/system/locksmith_test.go +++ b/config/cloudinit/system/locksmith_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestLocksmithUnits(t *testing.T) { diff --git a/config/cloudinit/system/oem.go b/config/cloudinit/system/oem.go index cc0d56a4..0689bca2 100644 --- a/config/cloudinit/system/oem.go +++ b/config/cloudinit/system/oem.go @@ -18,7 +18,7 @@ import ( "fmt" "path" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) // OEM is a top-level structure which embeds its underlying configuration, diff --git a/config/cloudinit/system/oem_test.go b/config/cloudinit/system/oem_test.go index a97757bc..91721d86 100644 --- a/config/cloudinit/system/oem_test.go +++ b/config/cloudinit/system/oem_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestOEMFile(t *testing.T) { diff --git a/config/cloudinit/system/unit.go b/config/cloudinit/system/unit.go index 56232848..88e44578 100644 --- a/config/cloudinit/system/unit.go +++ b/config/cloudinit/system/unit.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) type UnitManager interface { diff --git a/config/cloudinit/system/unit_test.go b/config/cloudinit/system/unit_test.go index 94254616..95ddc79a 100644 --- a/config/cloudinit/system/unit_test.go +++ b/config/cloudinit/system/unit_test.go @@ -17,7 +17,7 @@ package system import ( "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func TestType(t *testing.T) { diff --git a/config/cloudinit/system/update.go b/config/cloudinit/system/update.go index d0098a7b..a1631e14 100644 --- a/config/cloudinit/system/update.go +++ b/config/cloudinit/system/update.go @@ -24,7 +24,7 @@ import ( "sort" "strings" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) const ( diff --git a/config/cloudinit/system/update_test.go b/config/cloudinit/system/update_test.go index d1e1cb88..ac333f38 100644 --- a/config/cloudinit/system/update_test.go +++ b/config/cloudinit/system/update_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func testReadConfig(config string) func() (io.Reader, error) { diff --git a/config/cloudinit/system/user.go b/config/cloudinit/system/user.go index c1be4639..a5a526e9 100644 --- a/config/cloudinit/system/user.go +++ b/config/cloudinit/system/user.go @@ -21,7 +21,7 @@ import ( "os/user" "strings" - "github.com/rancher/os/config/cloudinit/config" + "github.com/burmilla/os/config/cloudinit/config" ) func UserExists(u *config.User) bool { diff --git a/config/cmdline/cmdline.go b/config/cmdline/cmdline.go index 09f448cb..9fa55d26 100644 --- a/config/cmdline/cmdline.go +++ b/config/cmdline/cmdline.go @@ -5,7 +5,7 @@ import ( "strings" "unicode" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" ) diff --git a/config/config.go b/config/config.go index 81e6f723..1aa64d23 100644 --- a/config/config.go +++ b/config/config.go @@ -4,21 +4,21 @@ import ( "io/ioutil" "strings" + "github.com/burmilla/os/config/cmdline" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" - "github.com/rancher/os/config/cmdline" - "github.com/rancher/os/pkg/util" ) const Banner = ` - , , ______ _ _____ _____TM - ,------------|'------'| | ___ \\ | | / _ / ___| - / . '-' |- | |_/ /__ _ _ __ ___| |__ ___ _ __ | | | \\ '--. - \\/| | | | // _' | '_ \\ / __| '_ \\ / _ \\ '__' | | | |'--. \\ - | .________.'----' | |\\ \\ (_| | | | | (__| | | | __/ | | \\_/ /\\__/ / - | | | | \\_| \\_\\__,_|_| |_|\\___|_| |_|\\___|_| \\___/\\____/ - \\___/ \\___/ \s \r +|||||| ||||||| ||||| +| | | | ||||| | | | | | || | | | | +| | | | | | || || | | | | | | | | +|||||| | | | | | || | | | | | | | | ||||| +| | | | ||||| | | | | | |||||| | | | +| | | | | | | | | | | | | | | | | +|||||| |||| | | | | | |||||| |||||| | | ||||||| ||||| - RancherOS \v \n \l + BurmillaOS \v \n \l ` func Merge(bytes []byte) error { diff --git a/config/config_test.go b/config/config_test.go index 37145ca8..b4f3cefc 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -3,8 +3,8 @@ package config import ( "testing" - "github.com/rancher/os/config/cmdline" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config/cmdline" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" "github.com/stretchr/testify/require" diff --git a/config/data_funcs.go b/config/data_funcs.go index c337edc6..4200cc2a 100644 --- a/config/data_funcs.go +++ b/config/data_funcs.go @@ -1,8 +1,8 @@ package config import ( - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) type CfgFunc func(*CloudConfig) (*CloudConfig, error) diff --git a/config/disk.go b/config/disk.go index d2d2f0d8..0f911b70 100644 --- a/config/disk.go +++ b/config/disk.go @@ -9,11 +9,11 @@ import ( "sort" "strings" - "github.com/rancher/os/config/cloudinit/datasource" - "github.com/rancher/os/config/cloudinit/initialize" - "github.com/rancher/os/config/cmdline" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/initialize" + "github.com/burmilla/os/config/cmdline" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" "github.com/docker/engine-api/types" diff --git a/config/metadata_test.go b/config/metadata_test.go index 0a589317..fe083126 100644 --- a/config/metadata_test.go +++ b/config/metadata_test.go @@ -19,7 +19,7 @@ import ( "net" "testing" - "github.com/rancher/os/config/cloudinit/datasource" + "github.com/burmilla/os/config/cloudinit/datasource" ) func TestSubstituteUserDataVars(t *testing.T) { diff --git a/config/types.go b/config/types.go index b7fb4250..47d269d3 100644 --- a/config/types.go +++ b/config/types.go @@ -4,9 +4,9 @@ import ( "fmt" "runtime" - "github.com/rancher/os/config/cloudinit/config" - "github.com/rancher/os/config/yaml" - "github.com/rancher/os/pkg/netconf" + "github.com/burmilla/os/config/cloudinit/config" + "github.com/burmilla/os/config/yaml" + "github.com/burmilla/os/pkg/netconf" "github.com/docker/engine-api/types" composeConfig "github.com/docker/libcompose/config" @@ -26,7 +26,7 @@ const ( UserImages = "images-user.tar" Debug = false SystemDockerBin = "/usr/bin/system-dockerd" - DefaultDind = "rancher/os-dind:17.12.1" + DefaultDind = "burmilla/os-dind:17.12.1" DetachLabel = "io.rancher.os.detach" CreateOnlyLabel = "io.rancher.os.createonly" diff --git a/config/validate_test.go b/config/validate_test.go index 7cbe62cc..45810e0d 100644 --- a/config/validate_test.go +++ b/config/validate_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/util" yaml "github.com/cloudfoundry-incubator/candiedyaml" ) diff --git a/rancheros.png b/howitworks.png similarity index 100% rename from rancheros.png rename to howitworks.png diff --git a/images/01-base/Dockerfile b/images/01-base/Dockerfile index f2bb5414..a852167d 100644 --- a/images/01-base/Dockerfile +++ b/images/01-base/Dockerfile @@ -1,10 +1,10 @@ -FROM rancher/os-rootfs +FROM burmilla/os-rootfs COPY . / RUN rm /sbin/poweroff /sbin/reboot /sbin/halt && \ sed -i '/^root/s!/bin/sh!/bin/bash!' /etc/passwd && \ - echo 'RancherOS \n \l' > /etc/issue && \ + echo 'BurmillaOS \n \l' > /etc/issue && \ rm -rf /run \ /linuxrc \ /etc/os-release \ diff --git a/images/01-base/usr/bin/os-subscriber b/images/01-base/usr/bin/os-subscriber deleted file mode 100755 index ed1904a1..00000000 --- a/images/01-base/usr/bin/os-subscriber +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash -set -e -x - -gateway_address="http://ros.rancher.io/gateway" - -sigProcess() { - echo "SIGINT/SIGTERM signal..." - kill -9 $$ -} - -trap sigProcess SIGINT SIGKILL SIGTERM - -read_policy() { - policy=`ros c get rancher.upgrade.policy` - if [[ -z ${policy} ]]; then - echo "can not read upgrade.policy" - return 1 - fi - return $(($policy)) -} - -report_activity() { - arch=`uname -m` - uuid=`cat /sys/class/dmi/id/product_uuid || true` - release=`ros -v | awk '{print $2}'` - response=`wget --server-response ${gateway_address}/report --header 'Accept: application/json' --header 'Content-type: application/json' --header "arch: $arch" --header "uuid: $uuid" --header "release: $release" 2>&1 | awk '/^ HTTP/{print $2}'` - if [[ -n ${response} && ${response} -ge 200 && ${response} -le 300 ]]; then - echo "report activity success" - else - echo "report activity failed" - return 1 - fi -} - -upgrade_operate() { - recommend_version=`wget ${gateway_address}/version -q -O -` - case ${policy} in - download) - echo "upgrade.policy is 'download'" - report_activity - if [[ ${recommend_version} ]]; - then - system-docker pull ${recommend_version} - else - echo "pull recommend image failed" - return 1 - fi - ;; - auto) - echo "upgrade.policy is 'auto'" - report_activity - if [[ ${recommend_version} ]]; - then - ros os upgrade -i ${recommend_version} -f - else - echo "execute ros os upgrade failed" - return 1 - fi - ;; - none) - echo "upgrade.policy is 'none'" - ;; - *) - echo "upgrade.policy is 'illegal'" - ;; - esac -} - -read_policy - -n=0 -until [[ ${n} -ge 5 ]] -do - upgrade_operate && break - n=$[$n+1] - sleep 5 -done \ No newline at end of file diff --git a/images/02-acpid/Dockerfile b/images/02-acpid/Dockerfile index 3154ff7c..c0a5e696 100644 --- a/images/02-acpid/Dockerfile +++ b/images/02-acpid/Dockerfile @@ -1,2 +1,2 @@ -FROM rancher/os-base +FROM burmilla/os-base COPY . / diff --git a/images/02-bootstrap/Dockerfile b/images/02-bootstrap/Dockerfile index 3154ff7c..c0a5e696 100644 --- a/images/02-bootstrap/Dockerfile +++ b/images/02-bootstrap/Dockerfile @@ -1,2 +1,2 @@ -FROM rancher/os-base +FROM burmilla/os-base COPY . / diff --git a/images/02-console/Dockerfile b/images/02-console/Dockerfile index 76b42829..f7b094ed 100644 --- a/images/02-console/Dockerfile +++ b/images/02-console/Dockerfile @@ -1,4 +1,4 @@ -FROM rancher/os-base +FROM burmilla/os-base COPY build/lsb-release /etc/ COPY build/sshd_config.append.tpl /etc/ssh/ COPY prompt.sh /etc/profile.d/ diff --git a/images/02-logrotate/Dockerfile b/images/02-logrotate/Dockerfile index b18b4b72..83be8516 100644 --- a/images/02-logrotate/Dockerfile +++ b/images/02-logrotate/Dockerfile @@ -1,4 +1,4 @@ -FROM rancher/os-base +FROM burmilla/os-base COPY . / RUN chmod 644 /etc/logrotate.conf ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/images/02-syslog/Dockerfile b/images/02-syslog/Dockerfile index df2f76a5..758c5dc7 100644 --- a/images/02-syslog/Dockerfile +++ b/images/02-syslog/Dockerfile @@ -1,3 +1,3 @@ -FROM rancher/os-base +FROM burmilla/os-base COPY . / ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/main.go b/main.go index 4d1e23a3..d2263db3 100644 --- a/main.go +++ b/main.go @@ -4,16 +4,16 @@ import ( "fmt" "os" - "github.com/rancher/os/cmd/cloudinitexecute" - "github.com/rancher/os/cmd/cloudinitsave" - "github.com/rancher/os/cmd/control" - osInit "github.com/rancher/os/cmd/init" - "github.com/rancher/os/cmd/network" - "github.com/rancher/os/cmd/power" - "github.com/rancher/os/cmd/respawn" - "github.com/rancher/os/cmd/sysinit" - "github.com/rancher/os/cmd/wait" - "github.com/rancher/os/pkg/dfs" + "github.com/burmilla/os/cmd/cloudinitexecute" + "github.com/burmilla/os/cmd/cloudinitsave" + "github.com/burmilla/os/cmd/control" + osInit "github.com/burmilla/os/cmd/init" + "github.com/burmilla/os/cmd/network" + "github.com/burmilla/os/cmd/power" + "github.com/burmilla/os/cmd/respawn" + "github.com/burmilla/os/cmd/sysinit" + "github.com/burmilla/os/cmd/wait" + "github.com/burmilla/os/pkg/dfs" "github.com/docker/docker/pkg/reexec" ) diff --git a/os-config.tpl.yml b/os-config.tpl.yml index f1f8587a..82a26ffa 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -232,7 +232,7 @@ rancher: io.rancher.os.scope: system io.rancher.os.after: cloud-init-execute io.docker.compose.rebuild: always - io.rancher.os.console: default + io.rancher.os.console: debian environment: - HTTP_PROXY - HTTPS_PROXY @@ -317,9 +317,9 @@ rancher: - system-volumes system-cron: {{if eq "amd64" .ARCH -}} - image: rancher/container-crontab:v0.4.0 + image: burmilla/container-crontab:v0.5.0 {{else -}} - image: niusmallnan/container-crontab:v0.4.0{{.SUFFIX}} + image: burmilla/container-crontab:v0.5.0{{.SUFFIX}} {{end -}} labels: io.rancher.os.scope: system @@ -382,25 +382,6 @@ rancher: volumes: - /sys:/host/sys - /var/lib/system-docker:/var/lib/system-docker:shared - subscriber: - image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}} - command: os-subscriber - environment: - - IN_DOCKER=true - labels: - io.rancher.os.scope: system - io.rancher.os.after: console - cron.schedule: "0 0 3 * * ?" - privileged: true - pid: host - ipc: host - net: host - uts: host - volumes_from: - - command-volumes - - system-volumes - volumes: - - /sys:/host/sys system_docker: exec: true storage_driver: overlay2 diff --git a/pkg/compose/project.go b/pkg/compose/project.go index 2704d87a..37f5565e 100644 --- a/pkg/compose/project.go +++ b/pkg/compose/project.go @@ -5,11 +5,11 @@ import ( "io/ioutil" "os" - "github.com/rancher/os/config" - rosDocker "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/config" + rosDocker "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" + "github.com/burmilla/os/pkg/util/network" yaml "github.com/cloudfoundry-incubator/candiedyaml" dockerClient "github.com/docker/engine-api/client" diff --git a/pkg/compose/reload.go b/pkg/compose/reload.go index 8cb8cf71..010a4bd9 100644 --- a/pkg/compose/reload.go +++ b/pkg/compose/reload.go @@ -3,10 +3,10 @@ package compose import ( "fmt" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util/network" yaml "github.com/cloudfoundry-incubator/candiedyaml" composeConfig "github.com/docker/libcompose/config" diff --git a/pkg/dfs/scratch.go b/pkg/dfs/scratch.go index f0830ab9..eaed4eb3 100644 --- a/pkg/dfs/scratch.go +++ b/pkg/dfs/scratch.go @@ -11,12 +11,12 @@ import ( "strings" "syscall" - "github.com/rancher/os/config/cmdline" - "github.com/rancher/os/pkg/init/one" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" - "github.com/rancher/os/pkg/selinux" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config/cmdline" + "github.com/burmilla/os/pkg/init/one" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" + "github.com/burmilla/os/pkg/selinux" + "github.com/burmilla/os/pkg/util" "github.com/docker/libnetwork/resolvconf" ) diff --git a/pkg/docker/auth.go b/pkg/docker/auth.go index de129580..d65c439b 100644 --- a/pkg/docker/auth.go +++ b/pkg/docker/auth.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" "github.com/docker/docker/registry" "github.com/docker/engine-api/types" diff --git a/pkg/docker/client.go b/pkg/docker/client.go index 6a1e45a2..7d91096f 100644 --- a/pkg/docker/client.go +++ b/pkg/docker/client.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/rancher/os/config" + "github.com/burmilla/os/config" dockerClient "github.com/docker/engine-api/client" "golang.org/x/net/context" diff --git a/pkg/docker/client_factory.go b/pkg/docker/client_factory.go index 98d0d199..be723e3f 100644 --- a/pkg/docker/client_factory.go +++ b/pkg/docker/client_factory.go @@ -4,9 +4,9 @@ import ( "fmt" "sync" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" dockerclient "github.com/docker/engine-api/client" composeClient "github.com/docker/libcompose/docker/client" diff --git a/pkg/docker/env.go b/pkg/docker/env.go index e3d02237..ab79f141 100644 --- a/pkg/docker/env.go +++ b/pkg/docker/env.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" composeConfig "github.com/docker/libcompose/config" ) diff --git a/pkg/docker/service.go b/pkg/docker/service.go index abd2008f..dbdfa4f0 100644 --- a/pkg/docker/service.go +++ b/pkg/docker/service.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util/network" "github.com/docker/docker/layer" dockerclient "github.com/docker/engine-api/client" diff --git a/pkg/docker/service_factory.go b/pkg/docker/service_factory.go index ca0d6bfd..569eb73e 100644 --- a/pkg/docker/service_factory.go +++ b/pkg/docker/service_factory.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/util" composeConfig "github.com/docker/libcompose/config" "github.com/docker/libcompose/docker" diff --git a/pkg/docker/util.go b/pkg/docker/util.go index 3dd78123..972fa845 100644 --- a/pkg/docker/util.go +++ b/pkg/docker/util.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/rancher/os/config" + "github.com/burmilla/os/config" composeConfig "github.com/docker/libcompose/config" ) diff --git a/pkg/hostname/hostname.go b/pkg/hostname/hostname.go index a667bbd1..2c11ce03 100644 --- a/pkg/hostname/hostname.go +++ b/pkg/hostname/hostname.go @@ -7,7 +7,7 @@ import ( "strings" "syscall" - "github.com/rancher/os/config" + "github.com/burmilla/os/config" ) func SetHostnameFromCloudConfig(cc *config.CloudConfig) error { diff --git a/pkg/init/b2d/b2d.go b/pkg/init/b2d/b2d.go index f6c67784..bd019e1a 100644 --- a/pkg/init/b2d/b2d.go +++ b/pkg/init/b2d/b2d.go @@ -3,10 +3,10 @@ package b2d import ( "os" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/init/configfiles" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/init/configfiles" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) const ( diff --git a/pkg/init/bootstrap/bootstrap.go b/pkg/init/bootstrap/bootstrap.go index 6cc872a7..cf8e4e83 100644 --- a/pkg/init/bootstrap/bootstrap.go +++ b/pkg/init/bootstrap/bootstrap.go @@ -1,12 +1,12 @@ package bootstrap import ( - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/init/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/sysinit" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/init/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/sysinit" + "github.com/burmilla/os/pkg/util" ) func bootstrapServices(cfg *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/cloudinit/cloudinit.go b/pkg/init/cloudinit/cloudinit.go index 97284050..b27aa4cf 100644 --- a/pkg/init/cloudinit/cloudinit.go +++ b/pkg/init/cloudinit/cloudinit.go @@ -5,12 +5,12 @@ import ( "path/filepath" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/init/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/sysinit" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/init/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/sysinit" + "github.com/burmilla/os/pkg/util" ) func CloudInit(cfg *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/configfiles/configfiles.go b/pkg/init/configfiles/configfiles.go index 429573f1..5546ff90 100644 --- a/pkg/init/configfiles/configfiles.go +++ b/pkg/init/configfiles/configfiles.go @@ -6,9 +6,9 @@ import ( "path/filepath" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) var ( diff --git a/pkg/init/debug/debug.go b/pkg/init/debug/debug.go index 0481470b..0918b718 100644 --- a/pkg/init/debug/debug.go +++ b/pkg/init/debug/debug.go @@ -1,8 +1,8 @@ package debug import ( - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" ) func PrintAndLoadConfig(_ *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/docker/docker.go b/pkg/init/docker/docker.go index 7576c2ac..ed2da78d 100644 --- a/pkg/init/docker/docker.go +++ b/pkg/init/docker/docker.go @@ -3,8 +3,8 @@ package docker import ( "syscall" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/dfs" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/dfs" ) func Start(cfg *config.CloudConfig) (chan interface{}, error) { diff --git a/pkg/init/env/env.go b/pkg/init/env/env.go index 3658eff5..6cf08c8f 100644 --- a/pkg/init/env/env.go +++ b/pkg/init/env/env.go @@ -3,10 +3,10 @@ package env import ( "os" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/init/fsmount" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util/network" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/init/fsmount" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util/network" ) func Init(c *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/fsmount/fsmount.go b/pkg/init/fsmount/fsmount.go index 833dd3b3..8ec88ec7 100644 --- a/pkg/init/fsmount/fsmount.go +++ b/pkg/init/fsmount/fsmount.go @@ -5,11 +5,11 @@ import ( "strings" "syscall" - "github.com/rancher/os/config" - "github.com/rancher/os/config/cmdline" - "github.com/rancher/os/pkg/init/bootstrap" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/config/cmdline" + "github.com/burmilla/os/pkg/init/bootstrap" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) const ( diff --git a/pkg/init/hypervisor/hypervisor.go b/pkg/init/hypervisor/hypervisor.go index 0f965421..1508ed5f 100644 --- a/pkg/init/hypervisor/hypervisor.go +++ b/pkg/init/hypervisor/hypervisor.go @@ -1,9 +1,9 @@ package hypervisor import ( - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) func Tools(cfg *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/modules/modules.go b/pkg/init/modules/modules.go index 7054c80d..32243d64 100644 --- a/pkg/init/modules/modules.go +++ b/pkg/init/modules/modules.go @@ -6,9 +6,9 @@ import ( "os/exec" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) func LoadModules(cfg *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/prepare/prepare.go b/pkg/init/prepare/prepare.go index 7c45fca1..dad9fec0 100644 --- a/pkg/init/prepare/prepare.go +++ b/pkg/init/prepare/prepare.go @@ -4,9 +4,9 @@ import ( "os" "strings" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/dfs" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/dfs" + "github.com/burmilla/os/pkg/log" ) var ( @@ -25,7 +25,7 @@ func FS(c *config.CloudConfig) (*config.CloudConfig, error) { } func SaveCmdline(c *config.CloudConfig) (*config.CloudConfig, error) { - // the Kernel Patch added for RancherOS passes `--` (only) elided kernel boot params to the init process + // the Kernel Patch added for BurmillaOS passes `--` (only) elided kernel boot params to the init process cmdLineArgs := strings.Join(os.Args, " ") config.SaveInitCmdline(cmdLineArgs) diff --git a/pkg/init/recovery/recovery.go b/pkg/init/recovery/recovery.go index c7131cb8..2bb34286 100644 --- a/pkg/init/recovery/recovery.go +++ b/pkg/init/recovery/recovery.go @@ -1,12 +1,12 @@ package recovery import ( - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/init/docker" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/netconf" - "github.com/rancher/os/pkg/sysinit" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/init/docker" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/netconf" + "github.com/burmilla/os/pkg/sysinit" composeConfig "github.com/docker/libcompose/config" "github.com/docker/libcompose/yaml" @@ -55,7 +55,7 @@ func LoadRecoveryConsole(cfg *config.CloudConfig) (*config.CloudConfig, error) { func Recovery(initFailure error) { if initFailure != nil { - log.Errorf("RancherOS has failed to boot: %v", initFailure) + log.Errorf("BurmillaOS has failed to boot: %v", initFailure) } log.Info("Launching recovery console") diff --git a/pkg/init/selinux/selinux.go b/pkg/init/selinux/selinux.go index 30af75e7..869e523d 100644 --- a/pkg/init/selinux/selinux.go +++ b/pkg/init/selinux/selinux.go @@ -5,9 +5,9 @@ package selinux import ( "io/ioutil" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/selinux" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/selinux" ) func Initialize(c *config.CloudConfig) (*config.CloudConfig, error) { diff --git a/pkg/init/sharedroot/sharedroot.go b/pkg/init/sharedroot/sharedroot.go index 87722c11..11a0e4c9 100644 --- a/pkg/init/sharedroot/sharedroot.go +++ b/pkg/init/sharedroot/sharedroot.go @@ -3,8 +3,8 @@ package sharedroot import ( "os" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/init/fsmount" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/init/fsmount" "github.com/docker/docker/pkg/mount" ) diff --git a/pkg/init/switchroot/switchroot.go b/pkg/init/switchroot/switchroot.go index 3acc4914..bc2ced26 100644 --- a/pkg/init/switchroot/switchroot.go +++ b/pkg/init/switchroot/switchroot.go @@ -8,10 +8,10 @@ import ( "strings" "syscall" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/dfs" - "github.com/rancher/os/pkg/init/fsmount" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/dfs" + "github.com/burmilla/os/pkg/init/fsmount" + "github.com/burmilla/os/pkg/log" "github.com/docker/docker/pkg/archive" ) @@ -30,7 +30,7 @@ func SwitchRoot(cfg *config.CloudConfig) (*config.CloudConfig, error) { func cleanupTarget(rootfs, targetUsr, usr, usrVer, tmpDir string) (bool, error) { log.Debugf("Deleting %s", targetUsr) if err := os.Remove(targetUsr); err != nil && !os.IsNotExist(err) { - log.Errorf("Failed to delete %s, possibly invalid RancherOS state partition: %v", targetUsr, err) + log.Errorf("Failed to delete %s, possibly invalid BurmillaOS state partition: %v", targetUsr, err) return false, err } diff --git a/pkg/log/log.go b/pkg/log/log.go index 64d8cafb..77563cdd 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/rancher/os/config/cmdline" + "github.com/burmilla/os/config/cmdline" "github.com/Sirupsen/logrus" lsyslog "github.com/Sirupsen/logrus/hooks/syslog" @@ -201,7 +201,7 @@ func AddRSyslogHook() { hook, err := lsyslog.NewSyslogHook("udp", netconsoleDestination, syslog.LOG_DEBUG, "") if err == nil { logrus.StandardLogger().Hooks.Add(hook) - Infof("Sending RancherOS Logs to: %s", netconsoleDestination) + Infof("Sending BurmillaOS Logs to: %s", netconsoleDestination) } else { Errorf("Error creating SyslogHook: %s", err) } diff --git a/pkg/log/showuserlog.go b/pkg/log/showuserlog.go index de67e57f..b44cb2d3 100644 --- a/pkg/log/showuserlog.go +++ b/pkg/log/showuserlog.go @@ -9,7 +9,7 @@ import ( logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog" ) -// ShowuserlogHook stores all levels of logrus entries in memory until its told the RancherOS logging system is ready +// ShowuserlogHook stores all levels of logrus entries in memory until its told the BurmillaOS logging system is ready // then it replays them to be logged type ShowuserlogHook struct { Level logrus.Level diff --git a/pkg/netconf/bonding.go b/pkg/netconf/bonding.go index db1679a9..f75f65c2 100644 --- a/pkg/netconf/bonding.go +++ b/pkg/netconf/bonding.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" "github.com/vishvananda/netlink" ) diff --git a/pkg/netconf/ipv4ll_linux.go b/pkg/netconf/ipv4ll_linux.go index 09c0a913..36102ed5 100644 --- a/pkg/netconf/ipv4ll_linux.go +++ b/pkg/netconf/ipv4ll_linux.go @@ -6,7 +6,7 @@ import ( "math/rand" "net" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" "github.com/j-keck/arping" "github.com/vishvananda/netlink" diff --git a/pkg/netconf/netconf_linux.go b/pkg/netconf/netconf_linux.go index 82785355..6199baa2 100644 --- a/pkg/netconf/netconf_linux.go +++ b/pkg/netconf/netconf_linux.go @@ -11,7 +11,7 @@ import ( "sync" "syscall" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" shlex "github.com/flynn/go-shlex" glob "github.com/ryanuber/go-glob" diff --git a/pkg/sysinit/sysinit.go b/pkg/sysinit/sysinit.go index 44020e1a..026d9235 100644 --- a/pkg/sysinit/sysinit.go +++ b/pkg/sysinit/sysinit.go @@ -10,11 +10,11 @@ import ( "strings" "syscall" - "github.com/rancher/os/cmd/control" - "github.com/rancher/os/config" - "github.com/rancher/os/pkg/compose" - "github.com/rancher/os/pkg/docker" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/cmd/control" + "github.com/burmilla/os/config" + "github.com/burmilla/os/pkg/compose" + "github.com/burmilla/os/pkg/docker" + "github.com/burmilla/os/pkg/log" "github.com/docker/engine-api/types" "github.com/docker/libcompose/project/options" @@ -119,7 +119,7 @@ func SysInit() error { return cfg, nil }}, {"banner", func(cfg *config.CloudConfig) (*config.CloudConfig, error) { - log.Infof("RancherOS %s started", config.Version) + log.Infof("BurmillaOS %s started", config.Version) return cfg, nil }}}) return err diff --git a/pkg/util/network/cache.go b/pkg/util/network/cache.go index e02e90b3..6a08e47c 100644 --- a/pkg/util/network/cache.go +++ b/pkg/util/network/cache.go @@ -7,7 +7,7 @@ import ( "os" "strings" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/pkg/log" ) const ( diff --git a/pkg/util/network/network.go b/pkg/util/network/network.go index 734d95fc..0796ff2b 100644 --- a/pkg/util/network/network.go +++ b/pkg/util/network/network.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "github.com/rancher/os/config" - httpRetry "github.com/rancher/os/config/cloudinit/pkg" - "github.com/rancher/os/pkg/log" + "github.com/burmilla/os/config" + httpRetry "github.com/burmilla/os/config/cloudinit/pkg" + "github.com/burmilla/os/pkg/log" yaml "github.com/cloudfoundry-incubator/candiedyaml" composeConfig "github.com/docker/libcompose/config" diff --git a/pkg/util/network/route.go b/pkg/util/network/route.go index 7a4c1570..be88307f 100644 --- a/pkg/util/network/route.go +++ b/pkg/util/network/route.go @@ -7,8 +7,8 @@ import ( "os" "strings" - "github.com/rancher/os/pkg/log" - "github.com/rancher/os/pkg/util" + "github.com/burmilla/os/pkg/log" + "github.com/burmilla/os/pkg/util" ) const ( diff --git a/pkg/util/util.go b/pkg/util/util.go index d82f3981..690113d9 100644 --- a/pkg/util/util.go +++ b/pkg/util/util.go @@ -12,7 +12,7 @@ import ( "path" "strings" - osYaml "github.com/rancher/os/config/yaml" + osYaml "github.com/burmilla/os/config/yaml" yaml "github.com/cloudfoundry-incubator/candiedyaml" ) diff --git a/scripts/build b/scripts/build index fa589505..71da24eb 100755 --- a/scripts/build +++ b/scripts/build @@ -8,12 +8,12 @@ version_gt() { if [ "$KERNEL_CHECK" != "0" ]; then echo "Host Kernel: $(uname -r)" - echo "RancherOS Kernel: $KERNEL_VERSION" + echo "BurmillaOS Kernel: $KERNEL_VERSION" - if [ $(uname -r) != $KERNEL_VERSION ] && ! version_gt $(uname -r) $KERNEL_VERSION; then - echo "Your host kernel must be greater than RancherOS KERNEL_VERSION" - exit 1 - fi +# if [ $(uname -r) != $KERNEL_VERSION ] && ! version_gt $(uname -r) $KERNEL_VERSION; then +# echo "Your host kernel must be greater than BurmillaOS KERNEL_VERSION" +# exit 1 +# fi fi echo -------------------------./build-target diff --git a/scripts/build-images b/scripts/build-images index d305520d..171b4b60 100755 --- a/scripts/build-images +++ b/scripts/build-images @@ -19,8 +19,8 @@ for i in $BASE/[0-9]*; do ${i}/prebuild.sh fi - if dapper -d --build -f ${i}/Dockerfile -- -t rancher/${name} ${i}; then - docker tag rancher/${name} ${tag} + if dapper -d --build -f ${i}/Dockerfile -- -t burmilla/${name} ${i}; then + docker tag burmilla/${name} ${tag} echo "${tag}" >> dist/images elif [ "$?" != "42" ]; then exit 1 diff --git a/scripts/build-target b/scripts/build-target index a1bd4aa6..dc0b3502 100755 --- a/scripts/build-target +++ b/scripts/build-target @@ -16,5 +16,5 @@ OUTPUT=${OUTPUT:-bin/ros} echo Building $OUTPUT BUILDDATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -CONST="-X github.com/rancher/os/config.Version=${VERSION} -X github.com/rancher/os/config.OsRepo=${OS_REPO} -X github.com/rancher/os/config.BuildDate='${BUILDDATE}'" +CONST="-X github.com/burmilla/os/config.Version=${VERSION} -X github.com/burmilla/os/config.OsRepo=${OS_REPO} -X github.com/burmilla/os/config.BuildDate='${BUILDDATE}'" go build -ldflags "$CONST -extldflags -static -s -w" -o ${OUTPUT} diff --git a/scripts/burmilla.png b/scripts/burmilla.png new file mode 100644 index 00000000..be05e54e Binary files /dev/null and b/scripts/burmilla.png differ diff --git a/scripts/checksums b/scripts/checksums index f6a7dfb1..074f279d 100755 --- a/scripts/checksums +++ b/scripts/checksums @@ -9,37 +9,29 @@ CHECKSUM="dist/checksums.txt" rm -f $CHECKSUM FILELIST=" -initrd -rancheros.ipxe -rancheros.iso -rootfs.tar.gz -vmlinuz -rancheros-aliyun.vhd -rancheros-cloudstack.img -rancheros-digitalocean.img -rancheros-openstack.img -rancheros-pingan.img -rancheros-gce.tar.gz -rancheros-raspberry-pi64.zip -rancheros-4glte.iso -rancheros-hyperv.iso -rancheros-proxmoxve.iso -rancheros-proxmoxve-autoformat.iso -rancheros-vmware.iso -rancheros-vmware-autoformat.iso -rancheros-vmware.vmdk +burmillaos-${VERSION}.iso +burmillaos-${VERSION}-aliyun.vhd +burmillaos-${VERSION}-cloudstack.img +burmillaos-${VERSION}-digitalocean.img +burmillaos-${VERSION}-openstack.img +burmillaos-${VERSION}-gce.tar.gz +burmillaos-${VERSION}-raspberry-pi64.zip +burmillaos-${VERSION}-4glte.iso +burmillaos-${VERSION}-hyperv.iso +burmillaos-${VERSION}-proxmoxve.iso +burmillaos-${VERSION}-vmware.iso " rm -rf dist/checksums && mkdir -p dist/checksums pushd dist/checksums for file in $FILELIST; do - curl -sSL -o $file https://github.com/rancher/os/releases/download/$VERSION/$file + curl -sSL -o $file https://github.com/burmilla/os/releases/download/$VERSION/$file for algo in sha256 md5; do echo "$algo: $(${algo}sum $file)" >> ../../$CHECKSUM done done popd -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file $CHECKSUM --name checksums.txt" -echo "gsutil cp $CHECKSUM gs://releases.rancher.com/os/latest/checksums.txt" -echo "gsutil cp $CHECKSUM gs://releases.rancher.com/os/$VERSION/checksums.txt" +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file $CHECKSUM --name checksums.txt" +#echo "gsutil cp $CHECKSUM gs://releases.rancher.com/os/latest/checksums.txt" +#echo "gsutil cp $CHECKSUM gs://releases.rancher.com/os/$VERSION/checksums.txt" diff --git a/scripts/create-installed b/scripts/create-installed index 0535f42b..404dfd2a 100755 --- a/scripts/create-installed +++ b/scripts/create-installed @@ -39,7 +39,7 @@ qemu-img create -f qcow2 build/hd.img 8G qemu-system-${QEMUARCH} -serial mon:stdio \ -enable-kvm \ -drive if=virtio,file=build/hd.img \ - -boot d -cdrom ./dist/artifacts/rancheros.iso \ + -boot d -cdrom ./dist/artifacts/burmillaos.iso \ -m 2048 \ -smp 1 \ -nographic \ diff --git a/scripts/hosting/rancheros.ipxe b/scripts/hosting/burmillaos.ipxe similarity index 68% rename from scripts/hosting/rancheros.ipxe rename to scripts/hosting/burmillaos.ipxe index 5a2405ce..50d77893 100644 --- a/scripts/hosting/rancheros.ipxe +++ b/scripts/hosting/burmillaos.ipxe @@ -1,6 +1,6 @@ #!ipxe dhcp -set base-url https://releases.rancher.com/os/latest -kernel ${base-url}/vmlinuz printk.devkmsg=on rancher.debug=true rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait console=tty0 rancher.state.mdadm_scan console=ttyS1,115200n8 rancher.autologin=ttyS1 rancher.network.interfaces.eth*.dhcp=true rancher.cloud_init.datasources=[configdrive,ec2,gce,packet,digitalocean] +set base-url https://github.com/burmilla/os/releases/download// +kernel ${base-url}/vmlinuz printk.devkmsg=on rancher.debug=true rancher.state.dev=LABEL=rancher_STATE rancher.state.wait console=tty0 rancher.state.mdadm_scan console=ttyS1,115200n8 rancher.autologin=ttyS1 rancher.network.interfaces.eth*.dhcp=true rancher.cloud_init.datasources=[configdrive,ec2,gce,packet,digitalocean] initrd ${base-url}/initrd boot diff --git a/scripts/hosting/digitalocean/fedora-symbiote.yml b/scripts/hosting/digitalocean/fedora-symbiote.yml index a0c11e20..f4a1a7f4 100644 --- a/scripts/hosting/digitalocean/fedora-symbiote.yml +++ b/scripts/hosting/digitalocean/fedora-symbiote.yml @@ -5,7 +5,7 @@ # either way, the part inside the "if" needs to be run by hand from the console atmA # # The most experimental way, is to use the ./scripts/hosting/digitalocean/host.sh script to modify this one for the current build -# push the rancher/os:sha image to hub, and then use +# push the burmilla/os:sha image to hub, and then use # doctl.exe compute droplet create --enable-ipv6 --enable-private-networking --image fedora-25-x64 --region sfo1 --size 2gb --ssh-keys 6956055 --ssh-keys 7170404 --user-data-file digitalocean.yml sven # where: #$ cat digitalocean.yml @@ -15,7 +15,7 @@ # ROS_VERSION="v1.0.1-rc1" -URL_BASE="https://github.com/rancher/os/releases/download/${ROS_VERSION}" +URL_BASE="https://github.com/burmilla/os/releases/download/${ROS_VERSION}" VMLINUX="vmlinuz-4.9.22-rancher" INITRD="initrd diff --git a/scripts/hosting/packet/packet.sh b/scripts/hosting/packet/packet.sh index 3f55900e..5f9a6ca2 100644 --- a/scripts/hosting/packet/packet.sh +++ b/scripts/hosting/packet/packet.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ex -INSTALLER_IMAGE=rancher/os:v0.7.1 +INSTALLER_IMAGE=burmilla/os:v0.7.1 ros config set rancher.network.interfaces.eth1.dhcp false if grep eth2 /proc/net/dev; then @@ -21,7 +21,7 @@ TINKERBELL_URL=$(cat /proc/cmdline | sed -e 's/^.*tinkerbell=//' -e 's/ .*$//')/ tinkerbell_post() { - system-docker run rancher/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"provisioning.$1\",\"body\":\"$2\"}" ${TINKERBELL_URL} + system-docker run burmilla/curl -X POST -H "Content-Type: application/json" -d "{\"type\":\"provisioning.$1\",\"body\":\"$2\"}" ${TINKERBELL_URL} } tinkerbell_post 104 "Connected to magic install system" @@ -123,7 +123,7 @@ umount /mnt/oem tinkerbell_post 106 "OEM drive configured" -METADATA=$(system-docker run rancher/curl -sL https://metadata.packet.net/metadata) +METADATA=$(system-docker run burmilla/curl -sL https://metadata.packet.net/metadata) eval $(echo ${METADATA} | jq -r '.network.addresses[] | select(.address_family == 4 and .public) | "ADDRESS=\(.address)/\(.cidr)\nGATEWAY=\(.gateway)"') eval $(echo ${METADATA} | jq -r '.network.interfaces[0] | "MAC=\(.mac)"') NETWORK_ARGS="rancher.network.interfaces.bond0.address=$ADDRESS rancher.network.interfaces.bond0.gateway=$GATEWAY rancher.network.interfaces.mac:${MAC}.bond=bond0" diff --git a/scripts/hosting/packet/test.sh b/scripts/hosting/packet/test.sh index 9a2c7ae1..63b876cd 100755 --- a/scripts/hosting/packet/test.sh +++ b/scripts/hosting/packet/test.sh @@ -64,8 +64,8 @@ $SCP ./scripts/hosting/packet/packet.sh $HOST:~/ #$SCP ./dist/artifacts/initrd $HOST:~/ #$SCP ./dist/artifacts/vmlinuz-4.9-rancher2 $HOST:~/vmlinuz -$SSH wget -c https://github.com/rancher/os/releases/download/v0.7.1/vmlinuz -$SSH wget -c https://github.com/rancher/os/releases/download/v0.7.1/initrd +$SSH wget -c https://github.com/burmilla/os/releases/download/v0.7.1/vmlinuz +$SSH wget -c https://github.com/burmilla/os/releases/download/v0.7.1/initrd #Install the kexec-tools package. diff --git a/scripts/images/raspberry-pi-hypriot64/.gitignore b/scripts/images/raspberry-pi-hypriot64/.gitignore index 96446f66..cf53dafb 100644 --- a/scripts/images/raspberry-pi-hypriot64/.gitignore +++ b/scripts/images/raspberry-pi-hypriot64/.gitignore @@ -1,2 +1,4 @@ dist rootfs_arm64.tar.gz +/Dockerfile.dapper* +!/Dockerfile.dapper diff --git a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper index 46ff0391..da4a22a5 100644 --- a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper +++ b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper @@ -8,12 +8,10 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ ca-certificates curl dosfstools tree zip RUN mkdir -p /source/assets -# RancherOS for ARM -#RUN curl -fL https://releases.rancher.com/os/latest/rootfs_arm64.tar.gz > /source/assets/rootfs_arm64.tar.gz COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz -ENV KERNEL_URL=https://github.com/Jason-ZW/os-rpi-kernel/releases/download/v4.14.114-rancher/4.14.114-rancheros-v8.tar.gz -ENV BOOTLOADER_URL=https://github.com/Jason-ZW/os-rpi-kernel/releases/download/v4.14.114-rancher/rpi-bootloader.tar.gz +ENV KERNEL_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v4.14.114-burmilla/4.14.114-rancheros-v8.tar.gz +ENV BOOTLOADER_URL=https://github.com/burmilla/os-rpi-kernel/releases/download/v4.14.114-burmilla/rpi-bootloader.tar.gz RUN curl -fL ${KERNEL_URL} > /source/assets/kernel.tar.gz RUN curl -fL ${BOOTLOADER_URL} > /source/assets/rpi-bootfiles.tar.gz diff --git a/scripts/images/raspberry-pi-hypriot64/scripts/build.sh b/scripts/images/raspberry-pi-hypriot64/scripts/build.sh index 877360a1..b596a046 100755 --- a/scripts/images/raspberry-pi-hypriot64/scripts/build.sh +++ b/scripts/images/raspberry-pi-hypriot64/scripts/build.sh @@ -92,8 +92,8 @@ umount build/root/boot umount build/root # package, compress and export image file -mv build/run.img build/rancheros-raspberry-pi64.img -zip dist/rancheros-raspberry-pi64.zip build/rancheros-raspberry-pi64.img +mv build/run.img build/burmillaos-raspberry-pi64.img +zip dist/burmillaos-raspberry-pi64.zip build/burmillaos-raspberry-pi64.img ls -alh dist # cleanup build environment diff --git a/scripts/installer/Dockerfile.amd64 b/scripts/installer/Dockerfile.amd64 index 2b837420..c22f62ec 100644 --- a/scripts/installer/Dockerfile.amd64 +++ b/scripts/installer/Dockerfile.amd64 @@ -1,4 +1,4 @@ -FROM rancher/os-installer +FROM burmilla/os-installer # TODO: separate out the elements below - so we can mix and match updates RUN rm /dist/ \ diff --git a/scripts/installer/Dockerfile.arm64 b/scripts/installer/Dockerfile.arm64 index 2b837420..c22f62ec 100644 --- a/scripts/installer/Dockerfile.arm64 +++ b/scripts/installer/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM rancher/os-installer +FROM burmilla/os-installer # TODO: separate out the elements below - so we can mix and match updates RUN rm /dist/ \ diff --git a/scripts/installer/README.md b/scripts/installer/README.md index c2704f3e..2fe4d73e 100644 --- a/scripts/installer/README.md +++ b/scripts/installer/README.md @@ -1,5 +1,5 @@ -# `rancher/os` installer container +# `burmilla/os` installer container The container can be used directly, but there is a wrapper in RancherOS CLI, `ros install`, that handles calling things in the right order. diff --git a/scripts/installer/conf/cloud-config-local.yml b/scripts/installer/conf/cloud-config-local.yml index 4067ba6e..b43b1675 100644 --- a/scripts/installer/conf/cloud-config-local.yml +++ b/scripts/installer/conf/cloud-config-local.yml @@ -1,4 +1,4 @@ rancher: cloud_init: datasources: - - file:/var/lib/rancher/conf/user_config.yml + - file:/var/lib/burmilla/conf/user_config.yml diff --git a/scripts/isolinux.cfg b/scripts/isolinux.cfg index 48358f96..9a9bb6be 100644 --- a/scripts/isolinux.cfg +++ b/scripts/isolinux.cfg @@ -8,12 +8,12 @@ INCLUDE ../global.cfg # each INCLUDEd file has a `DEFAULT mylabel` in it, and the last one wins LABEL rancheros-previous - MENU LABEL Previous RancherOS Version + MENU LABEL Previous BurmillaOS Version MENU DISABLE INCLUDE ../linux-previous.cfg LABEL rancheros-current - MENU LABEL Current RancherOS Version + MENU LABEL Current BurmillaOS Version MENU DISABLE INCLUDE ../linux-current.cfg @@ -22,8 +22,8 @@ LABEL Boot next BIOS option MENU LABEL Boot next BIOS option LOCALBOOT -1 -MENU TITLE RancherOS -MENU BACKGROUND ../rancher.png +MENU TITLE BurmillaOS +MENU BACKGROUND ../burmilla.png MENU WIDTH 80 MENU MARGIN 10 diff --git a/scripts/isolinux_label.cfg b/scripts/isolinux_label.cfg index fb8ba440..c72c578e 100644 --- a/scripts/isolinux_label.cfg +++ b/scripts/isolinux_label.cfg @@ -1,35 +1,35 @@ DEFAULT rancheros-${LABEL} LABEL rancheros-${LABEL} - SAY rancheros-${LABEL}: RancherOS ${VERSION} ${KERNEL_VERSION} - MENU LABEL RancherOS ${VERSION} ${KERNEL_VERSION} + SAY rancheros-${LABEL}: BurmillaOS ${VERSION} ${KERNEL_VERSION} + MENU LABEL BurmillaOS ${VERSION} ${KERNEL_VERSION} KERNEL ../vmlinuz-${KERNEL_VERSION} INITRD ../initrd-${VERSION} # see global.cfg for kernel boot parameters LABEL rancheros-${LABEL}-autologin - SAY rancheros-${LABEL}-autologin: autologin RancherOS ${VERSION} ${KERNEL_VERSION} + SAY rancheros-${LABEL}-autologin: autologin BurmillaOS ${VERSION} ${KERNEL_VERSION} MENU LABEL Autologin on tty1 and ttyS0 MENU INDENT 2 COM32 cmd.c32 APPEND rancheros-${LABEL} rancher.autologin=tty1 rancher.autologin=ttyS0 LABEL rancheros-${LABEL}-debug - SAY rancheros-${LABEL}-debug: debug RancherOS ${VERSION} ${KERNEL_VERSION} + SAY rancheros-${LABEL}-debug: debug BurmillaOS ${VERSION} ${KERNEL_VERSION} MENU LABEL Debug logging MENU INDENT 2 COM32 cmd.c32 APPEND rancheros-${LABEL} rancher.debug=true LABEL rancheros-${LABEL}-debug-autologin - SAY rancheros-${LABEL}-debug-autolgin: debug and autologin RancherOS ${VERSION} ${KERNEL_VERSION} + SAY rancheros-${LABEL}-debug-autolgin: debug and autologin BurmillaOS ${VERSION} ${KERNEL_VERSION} MENU LABEL Autologin on tty1 and ttyS0 plus Debug logging MENU INDENT 2 COM32 cmd.c32 APPEND rancheros-${LABEL} rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.debug=true LABEL rancheros-${LABEL}-recovery - SAY rancheros-${LABEL}-recovery: recovery console RancherOS ${VERSION} ${KERNEL_VERSION} + SAY rancheros-${LABEL}-recovery: recovery console BurmillaOS ${VERSION} ${KERNEL_VERSION} MENU LABEL Recovery console MENU INDENT 2 COM32 cmd.c32 diff --git a/scripts/layout-initrd b/scripts/layout-initrd index d5a29792..61f832e0 100755 --- a/scripts/layout-initrd +++ b/scripts/layout-initrd @@ -34,15 +34,15 @@ curl -SL ${!SYSTEM_DOCKER_URL} | tar --strip-components=1 -xzvf - -C ${INITRD_DI rm -f ${INITRD_DIR}/usr/bin/system-docker-proxy cat < ${INITRD_DIR}/usr/share/ros/os-release -NAME="RancherOS" +NAME="BurmillaOS" VERSION=${VERSION} -ID=rancheros +ID=burmillaos ID_LIKE= VERSION_ID=${VERSION} -PRETTY_NAME="RancherOS ${VERSION}" -HOME_URL="http://rancher.com/rancher-os/" -SUPPORT_URL="https://forums.rancher.com/c/rancher-os" -BUG_REPORT_URL="https://github.com/rancher/os/issues" +PRETTY_NAME="BurmillaOS ${VERSION}" +HOME_URL="https://burmilla.github.io" +SUPPORT_URL="https://github.com/burmilla/os/issues" +BUG_REPORT_URL="https://github.com/burmilla/os/issues" BUILD_ID= HERE @@ -56,9 +56,6 @@ for file in $(find . -type f -name ".make-*"); do ".make-4glte") cache_services "m/modem-manager.yml" ;; - ".make-pingan") - cache_services "p/pingan-amc.yml" - ;; ".make-hyperv") cache_services "h/hyperv-vm-tools.yml" ;; @@ -103,7 +100,7 @@ if [ -e ${DOWNLOADS}/policy.29 ]; then cp ${DOWNLOADS}/policy.29 ${INITRD_DIR}/usr/etc/selinux/ros/policy/ fi -# make rancher/os-initrd image +# make burmilla/os-initrd image cat < ${INITRD_DIR}/../Dockerfile.initrd FROM scratch COPY initrd/* / @@ -114,5 +111,5 @@ tag="${OS_REPO}/${name}:${VERSION}${SUFFIX}" pushd . cd ${INITRD_DIR}/.. docker build -t ${OS_REPO}/${name} -f Dockerfile.initrd . -docker tag rancher/${name} ${tag} +docker tag burmilla/${name} ${tag} popd diff --git a/scripts/layout-kernel b/scripts/layout-kernel index 318396ab..9d98a091 100755 --- a/scripts/layout-kernel +++ b/scripts/layout-kernel @@ -64,3 +64,7 @@ if [ "$ARCH" == "amd64" ]; then fi fi +if [ "$OS_FIRMWARE" = "false" ]; then + # the cloud images don't need firmware + rm -rf ${INITRD_DIR}/usr/lib/firmware +fi diff --git a/scripts/moby/Dockerfile b/scripts/moby/Dockerfile index ba03db7a..728d57d3 100644 --- a/scripts/moby/Dockerfile +++ b/scripts/moby/Dockerfile @@ -1,6 +1,6 @@ -FROM rancher/os +FROM burmilla/os -# replace this with `rancher/os-initrd` +# replace this with `burmilla/os-initrd` RUN mkdir /tmp/initrd \ && cd /tmp/initrd \ && cat /dist/initrd-* | gunzip | cpio -i \ @@ -13,8 +13,8 @@ RUN mkdir /tmp/initrd \ && cd / \ && rm -rf /tmp/initrd -#FROM rancher/os-installer +#FROM burmilla/os-installer #RUN cp /bin/ros /init -#FROM rancher/os-installer +#FROM burmilla/os-installer #RUN cp /bin/ros /init diff --git a/scripts/moby/rancheros.yml b/scripts/moby/rancheros.yml index 55ef6906..7f3ddd66 100644 --- a/scripts/moby/rancheros.yml +++ b/scripts/moby/rancheros.yml @@ -1,12 +1,12 @@ kernel: # image: "linuxkit/kernel:4.9.x" - image: "rancher/os-kernel:4.9.26-rancher" + image: "burmilla/os-kernel:4.9.26-rancher" # cmdline: "debug ignore_loglevel log_buf_len=10M print_fatal_signals=1 LOGLEVEL=8 earlyprintk sched_debug initcall_debug option.debug=Y break=y console=ttyS0 console=tty0 console=tty1 page_poison=1 printk.devkmsg=on rancher.debug=true rancher.password=rancher rancher.autologin=ttyS0 rancher.autologin=tty0 rancher.autologin=tty1" cmdline: 'printk.devkmsg=on rancher.debug=true rancher.password=rancher console=ttyS0 rancher.autologin=ttyS0 console=tty0 rancher.autologin=tty0 console=tty1 rancher.autologin=tty1 rancher.state.dev=LABEL=RANCHER_STATE rancher.state.autoformat=[/dev/sda,/dev/vda] rancher.rm_usr' init: - zombie/os -# - rancher/os-installer -# - rancher/os-initrd +# - burmilla/os-installer +# - burmilla/os-initrd #outputs: # - format: kernel+initrd # - format: iso-bios diff --git a/scripts/package-installer b/scripts/package-installer index 0c0cf84d..a39b6fb5 100755 --- a/scripts/package-installer +++ b/scripts/package-installer @@ -29,7 +29,7 @@ if [ "$OS_AUTOFORMAT" = "true" ]; then else cat scripts/global.cfg | envsubst > ${DIST}/boot/global.cfg fi -cp scripts/rancher.png ${DIST}/boot/ +cp scripts/burmilla.png ${DIST}/boot/ mkdir -p ./scripts/installer/build/boot diff --git a/scripts/rancher.png b/scripts/rancher.png deleted file mode 100644 index 0c2f2eed..00000000 Binary files a/scripts/rancher.png and /dev/null differ diff --git a/scripts/release-4glte b/scripts/release-4glte index 780fe853..b3fbe987 100755 --- a/scripts/release-4glte +++ b/scripts/release-4glte @@ -8,20 +8,7 @@ touch .make-4glte source ./scripts/version ./scripts/release-build -touch dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh +touch dist/publish.sh +chmod 755 dist/publish.sh -for file in $(ls dist/artifacts/); do - case $file in - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/4glte/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/4glte/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "rancheros.iso" | "rootfs.tar.gz") - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/4glte/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/4glte/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done - -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.iso --name rancheros-4glte.iso" > dist/publish.sh +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-4glte.iso" > dist/publish.sh diff --git a/scripts/release-amd64 b/scripts/release-amd64 index 364942b8..594a3a4b 100755 --- a/scripts/release-amd64 +++ b/scripts/release-amd64 @@ -6,36 +6,10 @@ cd $(dirname $0)/.. source ./scripts/version ./scripts/release-build -cat scripts/hosting/rancheros.ipxe | sed "s/latest/${VERSION}/g" > dist/artifacts/rancheros.ipxe - -echo "github-release release --user rancher --repo os --tag ${VERSION} --pre-release --draft" > dist/publish.sh +echo "github-release release --user burmilla --repo os --tag ${VERSION} --pre-release --draft" > dist/publish.sh chmod 755 dist/publish.sh -touch dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh - -for file in $(ls dist/artifacts/); do - case $file in - *"installer.tar" | "Dockerfile"*) - ;; - "initrd-"*) - echo "github-release upload --user rancher --repo os --tag ${VERSION} --file ./dist/artifacts/${file} --name initrd" >> dist/publish.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "vmlinuz-"*) - echo "github-release upload --user rancher --repo os --tag ${VERSION} --file ./dist/artifacts/${file} --name vmlinuz" >> dist/publish.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/vmlinuz" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/vmlinuz" >> ./dist/publish_gss_${VERSION}.sh - ;; - *) - echo "github-release upload --user rancher --repo os --tag ${VERSION} --file ./dist/artifacts/${file} --name ${file}" >> dist/publish.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac - -done +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file ./dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}.iso" >> dist/publish.sh echo >> dist/publish.sh @@ -44,6 +18,3 @@ cat dist/images | sed 's/^/docker push /' >> dist/publish.sh echo "--- Run dist/publish.sh" cat dist/publish.sh -echo "--- Run dist/publish_gss.sh" -cat dist/publish_gss_latest.sh -cat dist/publish_gss_${VERSION}.sh diff --git a/scripts/release-arm64 b/scripts/release-arm64 index 5019d2ca..659924b1 100755 --- a/scripts/release-arm64 +++ b/scripts/release-arm64 @@ -6,27 +6,5 @@ cd $(dirname $0)/.. source ./scripts/version ./scripts/release-build -touch dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh - -for file in $(ls dist/artifacts/); do - case $file in - *"installer.tar" | "Dockerfile"*) - ;; - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/arm64/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/arm64/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "vmlinuz-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/arm64/vmlinuz" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/arm64/vmlinuz" >> ./dist/publish_gss_${VERSION}.sh - ;; - *) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/arm64/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/arm64/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done - cat dist/images | sed 's/^/docker push /' >> dist/publish.sh chmod 755 dist/publish.sh diff --git a/scripts/release-azurebase b/scripts/release-azurebase index 0bc426a6..b10ace10 100755 --- a/scripts/release-azurebase +++ b/scripts/release-azurebase @@ -7,19 +7,3 @@ touch .make-azurebase source ./scripts/version ./scripts/release-build - -touch dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh - -for file in $(ls dist/artifacts/); do - case $file in - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/azure/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/azure/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "rancheros.iso" | "rootfs.tar.gz") - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/azure/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/azure/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done diff --git a/scripts/release-hyperv b/scripts/release-hyperv index acc36340..6987ec2d 100755 --- a/scripts/release-hyperv +++ b/scripts/release-hyperv @@ -8,20 +8,7 @@ touch .make-hyperv source ./scripts/version ./scripts/release-build -touch dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh +touch dist/publish.sh +chmod 755 dist/publish.sh -for file in $(ls dist/artifacts/); do - case $file in - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/hyperv/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/hyperv/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "rancheros.iso" | "rootfs.tar.gz") - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/hyperv/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/hyperv/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done - -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.iso --name rancheros-hyperv.iso" > dist/publish.sh +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-hyperv.iso" > dist/publish.sh diff --git a/scripts/release-pingan b/scripts/release-pingan deleted file mode 100755 index d3be58e5..00000000 --- a/scripts/release-pingan +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -ex - -cd $(dirname $0)/.. - -touch .make-pingan - -source ./scripts/version -./scripts/release-build - -touch dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh - -for file in $(ls dist/artifacts/); do - case $file in - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/pingan/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/pingan/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "rancheros.iso" | "rootfs.tar.gz") - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/pingan/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/pingan/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done diff --git a/scripts/release-proxmoxve b/scripts/release-proxmoxve index 3238feb2..9dc976a7 100755 --- a/scripts/release-proxmoxve +++ b/scripts/release-proxmoxve @@ -8,27 +8,7 @@ touch .make-proxmoxve source ./scripts/version ./scripts/release-build -touch dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh +touch dist/publish.sh +chmod 755 dist/publish.sh -if [ "$OS_AUTOFORMAT" = "true" ]; then - echo "gsutil cp dist/artifacts/rancheros.iso gs://releases.rancher.com/os/latest/proxmoxve/rancheros-autoformat.iso" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/rancheros.iso gs://releases.rancher.com/os/${VERSION}/proxmoxve/rancheros-autoformat.iso" >> ./dist/publish_gss_${VERSION}.sh - echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.iso --name rancheros-proxmoxve-autoformat.iso" > dist/publish.sh - exit 0 -fi - -for file in $(ls dist/artifacts/); do - case $file in - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/proxmoxve/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/proxmoxve/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "rancheros.iso" | "rootfs.tar.gz") - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/proxmoxve/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/proxmoxve/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done - -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.iso --name rancheros-proxmoxve.iso" > dist/publish.sh +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-proxmoxve.iso" > dist/publish.sh diff --git a/scripts/release-rpi64 b/scripts/release-rpi64 index 38bafb21..0712a483 100755 --- a/scripts/release-rpi64 +++ b/scripts/release-rpi64 @@ -15,11 +15,9 @@ pushd ./scripts/images/raspberry-pi-hypriot64/ ./../../../.dapper popd -cp ./scripts/images/raspberry-pi-hypriot64/dist/rancheros-raspberry-pi64.zip ./dist/artifacts/ +cp ./scripts/images/raspberry-pi-hypriot64/dist/burmillaos-raspberry-pi64.zip ./dist/artifacts/ -touch dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh +touch dist/publish.sh +chmod 755 dist/publish.sh -echo "gsutil cp dist/artifacts/rancheros-raspberry-pi64.zip gs://releases.rancher.com/os/latest/arm64/rancheros-raspberry-pi64.zip" >> ./dist/publish_gss_latest.sh -echo "gsutil cp dist/artifacts/rancheros-raspberry-pi64.zip gs://releases.rancher.com/os/${VERSION}/arm64/rancheros-raspberry-pi64.zip" >> ./dist/publish_gss_${VERSION}.sh -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros-raspberry-pi64.zip --name rancheros-raspberry-pi64.zip" > dist/publish.sh +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file dist/artifacts/burmillaos-raspberry-pi64.zip --name burmillaos-${VERSION}-raspberry-pi64.zip" >> dist/publish.sh diff --git a/scripts/release-vmware b/scripts/release-vmware index 91d0b9b0..6c27576c 100755 --- a/scripts/release-vmware +++ b/scripts/release-vmware @@ -8,68 +8,7 @@ touch .make-vmware source ./scripts/version ./scripts/release-build -touch dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh -chmod 755 dist/publish.sh dist/publish_gss_${VERSION}.sh dist/publish_gss_latest.sh +touch dist/publish.sh +chmod 755 dist/publish.sh -if [ "$OS_AUTOFORMAT" = "true" ]; then - echo "gsutil cp dist/artifacts/rancheros.iso gs://releases.rancher.com/os/latest/vmware/rancheros-autoformat.iso" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/rancheros.iso gs://releases.rancher.com/os/${VERSION}/vmware/rancheros-autoformat.iso" >> ./dist/publish_gss_${VERSION}.sh - # In order to be compatible with early links, like /latest/rancheros-vmware.iso, I have to do this. - echo "gsutil cp dist/artifacts/rancheros.iso gs://releases.rancher.com/os/latest/rancheros-vmware.iso" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/rancheros.iso gs://releases.rancher.com/os/${VERSION}/rancheros-vmware.iso" >> ./dist/publish_gss_${VERSION}.sh - echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.iso --name rancheros-vmware-autoformat.iso" > dist/publish.sh - exit 0 -fi - -mkdir -p /tmp/dist/openstack/latest ./dist/vmware - -cat > /tmp/dist/openstack/latest/user_data << EOF -#!/bin/bash -set -e - -trap "poweroff" EXIT - -mount -t 9p -o trans=virtio,version=9p2000.L config-2 /mnt - -touch log -sleep 5 -openvt -s -- tail -f log & -ros install \ - -d /dev/vda \ - -f \ - --no-reboot >log 2>&1 - -touch /mnt/success -EOF - -rm -f /tmp/dist/success - -qemu-img create -f qcow2 ./dist/vmware/vmdk.img 8G -kvm -curses \ - -drive if=virtio,file=./dist/vmware/vmdk.img \ - -cdrom ./dist/artifacts/rancheros.iso \ - -m 2048 \ - -fsdev local,id=conf,security_model=none,path=/tmp/dist \ - -device virtio-9p-pci,fsdev=conf,mount_tag=config-2 \ - -device virtio-rng-pci - -[ -f /tmp/dist/success ] - -echo "Converting ./dist/rancheros.vmdk" -qemu-img convert -f qcow2 -O vmdk ./dist/vmware/vmdk.img ./dist/artifacts/rancheros.vmdk - -for file in $(ls dist/artifacts/); do - case $file in - "initrd-"*) - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/vmware/initrd" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/vmware/initrd" >> ./dist/publish_gss_${VERSION}.sh - ;; - "rancheros.iso" | "rancheros.vmdk" | "rootfs.tar.gz") - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/latest/vmware/${file}" >> ./dist/publish_gss_latest.sh - echo "gsutil cp dist/artifacts/${file} gs://releases.rancher.com/os/${VERSION}/vmware/${file}" >> ./dist/publish_gss_${VERSION}.sh - ;; - esac -done - -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.iso --name rancheros-vmware.iso" >> dist/publish.sh -echo "github-release upload --user rancher --repo os --tag ${VERSION} --file dist/artifacts/rancheros.vmdk --name rancheros-vmware.vmdk" >> dist/publish.sh +echo "github-release upload --user burmilla --repo os --tag ${VERSION} --file dist/artifacts/burmillaos.iso --name burmillaos-${VERSION}-vmware.iso" >> dist/publish.sh diff --git a/scripts/ros b/scripts/ros index 640096f7..cf183d44 100755 --- a/scripts/ros +++ b/scripts/ros @@ -26,4 +26,4 @@ docker run --rm -it \ -v /usr/share/ca-certificates:/usr/share/ca-certificates \ -w /var/lib/rancher \ --entrypoint sh \ - rancher/os-base:v1.0.3 + burmilla/os-base:v1.0.3 diff --git a/scripts/run b/scripts/run index 15b847a1..7b6913f5 100755 --- a/scripts/run +++ b/scripts/run @@ -208,11 +208,11 @@ if [ "$QEMU" == "1" ] || [ "$BOOT_ISO" == "1" ] || [ "$BOOT_HD" == "1" ]; then if [ ! -e ${HD} ]; then mkdir -p $(dirname ${HD}) if [ "$USE_OPENSTACK_IMG" != "" ]; then - if [ ! -e "dist/artifacts/rancheros-${USE_OPENSTACK_IMG}.img" ]; then + if [ ! -e "dist/artifacts/burmillaos-${USE_OPENSTACK_IMG}.img" ]; then echo "please build the open stack image first (run make release)." exit 1 fi - cp dist/artifacts/rancheros-${USE_OPENSTACK_IMG}.img $HD + cp dist/artifacts/burmillaos-${USE_OPENSTACK_IMG}.img $HD qemu-img resize ${HD} 70GB else if [ ¨$INSTALLED¨ == ¨1¨ ]; then @@ -336,7 +336,7 @@ if [ "$QEMU" == "1" ]; then elif [ "$BOOT_ISO" == "1" ] || [ "$BOOT_HD" == "1" ]; then if [ "$BOOT_ISO" == "1" ]; then - ISO_OPTS="-boot c -cdrom ./dist/artifacts/rancheros.iso \ + ISO_OPTS="-boot c -cdrom ./dist/artifacts/burmillaos.iso \ -fsdev local,security_model=none,id=fsdev1,path=${HOME} \ -device virtio-9p-pci,id=fs1,fsdev=fsdev1,mount_tag=home " echo "----- $ISO_OPTS" @@ -386,7 +386,7 @@ elif [ "$QIND" == "1" ]; then set -x docker create --name=${NAME} -it ${KVM_ENABLE} \ - rancher/qind \ + burmilla/qind \ --hostname "rancher-dev" \ ${CLOUD_CONFIG_ENABLE} \ ${SSH_PUB_ENABLE} \ diff --git a/scripts/run-install b/scripts/run-install index 14e05e26..182b0f41 100755 --- a/scripts/run-install +++ b/scripts/run-install @@ -10,7 +10,7 @@ source ./scripts/version BASE=$(pwd) STATE=/tmp -DISK=${STATE}/rancheros.img +DISK=${STATE}/burmillaos.img CONFIG=${STATE}/cloud-config.yml export LOOPBACK=$(losetup -f) PARTITION=$(echo "${LOOPBACK}p1" | sed 's/dev/dev\/mapper/') @@ -48,7 +48,7 @@ sudo kpartx -a ${DISK} docker run --privileged -it --rm \ -v /dev/mapper:/dev/mapper \ -v ${STATE}:/cluster \ - rancher/os:${VERSION} \ + burmilla/os:${VERSION} \ --isoinstallerloaded=1 \ --force \ --no-reboot \ diff --git a/scripts/run-moby b/scripts/run-moby index f7201d50..a4368643 100755 --- a/scripts/run-moby +++ b/scripts/run-moby @@ -7,8 +7,8 @@ if [ "1" == "2" ]; then else qemu-system-x86_64 \ -nographic \ - -kernel ./rancheros-kernel \ - -initrd ./rancheros-initrd.img \ + -kernel ./burmillaos-kernel \ + -initrd ./burmillaos-initrd.img \ -m 2048 \ -device virtio-rng-pci \ -smp 1 \ diff --git a/scripts/tar-images b/scripts/tar-images index d2f0a15f..4a0cc282 100755 --- a/scripts/tar-images +++ b/scripts/tar-images @@ -1,8 +1,8 @@ #!/bin/bash set -ex -INIT_DEP="rancher/os-bootstrap" -SHARED_DEP="rancher/os-base" +INIT_DEP="burmilla/os-bootstrap" +SHARED_DEP="burmilla/os-base" INIT_IMAGES_DST="build/images-init.tar" SYSTEM_IMAGES_DST="build/images-system.tar" USER_IMAGES_DST="build/images-user.tar" diff --git a/scripts/tools/collect_rancheros_info.sh b/scripts/tools/collect_rancheros_info.sh index 7214857f..181f2778 100755 --- a/scripts/tools/collect_rancheros_info.sh +++ b/scripts/tools/collect_rancheros_info.sh @@ -5,7 +5,7 @@ # 1. Login to your rancheros and switch to root # $ sudo su - root # 2. Collecting rancheros information -# # curl https://raw.githubusercontent.com/rancher/os/master/scripts/tools/collect_rancheros_info.sh | sh +# # curl https://raw.githubusercontent.com/burmilla/os/master/scripts/tools/collect_rancheros_info.sh | sh set -e # /var/log directory diff --git a/scripts/tools/flush_crt_iso.sh b/scripts/tools/flush_crt_iso.sh index 1f3db016..7e6ed882 100755 --- a/scripts/tools/flush_crt_iso.sh +++ b/scripts/tools/flush_crt_iso.sh @@ -3,10 +3,10 @@ # How to use: # make shell-bind # cd scripts/tools/ -# wget https://link/rancheros-xxx.iso +# wget https://link/burmillaos-xxx.iso # wget http://link/custom.crt # -# ./flush_crt_iso.sh --iso rancheros-vmware-autoformat.iso --cert custom.crt +# ./flush_crt_iso.sh --iso burmillaos-vmware-autoformat.iso --cert custom.crt # # or # ./flush_crt_iso.sh --initrd initrd-xxxx --cert custom.crt # diff --git a/scripts/tools/flush_crt_nbd.sh b/scripts/tools/flush_crt_nbd.sh index a9689639..56ee61f0 100644 --- a/scripts/tools/flush_crt_nbd.sh +++ b/scripts/tools/flush_crt_nbd.sh @@ -3,10 +3,10 @@ # How to use: # make shell-bind # cd scripts/tools/ -# wget https://link/rancheros-xxx.img +# wget https://link/burmillaos-xxx.img # wget http://link/custom.crt # -# ./flush_crt_nbd.sh --img rancheros-openstack.img --cert custom.crt +# ./flush_crt_nbd.sh --img burmillaos-openstack.img --cert custom.crt # # or # ./flush_crt_nbd.sh --initrd initrd-xxxx --cert custom.crt #