sanlock/suse-systemd.patch

Index: sanlock-3.9.5/init.d/sanlock.service
===================================================================
--- sanlock-3.9.5.orig/init.d/sanlock.service
+++ sanlock-3.9.5/init.d/sanlock.service
@@ -5,8 +5,10 @@ Wants=wdmd.service
 
 [Service]
 Type=forking
-ExecStart=/lib/systemd/systemd-sanlock start
-ExecStop=/lib/systemd/systemd-sanlock stop
+EnvironmentFile=-/etc/sysconfig/sanlock
+ExecStart=/usr/sbin/sanlock daemon $SANLOCKOPTS
+ExecStop=/bin/kill -TERM $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
Index: sanlock-3.9.5/init.d/wdmd.service
===================================================================
--- sanlock-3.9.5.orig/init.d/wdmd.service
+++ sanlock-3.9.5/init.d/wdmd.service
@@ -5,8 +5,10 @@ After=syslog.target
 [Service]
 Type=forking
 ExecStartPre=/lib/systemd/systemd-wdmd watchdog-check
-ExecStart=/usr/sbin/wdmd
-SendSIGKILL=no
+EnvironmentFile=-/etc/sysconfig/wdmd
+ExecStart=/usr/sbin/wdmd $WDMDOPTS
+ExecStop=/bin/kill -TERM $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
Index: sanlock-3.9.5/init.d/fence_sanlockd.service
===================================================================
--- sanlock-3.9.5.orig/init.d/fence_sanlockd.service
+++ sanlock-3.9.5/init.d/fence_sanlockd.service
@@ -5,8 +5,8 @@ Before=corosync.service
 
 [Service]
 Type=forking
-ExecStart=/lib/systemd/systemd-fence_sanlockd start
-ExecStop=/lib/systemd/systemd-fence_sanlockd stop
+ExecStart=/usr/lib/systemd/systemd-fence_sanlockd start
+ExecStop=/usr/lib/systemd/systemd-fence_sanlockd stop
 
 [Install]
 WantedBy=multi-user.target
- Update to version 3.9.5: * sanlock: change log level for resource names * sanlock: include worker thread info in status * sanlock: reuse io buffer with hugepages * sanlock: use hugepages to avoid splitting read io * sanlock: don't reduce max_sectors_kb * sanlock: fix is dead log message for unused host id * sanlock: repeat helper_msg string termination * sanlock: fix invalid strcpy in direct dump OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=79 2024-10-16 22:22:31 +02:00			`Index: sanlock-3.9.5/init.d/sanlock.service`
			`===================================================================`
			`--- sanlock-3.9.5.orig/init.d/sanlock.service`
			`+++ sanlock-3.9.5/init.d/sanlock.service`
			`@@ -5,8 +5,10 @@ Wants=wdmd.service`

			`[Service]`
			`Type=forking`
			`-ExecStart=/lib/systemd/systemd-sanlock start`
			`-ExecStop=/lib/systemd/systemd-sanlock stop`
			`+EnvironmentFile=-/etc/sysconfig/sanlock`
			`+ExecStart=/usr/sbin/sanlock daemon $SANLOCKOPTS`
			`+ExecStop=/bin/kill -TERM $MAINPID`
			`+ExecReload=/bin/kill -HUP $MAINPID`

			`[Install]`
			`WantedBy=multi-user.target`
			`Index: sanlock-3.9.5/init.d/wdmd.service`
			`===================================================================`
			`--- sanlock-3.9.5.orig/init.d/wdmd.service`
			`+++ sanlock-3.9.5/init.d/wdmd.service`
			`@@ -5,8 +5,10 @@ After=syslog.target`
			`[Service]`
			`Type=forking`
			`ExecStartPre=/lib/systemd/systemd-wdmd watchdog-check`
			`-ExecStart=/usr/sbin/wdmd`
			`-SendSIGKILL=no`
			`+EnvironmentFile=-/etc/sysconfig/wdmd`
			`+ExecStart=/usr/sbin/wdmd $WDMDOPTS`
			`+ExecStop=/bin/kill -TERM $MAINPID`
			`+ExecReload=/bin/kill -HUP $MAINPID`

			`[Install]`
			`WantedBy=multi-user.target`
			`Index: sanlock-3.9.5/init.d/fence_sanlockd.service`
			`===================================================================`
			`--- sanlock-3.9.5.orig/init.d/fence_sanlockd.service`
			`+++ sanlock-3.9.5/init.d/fence_sanlockd.service`
			`@@ -5,8 +5,8 @@ Before=corosync.service`

			`[Service]`
			`Type=forking`
			`-ExecStart=/lib/systemd/systemd-fence_sanlockd start`
			`-ExecStop=/lib/systemd/systemd-fence_sanlockd stop`
			`+ExecStart=/usr/lib/systemd/systemd-fence_sanlockd start`
			`+ExecStop=/usr/lib/systemd/systemd-fence_sanlockd stop`

			`[Install]`
			`WantedBy=multi-user.target`