Roll back kernel and os-base because of the zfs issue

kernel: 4.9.80
os-base: v2017.02.10-1

.gitignore

@@ -17,3 +17,4 @@ __pycache__
 /.dapper
 /.trash-cache
 .idea
+.trash-conf

Dockerfile.dapper

@@ -35,7 +35,8 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox
         vim \
         wget \
         xorriso \
-	telnet
+        xz-utils \
+        telnet
 
 ########## Dapper Configuration #####################
 
@@ -63,7 +64,7 @@ ARG DOCKER_BUILD_VERSION=1.10.3
 ARG DOCKER_BUILD_PATCH_VERSION=v${DOCKER_BUILD_VERSION}-ros1
 ARG SELINUX_POLICY_URL=https://github.com/rancher/refpolicy/releases/download/v0.0.3/policy.29
 
-ARG KERNEL_VERSION_amd64=4.9.75-rancher
+ARG KERNEL_VERSION_amd64=4.9.80-rancher
 ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/v${KERNEL_VERSION_amd64}/linux-${KERNEL_VERSION_amd64}-x86.tar.gz
 
 ARG DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz
@@ -78,8 +79,12 @@ ARG OS_SERVICES_REPO=https://raw.githubusercontent.com/${OS_REPO}/os-services
 ARG IMAGE_NAME=${OS_REPO}/os
 ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-2
 
-ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2017.02.9-1/os-base_amd64.tar.xz
-ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2017.02.9-1/os-base_arm64.tar.xz
+ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2017.02.10-1/os-base_amd64.tar.xz
+ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2017.02.10-1/os-base_arm64.tar.xz
+
+ARG SYSTEM_DOCKER_VERSION=17.06-ros3
+ARG SYSTEM_DOCKER_URL_amd64=https://github.com/niusmallnan/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-amd64-${SYSTEM_DOCKER_VERSION}.tgz
+ARG SYSTEM_DOCKER_URL_arm64=https://github.com/niusmallnan/os-system-docker/releases/download/${SYSTEM_DOCKER_VERSION}/docker-arm64-${SYSTEM_DOCKER_VERSION}.tgz
 ######################################################
 
 # Set up environment and export all ARGS as ENV
@@ -115,7 +120,10 @@ ENV BUILD_DOCKER_URL=BUILD_DOCKER_URL_${ARCH} \
     OS_REPO=${OS_REPO} \
     OS_SERVICES_REPO=${OS_SERVICES_REPO} \
     REPO_VERSION=master \
-    SELINUX_POLICY_URL=${SELINUX_POLICY_URL}
+    SELINUX_POLICY_URL=${SELINUX_POLICY_URL} \
+    SYSTEM_DOCKER_URL=SYSTEM_DOCKER_URL_${ARCH} \
+    SYSTEM_DOCKER_URL_amd64=${SYSTEM_DOCKER_URL_amd64} \
+    SYSTEM_DOCKER_URL_arm64=${SYSTEM_DOCKER_URL_arm64}
 ENV PATH=${GOPATH}/bin:/usr/local/go/bin:$PATH
 
 RUN mkdir -p ${DOWNLOADS}
@@ -131,24 +139,13 @@ RUN echo "... Downloading  ${!KERNEL_URL}"; \
 RUN curl -pfL ${SELINUX_POLICY_URL} > ${DOWNLOADS}/$(basename ${SELINUX_POLICY_URL})
 
 # Install Go
-RUN ln -sf go-6 /usr/bin/go && \
-    curl -sfL https://storage.googleapis.com/golang/go${GO_VERSION}.src.tar.gz | tar -xzf - -C /usr/local && \
-    cd /usr/local/go/src && \
-    GOROOT_BOOTSTRAP=/usr GOARCH=${HOST_ARCH} GOHOSTARCH=${HOST_ARCH} ./make.bash && \
-    rm /usr/bin/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/golang/lint/golint
 
 # Install Host Docker
 RUN curl -fL ${!BUILD_DOCKER_URL} > /usr/bin/docker && \
     chmod +x /usr/bin/docker
 
-# Install Trash
-RUN go get github.com/rancher/trash
-
-# Install golint
-RUN go get github.com/golang/lint/golint
-
-RUN go get gopkg.in/check.v1
-
 # Install dapper
 RUN curl -sL https://releases.rancher.com/dapper/latest/dapper-`uname -s`-`uname -m | sed 's/arm.*/arm/'` > /usr/bin/dapper && \
     chmod +x /usr/bin/dapper

Makefile

@@ -51,10 +51,10 @@ itest:
 qcows:
 	cp dist/artifacts/rancheros.iso scripts/images/openstack/
 	cd scripts/images/openstack && \
-		APPEND="console=tty1 console=ttyS0,115200n8 printk.devkmsg=on rancher.autologin=ttyS0" \
+		APPEND="console=tty1 console=ttyS0,115200n8 printk.devkmsg=on rancher.autologin=ttyS0 panic=10" \
 		NAME=openstack ../../../.dapper
 	cd scripts/images/openstack && \
