pool/grub2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 621929 from home:jbohac:branches:Base:System

Browse Source 
- grub2.spec: change %config to %config(noreplace)
  Don't overwrite user changes to config files on upgrades.

According to the openSUSE:Specfile guidelines, %config(noreplace) is preferred
unless plain %config is necessarry:

	"As a rule of thumb, use %config(noreplace) instead of plain %config unless
	your best, educated guess is that doing so will break things." and  "Whenever
	plain %config is used, add a brief comment to the specfile explaining why."

Since there is no explanation why these files should not be %config(noreplace),
I suppose it's just an ommission. A user modifying these file should not have
his changes overwritten on upgrade.

OBS-URL: https://build.opensuse.org/request/show/621929
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=306
This commit is contained in:
Michael Chang 2018-07-12 07:27:34 +00:00 committed by Git OBS Bridge
parent 71e0203c09
commit 23a8e78188
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 10 15:57:50 UTC 2018 - jbohac@suse.cz
- grub2.spec: change %config to %config(noreplace)
Don't overwrite user changes to config files on upgrades.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 4 12:55:30 UTC 2018 - josef.moellers@suse.com Wed Jul 4 12:55:30 UTC 2018 - josef.moellers@suse.com

20
grub2.spec
View File

@ -1032,13 +1032,13 @@ fi
%config(noreplace) %{_sysconfdir}/default/grub %config(noreplace) %{_sysconfdir}/default/grub
%dir %{_sysconfdir}/grub.d %dir %{_sysconfdir}/grub.d
%{_sysconfdir}/grub.d/README %{_sysconfdir}/grub.d/README
%config %{_sysconfdir}/grub.d/00_header %config(noreplace) %{_sysconfdir}/grub.d/00_header
%config %{_sysconfdir}/grub.d/10_linux %config(noreplace) %{_sysconfdir}/grub.d/10_linux
%config %{_sysconfdir}/grub.d/20_linux_xen %config(noreplace) %{_sysconfdir}/grub.d/20_linux_xen
%config(noreplace) %{_sysconfdir}/grub.d/40_custom %config(noreplace) %{_sysconfdir}/grub.d/40_custom
%config %{_sysconfdir}/grub.d/41_custom %config(noreplace) %{_sysconfdir}/grub.d/41_custom
%config %{_sysconfdir}/grub.d/90_persistent %config(noreplace) %{_sysconfdir}/grub.d/90_persistent
%config %{_sysconfdir}/grub.d/95_textmode %config(noreplace) %{_sysconfdir}/grub.d/95_textmode
%{_sbindir}/%{name}-install %{_sbindir}/%{name}-install
%{_sbindir}/%{name}-mkconfig %{_sbindir}/%{name}-mkconfig
%{_sbindir}/%{name}-once %{_sbindir}/%{name}-once
@ -1100,7 +1100,7 @@ fi
%{_mandir}/man1/%{name}-emu.1.* %{_mandir}/man1/%{name}-emu.1.*
%endif %endif
%ifnarch s390x %ifnarch s390x
%config %{_sysconfdir}/grub.d/30_os-prober %config(noreplace) %{_sysconfdir}/grub.d/30_os-prober
%{_bindir}/%{name}-glue-efi %{_bindir}/%{name}-glue-efi
%{_bindir}/%{name}-mount %{_bindir}/%{name}-mount
%{_sbindir}/%{name}-bios-setup %{_sbindir}/%{name}-bios-setup
@ -1124,11 +1124,11 @@ fi
%files %{grubarch} %files %{grubarch}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
%config %{_sysconfdir}/grub.d/20_memtest86+ %config(noreplace) %{_sysconfdir}/grub.d/20_memtest86+
%endif %endif
%dir %{_libdir}/%{name}/%{grubarch} %dir %{_libdir}/%{name}/%{grubarch}
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%config %{_sysconfdir}/grub.d/20_ppc_terminfo %config(noreplace) %{_sysconfdir}/grub.d/20_ppc_terminfo
# This is intentionally "grub.chrp" and not "%{name}.chrp" # This is intentionally "grub.chrp" and not "%{name}.chrp"
%{_libdir}/%{name}/%{grubarch}/grub.chrp %{_libdir}/%{name}/%{grubarch}/grub.chrp
%{_libdir}/%{name}/%{grubarch}/bootinfo.txt %{_libdir}/%{name}/%{grubarch}/bootinfo.txt
@ -1183,7 +1183,7 @@ fi
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_libdir}/snapper %dir %{_libdir}/snapper
%dir %{_libdir}/snapper/plugins %dir %{_libdir}/snapper/plugins
%config %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot %config(noreplace) %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
%{_libdir}/snapper/plugins/grub %{_libdir}/snapper/plugins/grub
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64