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

!4 isulad-lxcfs-toolkit: replace lcrd to isulad

Browse Source 
Merge pull request !4 from zhangsong234/fix/rename_lcrc_to_lcrd
This commit is contained in:
openeuler-ci-bot 2020-01-21 14:41:59 +08:00 committed by Gitee
commit 864470a0f9
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 make
%install %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 ISULAD_LXCFS_TOOLKIT_DIR=$RPM_BUILD_ROOT/usr/local/bin
cd $RPM_BUILD_DIR/src/isula.org/isulad-lxcfs-toolkit 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 %preun
%post %post
GRAPH=`lcrc info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"` GRAPH=`isula info | grep -Eo "iSulad Root Dir:.+" | grep -Eo "\/.*"`
if [ "$GRAPH" == "" ]; then if [ "$GRAPH" == "" ]; then
GRAPH="/var/lib/lcrd" GRAPH="/var/lib/isulad"
fi fi
if [[ ("$GRAPH" != "/var/lib/lcrd") ]]; then if [[ ("$GRAPH" != "/var/lib/isulad") ]]; then
mkdir -p -m 0550 $GRAPH/hooks 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
echo "=================== WARNING! ================================================" 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 "============================================================================="
echo echo
fi fi
@ -90,8 +90,8 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
%files %files
%defattr(0550,root,root,0550) %defattr(0550,root,root,0550)
/usr/local/bin/isulad-lxcfs-toolkit /usr/local/bin/isulad-lxcfs-toolkit
%attr(0550,root,root) /var/lib/lcrd/hooks %attr(0550,root,root) /var/lib/isulad/hooks
%attr(0550,root,root) /var/lib/lcrd/hooks/lxcfs-hook %attr(0550,root,root) /var/lib/isulad/hooks/lxcfs-hook
#Clean section #Clean section
%clean %clean

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

@ -1,7 +1,7 @@
{ {
"prestart": [ "prestart": [
{ {
"path": "/var/lib/lcrd/hooks/lxcfs-hook", "path": "/var/lib/isulad/hooks/lxcfs-hook",
"args": ["lxcfs-hook", "--log", "/var/log/lxcfs-hook.log"], "args": ["lxcfs-hook", "--log", "/var/log/lxcfs-hook.log"],
"env": [] "env": []
} }

4
remountcmd.go
View File

@ -179,7 +179,7 @@ func waitForLxcfs() error {
func remountAll(initMountns, initUserns string) error { func remountAll(initMountns, initUserns string) error {
isulad_lxcfs_log.Info("begin remount All runing container...") 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 { if err != nil {
return err return err
} }
@ -260,7 +260,7 @@ func isContainerExsit(containerid string) (string, error) {
return "", fmt.Errorf("Containerid mustn't be empty") 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 { if err != nil {
onfail(err) onfail(err)
} }

2
umountcmd.go
View File

@ -85,7 +85,7 @@ var umountContainer = cli.Command{
func umountAll(initMountns, initUserns string) error { func umountAll(initMountns, initUserns string) error {
isulad_lxcfs_log.Info("begin umount All runing container...") 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 { if err != nil {
return err return err
} }