diff --git a/0001-systemd-up.patch b/0001-systemd-up.patch index da7c36c3cef0a419fee784ed94e1b565a6f9b3f4..020aadefdf935f61221e5c84baa8c868a12f938d 100644 --- 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 diff --git a/0002-prestart.patch b/0002-prestart.patch index 0c76feee6dcecd68148a1dbd599dd9e70bef8913..703c83481c24745204d1f8d6162afdb8c9ce6808 100644 --- 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 diff --git a/0011-systemd-stop.patch b/0011-systemd-stop.patch index 618620bdfba63fae7d283996c32e2f2df94e1484..e588fbcf1a8d6ae23c86d1643e7de150e291daaa 100644 --- 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 diff --git a/0014-systemd-monitor-always-restart.patch b/0014-systemd-monitor-always-restart.patch index be2d2ebf9601b2aa321146190fbe3555cfe4f1cb..62eb984fe53b948f858ecf6d25797730bc517064 100644 --- 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