pool/util-linux
SHA256
2
0
Fork 4
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Accepting request 659326 from Base:System

Browse Source 
- Drop rfkill-block@.service and rfkill-unblock@.service that
  functionally conflict with systemd-rfkill@.service
  (boo#1092820#c13).

- Drop rfkill-block@.service and rfkill-unblock@.service that
  functionally conflict with systemd-rfkill@.service
  (boo#1092820#c13).

- Drop rfkill-block@.service and rfkill-unblock@.service that
  functionally conflict with systemd-rfkill@.service
  (boo#1092820#c13).

OBS-URL: https://build.opensuse.org/request/show/659326
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=234
This commit is contained in:
Dominique Leuenberger 2018-12-28 11:32:04 +00:00 committed by Git OBS Bridge
commit c9396f1e58
8 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python3-libmount.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com
- Drop rfkill-block@.service and rfkill-unblock@.service that
functionally conflict with systemd-rfkill@.service
(boo#1092820#c13).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com

6
python3-libmount.spec
View File

@ -140,8 +140,6 @@ Source13: %{_name}.keyring
Source14: runuser.pamd Source14: runuser.pamd
Source15: runuser-l.pamd Source15: runuser-l.pamd
Source16: su-l.pamd Source16: su-l.pamd
Source41: rfkill-block@.service
Source42: rfkill-unblock@.service
# #
Source51: blkid.conf Source51: blkid.conf
## ##
@ -599,8 +597,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service
install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service
%endif %endif
# #
# util-linux install # util-linux install
@ -862,8 +858,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%doc Documentation/mount.txt %doc Documentation/mount.txt
%doc Documentation/pg.txt %doc Documentation/pg.txt
%{_unitdir}/raw.service %{_unitdir}/raw.service
%{_unitdir}/rfkill-block@.service
%{_unitdir}/rfkill-unblock@.service
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw
%config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf %config(noreplace) %{_sysconfdir}/blkid.conf

10
rfkill-block@.service
View File

@ -1,10 +0,0 @@
[Unit]
Description=RFKill-Block %I
After=rfkill-unblock@all.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/rfkill block %I
[Install]
WantedBy=multi-user.target

10
rfkill-unblock@.service
View File

@ -1,10 +0,0 @@
[Unit]
Description=RFKill-Unblock %I
After=rfkill-block@all.service
[Service]
Type=oneshot
ExecStart=/usr/sbin/rfkill unblock %I
[Install]
WantedBy=multi-user.target

7
util-linux-systemd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com
- Drop rfkill-block@.service and rfkill-unblock@.service that
functionally conflict with systemd-rfkill@.service
(boo#1092820#c13).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com

6
util-linux-systemd.spec
View File

@ -140,8 +140,6 @@ Source13: %{_name}.keyring
Source14: runuser.pamd Source14: runuser.pamd
Source15: runuser-l.pamd Source15: runuser-l.pamd
Source16: su-l.pamd Source16: su-l.pamd
Source41: rfkill-block@.service
Source42: rfkill-unblock@.service
# #
Source51: blkid.conf Source51: blkid.conf
## ##
@ -599,8 +597,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service
install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service
%endif %endif
# #
# util-linux install # util-linux install
@ -862,8 +858,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%doc Documentation/mount.txt %doc Documentation/mount.txt
%doc Documentation/pg.txt %doc Documentation/pg.txt
%{_unitdir}/raw.service %{_unitdir}/raw.service
%{_unitdir}/rfkill-block@.service
%{_unitdir}/rfkill-unblock@.service
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw
%config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf %config(noreplace) %{_sysconfdir}/blkid.conf

7
util-linux.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Dec 10 19:08:35 CET 2018 - sbrabec@suse.com
- Drop rfkill-block@.service and rfkill-unblock@.service that
functionally conflict with systemd-rfkill@.service
(boo#1092820#c13).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com Wed Nov 21 17:55:03 CET 2018 - sbrabec@suse.com

6
util-linux.spec
View File

@ -140,8 +140,6 @@ Source13: %{_name}.keyring
Source14: runuser.pamd Source14: runuser.pamd
Source15: runuser-l.pamd Source15: runuser-l.pamd
Source16: su-l.pamd Source16: su-l.pamd
Source41: rfkill-block@.service
Source42: rfkill-unblock@.service
# #
Source51: blkid.conf Source51: blkid.conf
## ##
@ -599,8 +597,6 @@ install -m 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/pam.d/runuser-l
install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su
install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE16} %{buildroot}%{_sysconfdir}/pam.d/su-l
install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su
install -Dm644 %{SOURCE41} %{buildroot}%{_unitdir}/rfkill-block@.service
install -Dm644 %{SOURCE42} %{buildroot}%{_unitdir}/rfkill-unblock@.service
%endif %endif
# #
# util-linux install # util-linux install
@ -862,8 +858,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || :
%doc Documentation/mount.txt %doc Documentation/mount.txt
%doc Documentation/pg.txt %doc Documentation/pg.txt
%{_unitdir}/raw.service %{_unitdir}/raw.service
%{_unitdir}/rfkill-block@.service
%{_unitdir}/rfkill-unblock@.service
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw
%config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/filesystems
%config(noreplace) %{_sysconfdir}/blkid.conf %config(noreplace) %{_sysconfdir}/blkid.conf