From 5b9ef6ae163267b7c2b0bf62e5423d9778fb7406 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Sun, 10 May 2015 18:05:09 +0500
Subject: [PATCH] rename `rancherctl` to `ros`

shorter, easier to use (and just plain cooler) name
---
 config/default.go                              |  3 ++-
 main.go                                        |  3 ++-
 scripts/dockerimages/scripts/cloud-init.sh     |  2 +-
 scripts/dockerimages/scripts/console.sh        | 10 +++++-----
 scripts/dockerimages/scripts/docker.sh         | 10 +++++-----
 scripts/dockerimages/scripts/rancheros-install |  4 ++--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/config/default.go b/config/default.go
index d58eb4f2..212cf345 100644
--- a/config/default.go
+++ b/config/default.go
@@ -145,7 +145,8 @@ func NewConfig() *Config {
 					"/init:/sbin/shutdown:ro",
 					"/init:/sbin/netconf:ro",
 					"/init:/usr/bin/cloud-init:ro",
-					"/init:/usr/bin/rancherctl:ro",
+					"/init:/usr/bin/rancherctl:ro", // deprecated, use `ros` instead
+					"/init:/usr/bin/ros:ro",
 					"/init:/usr/bin/respawn:ro",
 					"/init:/usr/bin/system-docker:ro",
 					"/init:/usr/sbin/wait-for-docker:ro",
diff --git a/main.go b/main.go
index 31384dfa..6f65c249 100644
--- a/main.go
+++ b/main.go
@@ -44,7 +44,8 @@ func main() {
 	registerCmd("/sbin/halt", power.Halt)
 	registerCmd("/sbin/shutdown", power.Main)
 	registerCmd("/usr/bin/respawn", respawn.Main)
-	registerCmd("/usr/sbin/rancherctl", control.Main)
+	registerCmd("/usr/sbin/rancherctl", control.Main) // deprecated, use `ros` instead
+	registerCmd("/usr/sbin/ros", control.Main)
 	registerCmd("/usr/bin/cloud-init", cloudinit.Main)
 	registerCmd("/usr/sbin/netconf", network.Main)
 	registerCmd("/usr/sbin/wait-for-docker", wait.Main)
diff --git a/scripts/dockerimages/scripts/cloud-init.sh b/scripts/dockerimages/scripts/cloud-init.sh
index b17577cd..333568b4 100755
--- a/scripts/dockerimages/scripts/cloud-init.sh
+++ b/scripts/dockerimages/scripts/cloud-init.sh
@@ -12,6 +12,6 @@ else
     mount -t 9p -o trans=virtio,version=9p2000.L config-2 ${MOUNT_POINT} 2>/dev/null || true
 fi
 
-rancherctl config get cloud_init
+ros config get cloud_init
 
 cloud-init -save -network=${CLOUD_INIT_NETWORK:-true}
diff --git a/scripts/dockerimages/scripts/console.sh b/scripts/dockerimages/scripts/console.sh
index 1ea72aed..8998ce7a 100755
--- a/scripts/dockerimages/scripts/console.sh
+++ b/scripts/dockerimages/scripts/console.sh
@@ -6,8 +6,8 @@ setup_ssh()
     for i in rsa dsa ecdsa ed25519; do
         local output=/etc/ssh/ssh_host_${i}_key
         if [ ! -e $output ]; then
-            local saved="$(rancherctl config get ssh.keys.${i})"
-            local pub="$(rancherctl config get ssh.keys.${i}-pub)"
+            local saved="$(ros config get ssh.keys.${i})"
+            local pub="$(ros config get ssh.keys.${i}-pub)"
 
             if [[ -n "$saved" && -n "$pub" ]]; then
                 (
@@ -17,8 +17,8 @@ setup_ssh()
                 )
             else
                 ssh-keygen -f $output -N '' -t $i
-                rancherctl config set -- ssh.keys.${i} "$(<${output})"
-                rancherctl config set -- ssh.keys.${i}-pub "$(<${output}.pub)"
+                ros config set -- ssh.keys.${i} "$(<${output})"
+                ros config set -- ssh.keys.${i}-pub "$(<${output}.pub)"
             fi
         fi
     done
@@ -61,7 +61,7 @@ fi
 
 setup_ssh
 
-VERSION="$(rancherctl -v | awk '{print $NF}')"
+VERSION="$(ros -v | awk '{print $NF}')"
 cat > /etc/lsb-release << EOF
 DISTRIB_ID=RancherOS
 DISTRIB_RELEASE=${VERSION}
diff --git a/scripts/dockerimages/scripts/docker.sh b/scripts/dockerimages/scripts/docker.sh
index 0eaa7c68..73c49011 100755
--- a/scripts/dockerimages/scripts/docker.sh
+++ b/scripts/dockerimages/scripts/docker.sh
@@ -18,12 +18,12 @@ fi
 
 rm -f /var/run/docker.pid
 
-ARGS=$(echo $(rancherctl config get user_docker.args | sed 's/^-//'))
-ARGS="$ARGS $(echo $(rancherctl config get user_docker.extra_args | sed 's/^-//'))"
+ARGS=$(echo $(ros config get user_docker.args | sed 's/^-//'))
+ARGS="$ARGS $(echo $(ros config get user_docker.extra_args | sed 's/^-//'))"
 
-if [ "$(rancherctl config get user_docker.tls)" = "true" ]; then
-    ARGS="$ARGS $(echo $(rancherctl config get user_docker.tls_args | sed 's/^-//'))"
-    rancherctl tls generate --server -d $TLS_PATH
+if [ "$(ros config get user_docker.tls)" = "true" ]; then
+    ARGS="$ARGS $(echo $(ros config get user_docker.tls_args | sed 's/^-//'))"
+    ros tls generate --server -d $TLS_PATH
     cd $TLS_PATH
 fi
 
diff --git a/scripts/dockerimages/scripts/rancheros-install b/scripts/dockerimages/scripts/rancheros-install
index 2bb2b74a..01daa5e9 100755
--- a/scripts/dockerimages/scripts/rancheros-install
+++ b/scripts/dockerimages/scripts/rancheros-install
@@ -28,8 +28,8 @@ if [ "$(whoami)" != "root" ]; then
     exit 1
 fi
 
-if [ -x /usr/bin/rancherctl ]; then
-    INSTALL_CONTAINER_IMAGE="$(rancherctl config get upgrade.image)"
+if [ -x /usr/bin/ros ]; then
+    INSTALL_CONTAINER_IMAGE="$(ros config get upgrade.image)"
 fi
 
 if [ -n "$(grep RancherOS /etc/lsb-release)" ]; then