rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 253157 from home:michael-chang:branches:Base:System

Browse Source 
- packaging 20_memtest86+ and 20_ppc_terminfo in corresponing grubarch
  package

- Add '80_suse_btrfs_snapshot' required to show btrfs snapshots inside
  of the boot menu.

OBS-URL: https://build.opensuse.org/request/show/253157
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=121
This commit is contained in:
Marcus Meissner 2014-10-01 07:24:29 +00:00 committed by Git OBS Bridge
parent 1336b185ee
commit fcbf2cb71b
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
80_suse_btrfs_snapshot Normal file
View File

@ -0,0 +1,10 @@
#! /bin/sh
set -e
if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
[ "x${GRUB_FS}" = "xbtrfs" ] ; then
cat <<EOF
if [ -f "/.snapshots/grub-snapshot.cfg" ]; then
source "/.snapshots/grub-snapshot.cfg"
fi
EOF
fi

12
grub2.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Sep 30 03:45:04 UTC 2014 - mchang@suse.com
- packaging 20_memtest86+ and 20_ppc_terminfo in corresponing grubarch
package
-------------------------------------------------------------------
Mon Sep 29 07:22:29 UTC 2014 - fcastelli@suse.com
- Add '80_suse_btrfs_snapshot' required to show btrfs snapshots inside
of the boot menu.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 28 06:16:35 UTC 2014 - arvidjaar@gmail.com Sun Sep 28 06:16:35 UTC 2014 - arvidjaar@gmail.com

23
grub2.spec
View File

@ -122,6 +122,7 @@ Source7: 20_memtest86+
Source10: openSUSE-UEFI-CA-Certificate.crt Source10: openSUSE-UEFI-CA-Certificate.crt
Source11: SLES-UEFI-CA-Certificate.crt Source11: SLES-UEFI-CA-Certificate.crt
Source12: grub2-snapper-plugin.sh Source12: grub2-snapper-plugin.sh
Source14: 80_suse_btrfs_snapshot
Source1000: PATCH_POLICY Source1000: PATCH_POLICY
Patch1: rename-grub-info-file-to-grub2.patch Patch1: rename-grub-info-file-to-grub2.patch
Patch2: grub2-linux.patch Patch2: grub2-linux.patch
@ -621,6 +622,15 @@ rm $RPM_BUILD_ROOT%{_datadir}/%{name}/*.h
install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub install -m 644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/default/grub
install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once install -m 755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sbindir}/grub2-once
install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub install -m 755 -D %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/snapper/plugins/grub
install -m 755 -D %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
%ifnarch %{ix86} x86_64
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/20_memtest86+
%endif
%ifnarch ppc ppc64 ppc64le
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/20_ppc_terminfo
%endif
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
# Rename grub2.chrp back to grub.chrp so it is found by tools # Rename grub2.chrp back to grub.chrp so it is found by tools
@ -768,7 +778,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/??_* %config %{_sysconfdir}/grub.d/00_header
%config %{_sysconfdir}/grub.d/10_linux
%config %{_sysconfdir}/grub.d/20_linux_xen
%config %{_sysconfdir}/grub.d/30_os-prober
%config %{_sysconfdir}/grub.d/40_custom
%config %{_sysconfdir}/grub.d/41_custom
%config %{_sysconfdir}/grub.d/90_persistent
%{_sbindir}/%{name}-bios-setup %{_sbindir}/%{name}-bios-setup
%{_sbindir}/%{name}-macbless %{_sbindir}/%{name}-macbless
%{_sbindir}/%{name}-mkconfig %{_sbindir}/%{name}-mkconfig
@ -850,8 +866,12 @@ fi
%files %{grubarch} %files %{grubarch}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%ifarch %{ix86} x86_64
%config %{_sysconfdir}/grub.d/20_memtest86+
%endif
%dir %{_libdir}/%{name}/%{grubarch} %dir %{_libdir}/%{name}/%{grubarch}
%ifarch ppc ppc64 ppc64le %ifarch ppc ppc64 ppc64le
%config %{_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
@ -900,6 +920,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
%{_libdir}/snapper/plugins/grub %{_libdir}/snapper/plugins/grub
%ifarch x86_64 %ifarch x86_64