From 31d6bb01a61ef61a74b1caeac20e7e70d9c62db6 Mon Sep 17 00:00:00 2001
From: Wang Long <long.wanglong@huawei.com>
Date: Fri, 13 Nov 2015 16:07:16 +0800
Subject: [PATCH] os-config.yml: fix the wrong command-volumes configuration

when running command `/usr/bin/ros`, it will get the following
fatal message:
	"Failed to find an entry point for /usr/bin/ros".
The same as the command /usr/sbin/rancherctl /sbin/netconf etc.

This patch fix that, and make it the same sequence as the registerCmd
function in main.go file.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
---
 os-config.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/os-config.yml b/os-config.yml
index 421090e7..e79a1b52 100644
--- a/os-config.yml
+++ b/os-config.yml
@@ -122,19 +122,19 @@ rancher:
       read_only: true
       volumes:
       - /usr/bin/docker:/usr/bin/docker.dist:ro
-      - /usr/bin/ros:/sbin/halt:ro
-      - /usr/bin/ros:/sbin/netconf:ro
-      - /usr/bin/ros:/sbin/wait-for-network:ro
+      - /usr/bin/ros:/usr/bin/dockerlaunch:ro
+      - /usr/bin/ros:/usr/bin/user-docker:ro
+      - /usr/bin/ros:/usr/bin/system-docker:ro
       - /usr/bin/ros:/sbin/poweroff:ro
       - /usr/bin/ros:/sbin/reboot:ro
+      - /usr/bin/ros:/sbin/halt:ro
       - /usr/bin/ros:/sbin/shutdown:ro
-      - /usr/bin/ros:/usr/bin/cloud-init:ro
-      - /usr/bin/ros:/usr/bin/dockerlaunch:ro
-      - /usr/bin/ros:/usr/bin/rancherctl:ro
       - /usr/bin/ros:/usr/bin/respawn:ro
-      - /usr/bin/ros:/usr/bin/ros:ro
-      - /usr/bin/ros:/usr/bin/system-docker:ro
-      - /usr/bin/ros:/usr/bin/user-docker:ro
+      - /usr/bin/ros:/usr/sbin/rancherctl:ro
+      - /usr/bin/ros:/usr/sbin/ros:ro
+      - /usr/bin/ros:/usr/bin/cloud-init:ro
+      - /usr/bin/ros:/usr/sbin/netconf:ro
+      - /usr/bin/ros:/usr/sbin/wait-for-network:ro
       - /usr/bin/ros:/usr/sbin/wait-for-docker:ro
     console:
       image: rancher/os-console:v0.4.1-dev