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

!3 update package

Browse Source 
Merge pull request !3 from zhangsong234/master
This commit is contained in:
openeuler-ci-bot 2020-02-12 15:24:52 +08:00 committed by Gitee
commit 688940ddb9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-systemd-up.patch
View File

@ -8,7 +8,7 @@ index 95e3ee9..0995607 100644
[Service] [Service]
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/ -ExecStart=/usr/bin/lxcfs /var/lib/lxcfs/
+ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ +ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/
+ExecStartPost=/usr/local/bin/isulad-lxcfs-toolkit remount -a +ExecStartPost=/usr/local/bin/lxcfs-tools remount -a
KillMode=process KillMode=process
Restart=on-failure Restart=on-failure
-ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs -ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs

4
0002-prestart.patch
View File

@ -4,7 +4,7 @@
Documentation=man:lxcfs(1) Documentation=man:lxcfs(1)
[Service] [Service]
+ExecStartPre=/usr/local/bin/isulad-lxcfs-toolkit prestart +ExecStartPre=/usr/local/bin/lxcfs-tools prestart
ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/
ExecStartPost=/usr/local/bin/isulad-lxcfs-toolkit remount -a ExecStartPost=/usr/local/bin/lxcfs-tools remount -a
KillMode=process KillMode=process

4
0011-systemd-stop.patch
View File

@ -3,9 +3,9 @@ index 534907d..3f104ad 100644
--- a/config/init/systemd/lxcfs.service --- a/config/init/systemd/lxcfs.service
+++ b/config/init/systemd/lxcfs.service +++ b/config/init/systemd/lxcfs.service
@@ -10,6 +10,7 @@ ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ @@ -10,6 +10,7 @@ ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/
ExecStartPost=/usr/local/bin/isulad-lxcfs-toolkit remount -a ExecStartPost=/usr/local/bin/lxcfs-tools remount -a
KillMode=process KillMode=process
Restart=on-failure Restart=on-failure
+ExecStop=/usr/local/bin/isulad-lxcfs-toolkit umount -a +ExecStop=/usr/local/bin/lxcfs-tools umount -a
ExecStopPost=-/bin/fusermount -u /var/lib/lxc/ ExecStopPost=-/bin/fusermount -u /var/lib/lxc/
Delegate=yes Delegate=yes

6
0014-systemd-monitor-always-restart.patch
View File

@ -1,12 +1,12 @@
diff -uprN a/config/init/systemd/lxcfs.service b/config/init/systemd/lxcfs.service diff -uprN a/config/init/systemd/lxcfs.service b/config/init/systemd/lxcfs.service
--- a/config/init/systemd/lxcfs.service 2019-01-07 17:15:47.596276242 +0800 --- a/config/init/systemd/lxcfs.service 2019-01-07 17:15:47.596276242 +0800
+++ b/config/init/systemd/lxcfs.service 2019-01-07 17:17:32.206271142 +0800 +++ b/config/init/systemd/lxcfs.service 2019-01-07 17:17:32.206271142 +0800
@@ -9,10 +9,11 @@ ExecStartPre=/usr/local/bin/isulad-lxcfs @@ -9,10 +9,11 @@ ExecStartPre=/usr/local/bin/lxcfs-tools
ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/
ExecStartPost=/usr/local/bin/isulad-lxcfs-toolkit remount -a ExecStartPost=/usr/local/bin/lxcfs-tools remount -a
KillMode=process KillMode=process
-Restart=on-failure -Restart=on-failure
ExecStop=/usr/local/bin/isulad-lxcfs-toolkit umount -a ExecStop=/usr/local/bin/lxcfs-tools umount -a
ExecStopPost=-/bin/fusermount -u /var/lib/lxc/ ExecStopPost=-/bin/fusermount -u /var/lib/lxc/
Delegate=yes Delegate=yes
+Restart=always +Restart=always