From 6981a4dff7decade8838dc69287c8e1fe4e686fc Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Tue, 18 Sep 2018 23:41:25 -0500 Subject: [PATCH] crashlog: do not alter system behavior with watchdog Instead of installing to systemd config directory, install to /usr/share/acrn/crashlog. Using this way we not alter the system if it is not used as a debug platform. Tracked-On: #1386 Signed-off-by: Miguel Bernal Marin Reviewed-by: Zhi Jin Acked-by: Chen Gang --- tools/acrn-crashlog/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/acrn-crashlog/Makefile b/tools/acrn-crashlog/Makefile index 507189b69..f52e27144 100644 --- a/tools/acrn-crashlog/Makefile +++ b/tools/acrn-crashlog/Makefile @@ -104,8 +104,8 @@ install: @install -p -D -m 0755 $(BUILDDIR)/usercrash/bin/usercrash_s $(DESTDIR)/usr/bin/ @install -p -D -m 0755 data/acrnprobe_prepare.sh $(DESTDIR)/usr/bin/ @install -p -D -m 0755 data/usercrash-wrapper $(DESTDIR)/usr/bin/ - @install -d $(DESTDIR)/usr/lib/systemd/system.conf.d/ - @install -p -D -m 0644 data/40-watchdog.conf $(DESTDIR)/usr/lib/systemd/system.conf.d/ + @install -d $(DESTDIR)/usr/share/acrn/crashlog + @install -p -D -m 0644 data/40-watchdog.conf $(DESTDIR)/usr/share/acrn/crashlog @install -d $(DESTDIR)/usr/share/defaults/telemetrics/ @install -p -D -m 0644 data/acrnprobe.xml $(DESTDIR)/usr/share/defaults/telemetrics/ @install -d $(DESTDIR)/usr/lib/systemd/system/ @@ -133,8 +133,8 @@ uninstall: @if [ -e "$(DESTDIR)/usr/bin/usercrash-wrapper" ];then \ $(RM) $(DESTDIR)/usr/bin/usercrash-wrapper; \ fi - @if [ -e "$(DESTDIR)/usr/lib/systemd/system.conf.d/40-watchdog.conf" ];then \ - $(RM) $(DESTDIR)/usr/lib/systemd/system.conf.d/40-watchdog.conf; \ + @if [ -e "$(DESTDIR)/usr/share/acrn/crashlog/40-watchdog.conf" ];then \ + $(RM) $(DESTDIR)/usr/share/acrn/crashlog/40-watchdog.conf; \ fi @if [ -e "$(DESTDIR)/usr/share/defaults/telemetrics/acrnprobe.xml" ];then \ $(RM) $(DESTDIR)/usr/share/defaults/telemetrics/acrnprobe.xml; \