packages/lxcfs-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

isulad-lxcfs-toolkit: rename lcrd to isulad

Browse Source 
Signed-off-by: zhangsong34 <zhangsong34@huawei.com>
This commit is contained in:
zhangsong34 2020-01-21 14:37:35 +08:00 committed by Grooooot
parent 19196cce22
commit 00545d1e53
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hack/isulad-lxcfs-toolkit.spec
View File

@ -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

2
hooks/lxcfs-hook/example/hookspec.json
View File

@ -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": []
}

4
remountcmd.go
View File

@ -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)
}

2
umountcmd.go
View File

@ -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
}