!3 update package

Merge pull request !3 from zhangsong234/master
2020-02-12 15:24:52 +08:00 · 2020-02-12 15:24:52 +08:00 · 688940ddb9
commit 688940ddb9
parent 5e7706bcb7 e757619e73
4 changed files with 8 additions and 8 deletions
--- a/0001-systemd-up.patch
+++ b/0001-systemd-up.patch
@ -8,7 +8,7 @@ index 95e3ee9..0995607 100644
 [Service]
 -ExecStart=/usr/bin/lxcfs /var/lib/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
 Restart=on-failure
 -ExecStopPost=-/bin/fusermount -u /var/lib/lxcfs
--- a/0002-prestart.patch
+++ b/0002-prestart.patch
@ -4,7 +4,7 @@
 Documentation=man:lxcfs(1)

 [Service]
-+ExecStartPre=/usr/local/bin/isulad-lxcfs-toolkit prestart
+ExecStartPre=/usr/local/bin/lxcfs-tools prestart
 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
--- a/0011-systemd-stop.patch
+++ b/0011-systemd-stop.patch
@ -3,9 +3,9 @@ index 534907d..3f104ad 100644
 --- a/config/init/systemd/lxcfs.service
 +++ b/config/init/systemd/lxcfs.service
@@ -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
 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/
 Delegate=yes
--- a/0014-systemd-monitor-always-restart.patch
+++ b/0014-systemd-monitor-always-restart.patch
@ -1,12 +1,12 @@
 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
 +++ 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/
- ExecStartPost=/usr/local/bin/isulad-lxcfs-toolkit remount -a
+ ExecStartPost=/usr/local/bin/lxcfs-tools remount -a
 KillMode=process
 -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/
 Delegate=yes
 +Restart=always