From 00545d1e537f82125ca270d8915598a8825a5ffe Mon Sep 17 00:00:00 2001
From: zhangsong34 <zhangsong34@huawei.com>
Date: Tue, 21 Jan 2020 14:37:35 +0800
Subject: [PATCH] isulad-lxcfs-toolkit: rename lcrd to isulad

Signed-off-by: zhangsong34 <zhangsong34@huawei.com>
---
 hack/isulad-lxcfs-toolkit.spec         | 16 ++++++++--------
 hooks/lxcfs-hook/example/hookspec.json |  2 +-
 remountcmd.go                          |  4 ++--
 umountcmd.go                           |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hack/isulad-lxcfs-toolkit.spec b/hack/isulad-lxcfs-toolkit.spec
index 68b1372..8d48ea6 100644
--- a/hack/isulad-lxcfs-toolkit.spec
+++ b/hack/isulad-lxcfs-toolkit.spec
@@ -34,7 +34,7 @@ cd $RPM_BUILD_DIR/src/isula.org/isulad-lxcfs-toolkit
 make
 
 %install
-HOOK_DIR=$RPM_BUILD_ROOT/var/lib/lcrd/hooks
+HOOK_DIR=$RPM_BUILD_ROOT/var/lib/isulad/hooks
 ISULAD_LXCFS_TOOLKIT_DIR=$RPM_BUILD_ROOT/usr/local/bin
 
 cd $RPM_BUILD_DIR/src/isula.org/isulad-lxcfs-toolkit
@@ -50,18 +50,18 @@ install -m 0750 build/isulad-lxcfs-toolkit ${ISULAD_LXCFS_TOOLKIT_DIR}
 %preun
 
 %post
-GRAPH=`lcrc info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"` 
+GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"` 
 if [ "$GRAPH" == "" ]; then
-    GRAPH="/var/lib/lcrd"
+    GRAPH="/var/lib/isulad"
 fi
 
-if [[ ("$GRAPH" != "/var/lib/lcrd") ]]; then
+if [[ ("$GRAPH" != "/var/lib/isulad") ]]; then
     mkdir -p -m 0550 $GRAPH/hooks
-    install -m 0550 -p /var/lib/lcrd/hooks/lxcfs-hook $GRAPH/hooks
+    install -m 0550 -p /var/lib/isulad/hooks/lxcfs-hook $GRAPH/hooks
 
     echo
     echo "=================== WARNING! ================================================"
-    echo " 'iSulad Root Dir' is $GRAPH, move /var/lib/lcrd/hooks/lxcfs-hook to  $GRAPH/hooks"
+    echo " 'iSulad Root Dir' is $GRAPH, move /var/lib/isulad/hooks/lxcfs-hook to  $GRAPH/hooks"
     echo "============================================================================="
     echo
 fi
@@ -90,8 +90,8 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
 %files
 %defattr(0550,root,root,0550)
 /usr/local/bin/isulad-lxcfs-toolkit
-%attr(0550,root,root) /var/lib/lcrd/hooks
-%attr(0550,root,root) /var/lib/lcrd/hooks/lxcfs-hook
+%attr(0550,root,root) /var/lib/isulad/hooks
+%attr(0550,root,root) /var/lib/isulad/hooks/lxcfs-hook
 
 #Clean section
 %clean 
diff --git a/hooks/lxcfs-hook/example/hookspec.json b/hooks/lxcfs-hook/example/hookspec.json
index 27565a2..d3038e3 100644
--- a/hooks/lxcfs-hook/example/hookspec.json
+++ b/hooks/lxcfs-hook/example/hookspec.json
@@ -1,7 +1,7 @@
 {
         "prestart": [
         {
-                "path": "/var/lib/lcrd/hooks/lxcfs-hook",
+                "path": "/var/lib/isulad/hooks/lxcfs-hook",
                 "args": ["lxcfs-hook", "--log", "/var/log/lxcfs-hook.log"],
                 "env": []
         }
diff --git a/remountcmd.go b/remountcmd.go
index 8a524c4..3a6d892 100644
--- a/remountcmd.go
+++ b/remountcmd.go
@@ -179,7 +179,7 @@ func waitForLxcfs() error {
 
 func remountAll(initMountns, initUserns string) error {
 	isulad_lxcfs_log.Info("begin remount All runing container...")
-	out, err := execCommond("lcrc", []string{"ps", "--format", "{{.ID}} {{.Pid}}"})
+	out, err := execCommond("isula", []string{"ps", "--format", "{{.ID}} {{.Pid}}"})
 	if err != nil {
 		return err
 	}
@@ -260,7 +260,7 @@ func isContainerExsit(containerid string) (string, error) {
 		return "", fmt.Errorf("Containerid mustn't be empty")
 	}
 
-	out, err := execCommond("lcrc", []string{"ps", "--format", "{{.ID}} {{.Pid}}"})
+	out, err := execCommond("isula", []string{"ps", "--format", "{{.ID}} {{.Pid}}"})
 	if err != nil {
 		onfail(err)
 	}
diff --git a/umountcmd.go b/umountcmd.go
index 9c42096..2c49d4c 100644
--- a/umountcmd.go
+++ b/umountcmd.go
@@ -85,7 +85,7 @@ var umountContainer = cli.Command{
 
 func umountAll(initMountns, initUserns string) error {
 	isulad_lxcfs_log.Info("begin umount All runing container...")
-	out, err := execCommond("lcrc", []string{"ps", "--format", "{{.ID}} {{.Pid}}"})
+	out, err := execCommond("isula", []string{"ps", "--format", "{{.ID}} {{.Pid}}"})
 	if err != nil {
 		return err
 	}
-- 
Gitee