From de5b2df704beea1485bf24291cf9d5c624358c43 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Jan 16 2017 00:10:49 +0000 Subject: Fix 1411147, mask rfkill correctly --- diff --git a/tlp.spec b/tlp.spec index 9ad3477..2faf7a4 100644 --- a/tlp.spec +++ b/tlp.spec @@ -1,6 +1,6 @@ Name: tlp Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Advanced power management tool for Linux License: GPLv2+ URL: http://linrunner.de/tlp @@ -60,9 +60,6 @@ make install DESTDIR=%{buildroot} TLP_NO_INIT=1 \ make install-man DESTDIR=%{buildroot} #Install preset (source 1): install -Dpm 0644 %{SOURCE1} %{buildroot}/%{_presetdir}/50-tlp.preset -#THIS IS A WORKAROUND FOR RFKILL! -echo '#' > systemd-rfkill@.service -install -D -m 644 systemd-rfkill@.service %{buildroot}%{_sysconfdir}/systemd/system/systemd-rfkill@.service %files %config(noreplace) %{_sysconfdir}/default/tlp @@ -76,8 +73,6 @@ install -D -m 644 systemd-rfkill@.service %{buildroot}%{_sysconfdir}/systemd/sys %{_datadir}/bash-completion/completions/* %{_presetdir}/50-tlp.preset %{_unitdir}/*.service -#THIS IS A WORKAROUND FOR RFKILL! -%config(noreplace) %{_sysconfdir}/systemd/system/systemd-rfkill@.service %files rdw %doc COPYING LICENSE README @@ -88,6 +83,7 @@ install -D -m 644 systemd-rfkill@.service %{buildroot}%{_sysconfdir}/systemd/sys %post %systemd_post tlp.service %systemd_post tlp-sleep.service +systemctl mask systemd-rfkill.service %preun %systemd_preun tlp.service @@ -96,11 +92,15 @@ install -D -m 644 systemd-rfkill@.service %{buildroot}%{_sysconfdir}/systemd/sys %postun %systemd_postun_with_restart tlp.service %systemd_postun_with_restart tlp-sleep.service +systemctl unmask systemd-rfkill.service %post rdw /bin/systemctl enable NetworkManager-dispatcher.service >/dev/null 2>&1 || : %changelog +* Sun Jan 15 2017 Jeremy Newton - 0.9-2 +- Fix rfkill service masking + * Sun Aug 28 2016 Jeremy Newton - 0.9-1 - Update to 0.9