diff --git a/hack/isulad-lxcfs-toolkit.spec b/hack/isulad-lxcfs-toolkit.spec index 68b137249b419ea8b74a67525212d07dae62ca00..8d48ea631ed1ed28121568f08d13fb68989c7b93 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 27565a28293c2d8389b49b973a12079186050048..d3038e3ea7c8762ad7278fd97ca1e5803329c319 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 8a524c4ed1488299f914a2357f9e4d553a6e9866..3a6d8922e492a5bb8185149e3e887fe961ee3ec6 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 9c4209695c3fda68762cb3334c3c098c8189c204..2c49d4c5e3d8919b51daa1276722e4f9bd28b710 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 }