-		APPEND="console=tty1 printk.devkmsg=on notsc clocksource=kvm-clock rancher.network.interfaces.eth0.ipv4ll rancher.cloud_init.datasources=[digitalocean] rancher.autologin=tty1 rancher.autologin=ttyS0" \
+		APPEND="console=tty1 printk.devkmsg=on notsc clocksource=kvm-clock rancher.network.interfaces.eth0.ipv4ll rancher.cloud_init.datasources=[digitalocean] rancher.autologin=tty1 rancher.autologin=ttyS0 panic=10 rancher.resize_device=/dev/vda" \
 		NAME=digitalocean ../../../.dapper
 	cp ./scripts/images/openstack/dist/*.img dist/artifacts/
 

README.md

@@ -14,12 +14,12 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet
 
 ## Stable Release
 
-**v1.1.3 - Docker 17.06.2-ce - Linux 4.9.75**
+**v1.2.0 - Docker 17.09.1-ce - Linux 4.9.78**
 
 ### ISO
 
 - https://releases.rancher.com/os/latest/rancheros.iso
-- https://releases.rancher.com/os/v1.1.3/rancheros.iso
+- https://releases.rancher.com/os/v1.2.0/rancheros.iso
 
 ### Additional Downloads
 
@@ -35,17 +35,24 @@ it would really be bad if somebody did `docker rm -f $(docker ps -qa)` and delet
 * https://releases.rancher.com/os/latest/rootfs.tar.gz
 * https://releases.rancher.com/os/latest/vmlinuz
 
-#### v1.1.3 Links
+#### v1.2.0 Links
 
-* https://releases.rancher.com/os/v1.1.3/initrd
-* https://releases.rancher.com/os/v1.1.3/iso-checksums.txt
-* https://releases.rancher.com/os/v1.1.3/rancheros-openstack.img
-* https://releases.rancher.com/os/v1.1.3/rancheros-digitalocean.img
-* https://releases.rancher.com/os/v1.1.3/rancheros-aliyun.vhd
-* https://releases.rancher.com/os/v1.1.3/rancheros.ipxe
-* https://releases.rancher.com/os/v1.1.3/rancheros-gce.tar.gz
-* https://releases.rancher.com/os/v1.1.3/rootfs.tar.gz
-* https://releases.rancher.com/os/v1.1.3/vmlinuz
+* https://releases.rancher.com/os/v1.2.0/initrd
+* https://releases.rancher.com/os/v1.2.0/iso-checksums.txt
+* https://releases.rancher.com/os/v1.2.0/rancheros-openstack.img
+* https://releases.rancher.com/os/v1.2.0/rancheros-digitalocean.img
+* https://releases.rancher.com/os/v1.2.0/rancheros-aliyun.vhd
+* https://releases.rancher.com/os/v1.2.0/rancheros.ipxe
+* https://releases.rancher.com/os/v1.2.0/rancheros-gce.tar.gz
+* https://releases.rancher.com/os/v1.2.0/rootfs.tar.gz
+* https://releases.rancher.com/os/v1.2.0/vmlinuz
+
+#### ARM Links
+
+* https://releases.rancher.com/os/latest/rootfs_arm64.tar.gz
+* https://releases.rancher.com/os/latest/rancheros-raspberry-pi64.zip
+* https://releases.rancher.com/os/v1.2.0/rootfs_arm64.tar.gz
+* https://releases.rancher.com/os/v1.2.0/rancheros-raspberry-pi64.zip
 
 **Note**: you can use `http` instead of `https` in the above URLs, e.g. for iPXE.
 
@@ -57,21 +64,21 @@ SSH keys are added to the **`rancher`** user, so you must log in using the **ran
 
 Region | Type | AMI |
 -------|------|------
-ap-south-1 | HVM | [ami-74a0f41b](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-74a0f41b)
-eu-west-3 | HVM | [ami-7503b408](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-7503b408)
-eu-west-2 | HVM | [ami-0d938b69](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-0d938b69)
-eu-west-1 | HVM | [ami-be0293c7](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-be0293c7)
-ap-northeast-2 | HVM | [ami-e8af0f86](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-e8af0f86)
-ap-northeast-1 | HVM | [ami-a873edce](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-a873edce)
-sa-east-1 | HVM | [ami-c11153ad](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-c11153ad)
-ca-central-1 | HVM | [ami-d3f471b7](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-d3f471b7)
-ap-southeast-1 | HVM | [ami-647e0e18](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-647e0e18)
-ap-southeast-2 | HVM | [ami-3643b154](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-3643b154)
-eu-central-1 | HVM | [ami-4c22b123](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-4c22b123)
-us-east-1 | HVM | [ami-72613d08](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-72613d08)
-us-east-2 | HVM | [ami-67d1fa02](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-67d1fa02)
-us-west-1 | HVM | [ami-16cdcd76](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-16cdcd76)
-us-west-2 | HVM | [ami-8916a3f1](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-8916a3f1)
+ap-south-1 | HVM | [ami-12db887d](https://ap-south-1.console.aws.amazon.com/ec2/home?region=ap-south-1#launchInstanceWizard:ami=ami-12db887d)
+eu-west-3 | HVM | [ami-d5a315a8](https://eu-west-3.console.aws.amazon.com/ec2/home?region=eu-west-3#launchInstanceWizard:ami=ami-d5a315a8)
+eu-west-2 | HVM | [ami-80bd58e7](https://eu-west-2.console.aws.amazon.com/ec2/home?region=eu-west-2#launchInstanceWizard:ami=ami-80bd58e7)
+eu-west-1 | HVM | [ami-69187010](https://eu-west-1.console.aws.amazon.com/ec2/home?region=eu-west-1#launchInstanceWizard:ami=ami-69187010)
+ap-northeast-2 | HVM | [ami-57dd7f39](https://ap-northeast-2.console.aws.amazon.com/ec2/home?region=ap-northeast-2#launchInstanceWizard:ami=ami-57dd7f39)
+ap-northeast-1 | HVM | [ami-a3c2b5c5](https://ap-northeast-1.console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchInstanceWizard:ami=ami-a3c2b5c5)
+sa-east-1 | HVM | [ami-6c2f6100](https://sa-east-1.console.aws.amazon.com/ec2/home?region=sa-east-1#launchInstanceWizard:ami=ami-6c2f6100)
+ca-central-1 | HVM | [ami-b8a622dc](https://ca-central-1.console.aws.amazon.com/ec2/home?region=ca-central-1#launchInstanceWizard:ami=ami-b8a622dc)
+ap-southeast-1 | HVM | [ami-0f5a1b73](https://ap-southeast-1.console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchInstanceWizard:ami=ami-0f5a1b73)
+ap-southeast-2 | HVM | [ami-edc73c8f](https://ap-southeast-2.console.aws.amazon.com/ec2/home?region=ap-southeast-2#launchInstanceWizard:ami=ami-edc73c8f)
+eu-central-1 | HVM | [ami-28422647](https://eu-central-1.console.aws.amazon.com/ec2/home?region=eu-central-1#launchInstanceWizard:ami=ami-28422647)
+us-east-1 | HVM | [ami-a7151cdd](https://us-east-1.console.aws.amazon.com/ec2/home?region=us-east-1#launchInstanceWizard:ami=ami-a7151cdd)
+us-east-2 | HVM | [ami-a383b6c6](https://us-east-2.console.aws.amazon.com/ec2/home?region=us-east-2#launchInstanceWizard:ami=ami-a383b6c6)
+us-west-1 | HVM | [ami-c4b3bca4](https://us-west-1.console.aws.amazon.com/ec2/home?region=us-west-1#launchInstanceWizard:ami=ami-c4b3bca4)
+us-west-2 | HVM | [ami-6e1a9e16](https://us-west-2.console.aws.amazon.com/ec2/home?region=us-west-2#launchInstanceWizard:ami=ami-6e1a9e16)
 
 Additionally, images are available with support for Amazon EC2 Container Service (ECS) [here](https://docs.rancher.com/os/amazon-ecs/#amazon-ecs-enabled-amis).
 
@@ -79,7 +86,7 @@ Additionally, images are available with support for Amazon EC2 Container Service
 
 We are providing a disk image that users can download and import for use in Google Compute Engine. The image can be obtained from the release artifacts for RancherOS.
 
-[Download Image](https://releases.rancher.com/os/v1.1.3/rancheros-gce.tar.gz)
+[Download Image](https://releases.rancher.com/os/v1.2.0/rancheros-gce.tar.gz)
 
 Please follow the directions at our [docs to launch in GCE](http://docs.rancher.com/os/running-rancheros/cloud/gce/).
 

cmd/control/console_init.go

@@ -86,7 +86,7 @@ func consoleInitFunc() error {
 		log.Error(err)
 	}
 
-	if err := modifySshdConfig(); err != nil {
+	if err := modifySshdConfig(cfg); err != nil {
 		log.Error(err)
 	}
 
@@ -242,19 +242,28 @@ func writeRespawn(user string, sshd, recovery bool) error {
 	return ioutil.WriteFile("/etc/respawn.conf", []byte(respawn), 0644)
 }
 
-func modifySshdConfig() error {
+func modifySshdConfig(cfg *config.CloudConfig) error {
 	sshdConfig, err := ioutil.ReadFile("/etc/ssh/sshd_config")
 	if err != nil {
 		return err
 	}
 	sshdConfigString := string(sshdConfig)
 
-	for _, item := range []string{
+	modifiedLines := []string{
 		"UseDNS no",
 		"PermitRootLogin no",
 		"ServerKeyBits 2048",
 		"AllowGroups docker",
-	} {
+	}
+
+	if cfg.Rancher.SSH.Port > 0 && cfg.Rancher.SSH.Port < 65355 {
+		modifiedLines = append(modifiedLines, fmt.Sprintf("Port %d", cfg.Rancher.SSH.Port))
+	}
+	if cfg.Rancher.SSH.ListenAddress != "" {
+		modifiedLines = append(modifiedLines, fmt.Sprintf("ListenAddress %s", cfg.Rancher.SSH.ListenAddress))
+	}
+
+	for _, item := range modifiedLines {
 		match, err := regexp.Match("^"+item, sshdConfig)
 		if err != nil {
 			return err

cmd/control/entrypoint.go

@@ -85,7 +85,6 @@ func setupCommandSymlinks() {
 		{config.RosBin, "/usr/bin/cloud-init-save"},
 		{config.RosBin, "/usr/bin/dockerlaunch"},
 		{config.RosBin, "/usr/bin/respawn"},
-		{config.RosBin, "/usr/bin/system-docker"},
 		{config.RosBin, "/usr/sbin/netconf"},
 		{config.RosBin, "/usr/sbin/wait-for-docker"},
 		{config.RosBin, "/usr/sbin/poweroff"},

cmd/control/install.go

@@ -121,7 +121,11 @@ func installAction(c *cli.Context) error {
 	image := c.String("image")
 	cfg := config.LoadConfig()
 	if image == "" {
-		image = cfg.Rancher.Upgrade.Image + ":" + config.Version + config.Suffix
+		image = fmt.Sprintf("%s:%s%s",
+			cfg.Rancher.Upgrade.Image,
+			config.Version,
+			config.Suffix)
+		image = formatImage(image, cfg)
 	}
 
 	installType := c.String("install-type")
@@ -202,7 +206,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 	}
 
 	// Versions before 0.8.0-rc3 use the old calling convention (from the lay-down-os shell script)
-	imageVersion := strings.TrimPrefix(image, "rancher/os:")
+	imageVersion := strings.Split(image, ":")[1]
 	if version.GreaterThan("v0.8.0-rc3", imageVersion) {
 		log.Infof("user specified to install pre v0.8.0: %s", image)
 		imageVersion = strings.Replace(imageVersion, "-", ".", -1)
@@ -230,11 +234,11 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 		}
 	}
 
-	if _, err := os.Stat("/usr/bin/system-docker"); os.IsNotExist(err) {
-		if err := os.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != nil {
-			log.Errorf("ln error %s", err)
-		}
-	}
+	//if _, err := os.Stat("/usr/bin/system-docker"); os.IsNotExist(err) {
+	//if err := os.Symlink("/usr/bin/ros", "/usr/bin/system-docker"); err != nil {
+	//log.Errorf("ln error %s", err)
+	//}
+	//}
 
 	useIso := false
 	// --isoinstallerloaded is used if the ros has created the installer container from and image that was on the booted iso
@@ -256,7 +260,7 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 					cmd := exec.Command("system-docker", "load", "-i", "/bootiso/rancheros/installer.tar.gz")
 					cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
 					if err := cmd.Run(); err != nil {
-						log.Infof("failed to load images from /bootiso/rancheros: %s", err)
+						log.Infof("failed to load images from /bootiso/rancheros: %v", err)
 					} else {
 						log.Infof("Loaded images from /bootiso/rancheros/installer.tar.gz")
 
@@ -376,20 +380,32 @@ func runInstall(image, installType, cloudConfig, device, partition, statedir, ka
 	return nil
 }
 
+func getDeviceByLabel(label string) (string, string) {
+	d, t, err := util.Blkid(label)
+	if err != nil {
+		log.Warnf("Failed to run blkid for %s", label)
+		return "", ""
+	}
+	return d, t
+}
+
 func getBootIso() (string, string, error) {
 	deviceName := "/dev/sr0"
 	deviceType := "iso9660"
-	d, t, err := util.Blkid("RancherOS")
-	if err != nil {
-		return "", "", errors.Wrap(err, "Failed to run blkid")
-	}
-	if d != "" {
-		deviceName = d
-		deviceType = t
+
+	// Our ISO LABEL is RancherOS
+	// But some tools(like rufus) will change LABEL to RANCHEROS
+	for _, label := range []string{"RancherOS", "RANCHEROS"} {
+		d, t := getDeviceByLabel(label)
+		if d != "" {
+			deviceName = d
+			deviceType = t
+			continue
+		}
 	}
 
 	// Check the sr deive if exist
-	if _, err = os.Stat(deviceName); os.IsNotExist(err) {
+	if _, err := os.Stat(deviceName); os.IsNotExist(err) {
 		return "", "", err
 	}
 
@@ -435,7 +451,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, statedir, kap
 	//cloudConfig := SCRIPTS_DIR + "/conf/empty.yml" //${cloudConfig:-"${SCRIPTS_DIR}/conf/empty.yml"}
 	CONSOLE := "tty0"
 	baseName := "/mnt/new_img"
-	kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait" // console="+CONSOLE
+	kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait panic=10" // console="+CONSOLE
 	if statedir != "" {
 		kernelArgs = kernelArgs + " rancher.state.directory=" + statedir
 	}

cmd/control/os.go

@@ -117,7 +117,18 @@ func getImages() (*Images, error) {
 		}
 	}
 
-	return parseBody(body)
+	images, err := parseBody(body)
+	if err != nil {
+		return nil, err
+	}
+
+	cfg := config.LoadConfig()
+	images.Current = formatImage(images.Current, cfg)
+	for i := len(images.Available) - 1; i >= 0; i-- {
+		images.Available[i] = formatImage(images.Available[i], cfg)
+	}
+
+	return images, nil
 }
 
 func osMetaDataGet(c *cli.Context) error {
@@ -133,6 +144,7 @@ func osMetaDataGet(c *cli.Context) error {
 
 	cfg := config.LoadConfig()
 	runningName := cfg.Rancher.Upgrade.Image + ":" + config.Version
+	runningName = formatImage(runningName, cfg)
 
 	foundRunning := false
 	for i := len(images.Available) - 1; i >= 0; i-- {
@@ -210,7 +222,7 @@ func osVersion(c *cli.Context) error {
 	return nil
 }
 
-func startUpgradeContainer(image string, stage, force, reboot, kexec, debug bool, upgradeConsole bool, kernelArgs string) error {
+func startUpgradeContainer(image string, stage, force, reboot, kexec, upgradeConsole, debug bool, kernelArgs string) error {
 	command := []string{
 		"-t", "rancher-upgrade",
 		"-r", config.Version,

cmd/control/recovery_init.go

@@ -5,8 +5,8 @@ import (
 	"os/exec"
 	"syscall"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
+	"github.com/rancher/os/log"
 )
 
 func recoveryInitAction(c *cli.Context) error {

cmd/control/user_docker.go

@@ -175,14 +175,14 @@ func startDocker(cfg *config.CloudConfig) error {
 		return err
 	}
 
-	cmd := []string{"docker-runc", "exec", "--", info.ID, "env"}
+	cmd := []string{"system-docker-runc", "exec", "--", info.ID, "env"}
 	log.Info(dockerCfg.AppendEnv())
 	cmd = append(cmd, dockerCfg.AppendEnv()...)
 	cmd = append(cmd, dockerCommand...)
 	cmd = append(cmd, args...)
 	log.Infof("Running %v", cmd)
 
-	return syscall.Exec("/usr/bin/ros", cmd, os.Environ())
+	return syscall.Exec("/usr/bin/system-docker-runc", cmd, os.Environ())
 }
 
 func waitForPid(service string, project *project.Project) (int, error) {

cmd/control/util.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/rancher/os/config"
 	"github.com/rancher/os/log"
 )
 
@@ -19,3 +20,11 @@ func yes(question string) bool {
 
 	return strings.ToLower(line[0:1]) == "y"
 }
+
+func formatImage(image string, cfg *config.CloudConfig) string {
+	domainRegistry := cfg.Rancher.Environment["REGISTRY_DOMAIN"]
+	if domainRegistry != "docker.io" && domainRegistry != "" {
+		return fmt.Sprintf("%s/%s", domainRegistry, image)
+	}
+	return image
+}

cmd/network/network.go

@@ -70,7 +70,7 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) {
 	}
 
 	resolve, err := ioutil.ReadFile("/etc/resolv.conf")
-	log.Debugf("Resolve.conf == [%s], %s", resolve, err)
+	log.Debugf("Resolve.conf == [%s], %v", resolve, err)
 
 	log.Infof("Apply Network Config SyncHostname")
 	if err := hostname.SyncHostname(); err != nil {

cmd/power/power.go

@@ -38,14 +38,15 @@ func runDocker(name string) error {
 		return err
 	}
 
-	cmd := []string{name}
-	containerName := strings.TrimPrefix(strings.Join(strings.Split(name, "/"), "-"), "-")
+	cmd := os.Args
+	log.Debugf("runDocker cmd: %s", cmd)
 
 	if name == "" {
 		name = filepath.Base(os.Args[0])
-		cmd = os.Args
 	}
 
+	containerName := strings.TrimPrefix(strings.Join(strings.Split(name, "/"), "-"), "-")
+
 	existing, err := client.ContainerInspect(context.Background(), containerName)
 	if err == nil && existing.ID != "" {
 		err := client.ContainerRemove(context.Background(), types.ContainerRemoveOptions{

cmd/power/shutdown.go

@@ -27,7 +27,7 @@ func Shutdown() {
 	log.InitLogger()
 	app := cli.NewApp()
 
-	app.Name = os.Args[0]
+	app.Name = filepath.Base(os.Args[0])
 	app.Usage = fmt.Sprintf("%s RancherOS\nbuilt: %s", app.Name, config.BuildDate)
 	app.Version = config.Version
 	app.Author = "Rancher Labs, Inc."
@@ -94,13 +94,22 @@ func Shutdown() {
 	if app.Name == "poweroff" {
 		app.Flags = append(app.Flags, cli.BoolTFlag{
 			Name:        "P, poweroff",
-			Usage:       "halt the machine",
+			Usage:       "poweroff the machine",
 			Destination: &poweroffFlag,
 		})
 	} else {
+		//  shutdown -h
+		//        Equivalent to --poweroff
+		if app.Name == "shutdown" {
+			app.Flags = append(app.Flags, cli.BoolFlag{
+				Name:        "h",
+				Usage:       "poweroff the machine",
+				Destination: &poweroffFlag,
+			})
+		}
 		app.Flags = append(app.Flags, cli.BoolFlag{
 			Name:        "P, poweroff",
-			Usage:       "halt the machine",
+			Usage:       "poweroff the machine",
 			Destination: &poweroffFlag,
 		})
 	}
@@ -181,6 +190,7 @@ func Kexec(previous bool, bootDir, append string) error {
 // Reboot is used by installation / upgrade
 // TODO: add kexec option
 func Reboot() {
+	os.Args = []string{"reboot"}
 	reboot("reboot", false, syscall.LINUX_REBOOT_CMD_RESTART)
 }
 
@@ -197,7 +207,12 @@ func shutdown(c *cli.Context) error {
 	}
 
 	timeArg := c.Args().Get(0)
-	if c.App.Name == "shutdown" && timeArg != "" {
+	// We may be called via an absolute path, so check that now and make sure we
+	// don't pass the wrong app name down. Aside from the logic in the immediate
+	// context here, the container name is derived from how we were called and
+	// cannot contain slashes.
+	appName := filepath.Base(c.App.Name)
+	if appName == "shutdown" && timeArg != "" {
 		if timeArg != "now" {
 			err := fmt.Errorf("Sorry, can't parse '%s' as time value (only 'now' supported)", timeArg)
 			log.Error(err)
@@ -206,7 +221,7 @@ func shutdown(c *cli.Context) error {
 		// TODO: if there are more params, LOG them
 	}
 
-	reboot(c.App.Name, forceFlag, powerCmd)
+	reboot(appName, forceFlag, powerCmd)
 
 	return nil
 }

cmd/sysinit/sysinit.go

@@ -1,17 +1,18 @@
 package sysinit
 
 import (
-	initPkg "github.com/rancher/os/init"
-	"github.com/rancher/os/log"
 	"io/ioutil"
 	"os"
+
+	initPkg "github.com/rancher/os/init"
+	"github.com/rancher/os/log"
 )
 
 func Main() {
 	log.InitLogger()
 
 	resolve, err := ioutil.ReadFile("/etc/resolv.conf")
-	log.Infof("2Resolv.conf == [%s], %s", resolve, err)
+	log.Infof("Resolv.conf == [%s], %v", resolve, err)
 	log.Infof("Exec %v", os.Args)
 
 	if err := initPkg.SysInit(); err != nil {

cmd/systemdocker/system-docker.go

@@ -1,23 +0,0 @@
-package systemdocker
-
-import (
-	"os"
-
-	"github.com/docker/docker/docker"
-	"github.com/rancher/os/config"
-	"github.com/rancher/os/log"
-)
-
-func Main() {
-	log.SetLevel(log.DebugLevel)
-
-	if os.Geteuid() != 0 {
-		log.Fatalf("%s: Need to be root", os.Args[0])
-	}
-
-	if os.Getenv("DOCKER_HOST") == "" {
-		os.Setenv("DOCKER_HOST", config.SystemDockerHost)
-	}
-
-	docker.RancherOSMain()
-}

config/cloudinit/datasource/url/url.go

@@ -34,7 +34,7 @@ func NewDatasource(url string) *RemoteFile {
 func (f *RemoteFile) IsAvailable() bool {
 	network.SetProxyEnvironmentVariables()
 	client := pkg.NewHTTPClient()
-	_, f.lastError = client.Get(f.url)
+	_, f.lastError = client.GetRetry(f.url)
 	return (f.lastError == nil)
 }
 

config/data_funcs.go

@@ -26,7 +26,7 @@ func ChainCfgFuncs(cfg *CloudConfig, cfgFuncs CfgFuncs) (*CloudConfig, error) {
 		}
 		var err error
 		if cfg, err = cfgFunc(cfg); err != nil {
-			log.Errorf("Failed [%d/%d] %s: %s", i, len, name, err)
+			log.Errorf("Failed [%d/%d] %s: %v", i, len, name, err)
 			return cfg, err
 		}
 		log.Debugf("[%d/%d] Done %s", i, len, name)

config/docker_config.go

@@ -8,7 +8,7 @@ import (
 )
 
 func (d *DockerConfig) FullArgs() []string {
-	args := []string{"daemon"}
+	args := []string{}
 	args = append(args, generateEngineOptsSlice(d.EngineOpts)...)
 	args = append(args, d.ExtraArgs...)
 	if d.TLS {

config/schema.go

@@ -148,7 +148,9 @@ var schema = `{
 
       "properties": {
         "keys": {"type": "object"},
-        "daemon": {"type": "boolean"}
+        "daemon": {"type": "boolean"},
+        "port": {"type": "integer"},
+        "listen_address": {"type": "string"}
       }
     },
 

config/types.go

@@ -25,7 +25,7 @@ const (
 	ModulesArchive   = "/modules.tar"
 	Debug            = false
 	SystemDockerLog  = "/var/log/system-docker.log"
-	SystemDockerBin  = "/usr/bin/system-docker"
+	SystemDockerBin  = "/usr/bin/system-dockerd"
 
 	HashLabel         = "io.rancher.os.hash"
 	IDLabel           = "io.rancher.os.id"
@@ -182,8 +182,10 @@ type DockerConfig struct {
 }
 
 type SSHConfig struct {
-	Keys   map[string]string `yaml:"keys,omitempty"`
-	Daemon bool              `yaml:"daemon,omitempty"`
+	Keys          map[string]string `yaml:"keys,omitempty"`
+	Daemon        bool              `yaml:"daemon,omitempty"`
+	Port          int               `yaml:"port,omitempty"`
+	ListenAddress string            `yaml:"listen_address,omitempty"`
 }
 
 type StateConfig struct {

config/validate_test.go

@@ -16,6 +16,7 @@ func testValidate(t *testing.T, cfg []byte, contains string) {
 		t.Fatal(err)
 	}
 	if contains == "" && len(validationErrors.Errors()) != 0 {
+		fmt.Printf("validationErrors: %v", validationErrors.Errors())
 		t.Fail()
 	}
 	if !strings.Contains(fmt.Sprint(validationErrors.Errors()), contains) {

dfs/scratch.go

@@ -75,7 +75,7 @@ func createOptionalMounts(mounts ...[]string) {
 		log.Debugf("Mounting %s %s %s %s", mount[0], mount[1], mount[2], mount[3])
 		err := util.Mount(mount[0], mount[1], mount[2], mount[3])
 		if err != nil {
-			log.Debugf("Unable to mount %s %s %s %s: %s", mount[0], mount[1], mount[2], mount[3], err)
+			log.Debugf("Unable to mount %s %s %s %s: %v", mount[0], mount[1], mount[2], mount[3], err)
 		}
 	}
 }
@@ -354,7 +354,7 @@ ff02::2    ip6-allrouters
 
 	if len(cfg.DNSConfig.Nameservers) != 0 {
 		resolve, err := ioutil.ReadFile("/etc/resolv.conf")
-		log.Debugf("Resolve.conf == [%s], err", resolve, err)
+		log.Debugf("Resolve.conf == [%s], %v", resolve, err)
 
 		if err != nil {
 			log.Infof("scratch Writing empty resolv.conf (%v) %v", []string{}, []string{})

docker/service.go

@@ -55,6 +55,9 @@ func (s *Service) missingImage() bool {
 	}
 	client := s.context.ClientFactory.Create(s)
 	_, _, err := client.ImageInspectWithRaw(context.Background(), image, false)
+	if err != nil {
+		log.Errorf("Missing the image: %v", err)
+	}
 	return err != nil
 }
 

init/init.go

@@ -252,7 +252,7 @@ func RunInit() error {
 			config.SaveInitCmdline(cmdLineArgs)
 
 			cfg := config.LoadConfig()
-			log.Debugf("Cmdline debug = %s", cfg.Rancher.Debug)
+			log.Debugf("Cmdline debug = %t", cfg.Rancher.Debug)
 			if cfg.Rancher.Debug {
 				log.SetLevel(log.DebugLevel)
 			} else {

init/recovery.go

@@ -1,11 +1,11 @@
 package init
 
 import (
-	log "github.com/Sirupsen/logrus"
 	composeConfig "github.com/docker/libcompose/config"
 	"github.com/docker/libcompose/yaml"
 	"github.com/rancher/os/compose"
 	"github.com/rancher/os/config"
+	"github.com/rancher/os/log"
 	"github.com/rancher/os/netconf"
 )
 

init/sysinit.go

@@ -2,11 +2,13 @@ package init
 
 import (
 	"os"
+	"os/exec"
 	"path"
 	"syscall"
 
 	"golang.org/x/net/context"
 
+	"github.com/docker/engine-api/types"
 	"github.com/docker/libcompose/project/options"
 	"github.com/rancher/os/cmd/control"
 	"github.com/rancher/os/compose"
@@ -74,22 +76,22 @@ func loadImages(cfg *config.CloudConfig) (*config.CloudConfig, error) {
 			continue
 		}
 
+		// client.ImageLoad is an asynchronous operation
+		// To ensure the order of execution, use cmd instead of it
 		inputFileName := path.Join(config.ImagesPath, image)
-		input, err := os.Open(inputFileName)
-		if err != nil {
-			return cfg, err
-		}
-
-		defer input.Close()
-
 		log.Infof("Loading images from %s", inputFileName)
-		if _, err = client.ImageLoad(context.Background(), input, true); err != nil {
+		if err = exec.Command("/usr/bin/system-docker", "load", "-q", "-i", inputFileName).Run(); err != nil {
 			log.Fatalf("FATAL: failed loading images from %s: %s", inputFileName, err)
 		}
 
 		log.Infof("Done loading images from %s", inputFileName)
 	}
 
+	dockerImages, _ := client.ImageList(context.Background(), types.ImageListOptions{})
+	for _, dimg := range dockerImages {
+		log.Infof("Got image repo tags: %s", dimg.RepoTags)
+	}
+
 	return cfg, nil
 }
 

log/showuserlog.go

@@ -64,7 +64,7 @@ func (hook *ShowuserlogHook) NotUsedYetLogSystemReady() error {
 	if hook.syslogHook == nil {
 		h, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
 		if err != nil {
-			logrus.Debugf("error creating SyslogHook: %s", err)
+			logrus.Debugf("error creating SyslogHook: %v", err)
 			return err
 		}
 		hook.syslogHook = h

main.go

@@ -16,7 +16,6 @@ import (
 	"github.com/rancher/os/cmd/power"
 	"github.com/rancher/os/cmd/respawn"
 	"github.com/rancher/os/cmd/sysinit"
-	"github.com/rancher/os/cmd/systemdocker"
 	"github.com/rancher/os/cmd/wait"
 	"github.com/rancher/os/dfs"
 	osInit "github.com/rancher/os/init"
@@ -35,7 +34,6 @@ var entrypoints = map[string]func(){
 	"recovery":           control.AutologinMain,
 	"ros-bootstrap":      control.BootstrapMain,
 	"ros-sysinit":        sysinit.Main,
-	"system-docker":      systemdocker.Main,
 	"wait-for-docker":    wait.Main,
 	"cni-glue":           glue.Main,
 	"bridge":             bridge.Main,

os-config.tpl.yml

@@ -3,6 +3,7 @@ rancher:
   environment:
     VERSION: {{.VERSION}}
     SUFFIX: {{.SUFFIX}}
+    REGISTRY_DOMAIN: "docker.io"
   defaults:
     hostname: {{.HOSTNAME_DEFAULT}}
     {{if eq "amd64" .ARCH -}}
@@ -64,7 +65,7 @@ rancher:
       - /var/log:/var/log
   bootstrap_docker:
     bridge: none
-    storage_driver: overlay
+    storage_driver: overlay2
     restart: false
     graph: /var/lib/system-docker
     group: root
@@ -84,19 +85,86 @@ rancher:
   sysctl:
     fs.file-max: 1000000000
   services:
-    {{if eq "amd64" .ARCH -}}
-    acpid:
-      image: {{.OS_REPO}}/os-acpid:{{.VERSION}}{{.SUFFIX}}
-      command: /usr/sbin/acpid -f
+    command-volumes:
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
       labels:
+        io.rancher.os.createonly: "true"
         io.rancher.os.scope: system
-      net: host
-      uts: host
+      log_driver: json-file
+      net: none
       privileged: true
-      volumes_from:
-      - command-volumes
-      - system-volumes
-    {{end -}}
+      read_only: true
+      volumes:
+      - /usr/bin/ros:/usr/bin/ros:ro
+      - /usr/bin/system-docker:/usr/bin/system-docker:ro
+      - /usr/bin/system-docker-runc:/usr/bin/system-docker-runc:ro
+    system-volumes:
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
+      labels:
+        io.rancher.os.createonly: "true"
+        io.rancher.os.scope: system
+      log_driver: json-file
+      net: none
+      privileged: true
+      read_only: true
+      volumes:
+      - /dev:/host/dev
+      - /etc/docker:/etc/docker
+      - /etc/hosts:/etc/hosts
+      - /etc/logrotate.d:/etc/logrotate.d
+      - /etc/resolv.conf:/etc/resolv.conf
+      - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
+      - /etc/selinux:/etc/selinux
+      - /lib/firmware:/lib/firmware
+      - /lib/modules:/lib/modules
+      - /run:/run
+      - /usr/share/ros:/usr/share/ros
+      - /var/lib/rancher/cache:/var/lib/rancher/cache
+      - /var/lib/rancher/conf:/var/lib/rancher/conf
+      - /var/lib/rancher:/var/lib/rancher
+      - /var/log:/var/log
+      - /var/run:/var/run
+    container-data-volumes:
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
+      labels:
+        io.rancher.os.createonly: "true"
+        io.rancher.os.scope: system
+      log_driver: json-file
+      net: none
+      privileged: true
+      read_only: true
+      volumes:
+      - /var/lib/docker:/var/lib/docker
+    user-volumes:
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
+      labels:
+        io.rancher.os.createonly: "true"
+        io.rancher.os.scope: system
+      log_driver: json-file
+      net: none
+      privileged: true
+      read_only: true
+      volumes:
+      - /home:/home
+      - /opt:/opt
+      - /var/lib/kubelet:/var/lib/kubelet
+    media-volumes:
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
+      labels:
+        io.rancher.os.createonly: "true"
+        io.rancher.os.scope: system
+      log_driver: json-file
+      net: none
+      privileged: true
+      read_only: true
+      volumes:
+      - /media:/media:shared
+      - /mnt:/mnt:shared
     all-volumes:
       image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
       command: echo
@@ -114,6 +182,19 @@ rancher:
       - media-volumes
       - user-volumes
       - system-volumes
+    {{if eq "amd64" .ARCH -}}
+    acpid:
+      image: {{.OS_REPO}}/os-acpid:{{.VERSION}}{{.SUFFIX}}
+      command: /usr/sbin/acpid -f
+      labels:
+        io.rancher.os.scope: system
+      net: host
+      uts: host
+      privileged: true
+      volumes_from:
+      - command-volumes
+      - system-volumes
+    {{end -}}
     cloud-init-execute:
       image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
       command: cloud-init-execute -pre-console
@@ -127,18 +208,6 @@ rancher:
       volumes_from:
       - system-volumes
       volumes:
-      - /usr/bin/ros:/usr/bin/ros
-    command-volumes:
-      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
-      command: echo
-      labels:
-        io.rancher.os.createonly: "true"
-        io.rancher.os.scope: system
-      log_driver: json-file
-      net: none
-      privileged: true
-      read_only: true
-      volumes:
       - /usr/bin/ros:/usr/bin/ros:ro
     console:
       image: {{.OS_REPO}}/os-console:{{.VERSION}}{{.SUFFIX}}
@@ -162,18 +231,6 @@ rancher:
       - all-volumes
       volumes:
       - /usr/bin/iptables:/sbin/iptables:ro
-    container-data-volumes:
-      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
-      command: echo
-      labels:
-        io.rancher.os.createonly: "true"
-        io.rancher.os.scope: system
-      log_driver: json-file
-      net: none
-      privileged: true
-      read_only: true
-      volumes:
-      - /var/lib/docker:/var/lib/docker
     logrotate:
       image: {{.OS_REPO}}/os-logrotate:{{.VERSION}}{{.SUFFIX}}
       command: /usr/sbin/logrotate -v /etc/logrotate.conf
@@ -188,19 +245,6 @@ rancher:
       volumes_from:
       - command-volumes
       - system-volumes
-    media-volumes:
-      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
-      command: echo
-      labels:
-        io.rancher.os.createonly: "true"
-        io.rancher.os.scope: system
-      log_driver: json-file
-      net: none
-      privileged: true
-      read_only: true
-      volumes:
-      - /media:/media:shared
-      - /mnt:/mnt:shared
     network:
       image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
       command: netconf
@@ -213,8 +257,8 @@ rancher:
       pid: host
       privileged: true
       volumes_from:
-      - command-volumes
       - system-volumes
+      - command-volumes
       volumes:
       - /usr/bin/iptables:/sbin/iptables:ro
     ntp:
@@ -255,7 +299,11 @@ rancher:
       - command-volumes
       - system-volumes
     system-cron:
-      image: rancher/container-crontab:v0.1.0
+      {{if eq "amd64" .ARCH -}}
+      image: rancher/container-crontab:v0.4.0
+      {{else -}}
+      image: niusmallnan/container-crontab:v0.4.0{{.SUFFIX}}
+      {{end -}}
       labels:
         io.rancher.os.scope: system
       uts: host
@@ -263,34 +311,9 @@ rancher:
       privileged: true
       restart: always
       volumes:
-       - /var/run/system-docker.sock:/var/run/docker.sock
-    system-volumes:
-      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
-      command: echo
-      labels:
-        io.rancher.os.createonly: "true"
-        io.rancher.os.scope: system
-      log_driver: json-file
-      net: none
-      privileged: true
-      read_only: true
-      volumes:
-      - /dev:/host/dev
-      - /etc/docker:/etc/docker
-      - /etc/hosts:/etc/hosts
-      - /etc/logrotate.d:/etc/logrotate.d
-      - /etc/resolv.conf:/etc/resolv.conf
-      - /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt.rancher
-      - /etc/selinux:/etc/selinux
-      - /lib/firmware:/lib/firmware
-      - /lib/modules:/lib/modules
-      - /run:/run
-      - /usr/share/ros:/usr/share/ros
-      - /var/lib/rancher/cache:/var/lib/rancher/cache
-      - /var/lib/rancher/conf:/var/lib/rancher/conf
-      - /var/lib/rancher:/var/lib/rancher
-      - /var/log:/var/log
-      - /var/run:/var/run
+      - /var/run/system-docker.sock:/var/run/docker.sock
+      environment:
+        DOCKER_API_VERSION: "1.22"
     udev-cold:
       image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
       command: ros udev-settle
@@ -317,20 +340,6 @@ rancher:
       volumes_from:
       - command-volumes
       - system-volumes
-    user-volumes:
-      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
-      command: echo
-      labels:
-        io.rancher.os.createonly: "true"
-        io.rancher.os.scope: system
-      log_driver: json-file
-      net: none
-      privileged: true
-      read_only: true
-      volumes:
-      - /home:/home
-      - /opt:/opt
-      - /var/lib/kubelet:/var/lib/kubelet
     docker:
       {{if eq "amd64" .ARCH -}}
       image: {{.OS_REPO}}/os-docker:17.09.1{{.SUFFIX}}
@@ -358,7 +367,8 @@ rancher:
       - /var/lib/system-docker:/var/lib/system-docker:shared
   system_docker:
     exec: true
-    storage_driver: overlay
+    storage_driver: overlay2
+    bridge: none
     restart: false
     graph: /var/lib/system-docker
     group: root

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/docker/docker/dockerversion.GitCommit=${COMMIT} -X github.com/docker/docker/dockerversion.Version=${DOCKER_PATCH_VERSION} -X github.com/docker/docker/dockerversion.BuildTime='${BUILDDATE}' -X github.com/docker/docker/dockerversion.IAmStatic=true -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/rancher/os/config.Version=${VERSION} -X github.com/rancher/os/config.OsRepo=${OS_REPO} -X github.com/rancher/os/config.BuildDate='${BUILDDATE}'"
 go build -tags "selinux cgo daemon netgo" -installsuffix netgo -ldflags "$CONST -linkmode external -extldflags -static -s -w" -o ${OUTPUT}

scripts/global.cfg

@@ -1,2 +1 @@
-APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on ${APPEND}
-
+APPEND rancher.autologin=tty1 rancher.autologin=ttyS0 rancher.autologin=ttyS1 rancher.autologin=ttyS1 console=tty1 console=ttyS0 console=ttyS1 printk.devkmsg=on panic=10 ${APPEND}

scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper

@@ -13,11 +13,11 @@ RUN mkdir -p /source/assets
 COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz
 
 ENV URL=https://github.com/DieterReuter/rpi64-kernel/releases/download
-ENV VER=v20171216-172054
+ENV VER=v20180319-130037
 
-RUN curl -fL ${URL}/${VER}/4.9.69-hypriotos-v8.tar.gz > /source/assets/kernel.tar.gz
+RUN curl -fL ${URL}/${VER}/4.9.80-hypriotos-v8.tar.gz > /source/assets/kernel.tar.gz
 RUN curl -fL ${URL}/${VER}/bootfiles.tar.gz > /source/assets/bootfiles.tar.gz
-RUN curl -fL https://github.com/DieterReuter/rpi-bootloader/releases/download/v20171216-171651/rpi-bootloader.tar.gz > /source/assets/rpi-bootfiles.tar.gz
+RUN curl -fL https://github.com/DieterReuter/rpi-bootloader/releases/download/v20180320-071222/rpi-bootloader.tar.gz > /source/assets/rpi-bootfiles.tar.gz
 
 #ENV RPI_URL=https://github.com/raspberrypi/firmware/raw/master/boot
 #RUN curl -fL ${RPI_URL}/bootcode.bin > /source/assets/bootcode.bin

scripts/layout-initrd

@@ -13,11 +13,13 @@ cp bin/ros                     ${INITRD_DIR}/usr/bin/
 ln -s usr/bin/ros              ${INITRD_DIR}/init
 ln -s bin                      ${INITRD_DIR}/usr/sbin
 ln -s usr/sbin                 ${INITRD_DIR}/sbin
-ln -s ros                      ${INITRD_DIR}/usr/bin/system-docker
-ln -s ros                      ${INITRD_DIR}/usr/bin/docker-runc
 ln -s ../../../../usr/bin/ros  ${INITRD_DIR}/usr/var/lib/cni/bin/bridge
 ln -s ../../../../usr/bin/ros  ${INITRD_DIR}/usr/var/lib/cni/bin/host-local
 
+curl -SL ${!SYSTEM_DOCKER_URL} | tar --strip-components=1 -xzvf - -C ${INITRD_DIR}/usr/bin/
+# we have diabled the user-proxy so we get rid of system-docker-proxy
+rm -f ${INITRD_DIR}/usr/bin/system-docker-proxy
+
 cat <<HERE > ${INITRD_DIR}/usr/share/ros/os-release
 NAME="RancherOS"
 VERSION=${VERSION}
@@ -31,7 +33,8 @@ BUG_REPORT_URL="https://github.com/rancher/os/issues"
 BUILD_ID=
 HERE
 # TODO: usr/lib dir is overwritten by the kernel modules and firmware
-ln -s ../share/ros/os-release ${INITRD_DIR}/usr/lib/
+ln -s ${INITRD_DIR}/usr/share/ros/os-release ${INITRD_DIR}/usr/lib/
+ln -s ${INITRD_DIR}/usr/share/ros/os-release ${INITRD_DIR}/usr/etc/
 
 # Support upgrades from old persistent consoles that bind mount these
 touch ${INITRD_DIR}/usr/bin/docker-containerd

scripts/tar-images

@@ -13,5 +13,5 @@ for i in $IMAGES; do
 done
 
 echo "tar-images: docker save ${IMAGES} > build/images.tar"
-docker save ${IMAGES} > build/images.tar
+docker save ${IMAGES} | xz > build/images.tar
 echo "tar-images: DONE"