Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #394 from ancorgs/merge_before_fix_pmbr
Sync storage-ng branch with master
- Loading branch information
Showing
14 changed files
with
312 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| # | ||
| # DO NOT EDIT THIS FILE | ||
| # | ||
| # It is automatically generated by grub2-mkconfig using templates | ||
| # from /etc/grub.d and settings from /etc/default/grub | ||
| # | ||
|
|
||
| ### BEGIN /etc/grub.d/00_header ### | ||
| if [ -f ${config_directory}/grubenv ]; then | ||
| load_env -f ${config_directory}/grubenv | ||
| elif [ -s $prefix/grubenv ]; then | ||
| load_env | ||
| fi | ||
|
|
||
| if [ "${env_block}" ] ; then | ||
| load_env -f "${env_block}" | ||
| fi | ||
|
|
||
| if [ "${next_entry}" ] ; then | ||
| set default="${next_entry}" | ||
| set next_entry= | ||
| save_env next_entry | ||
| if [ "${env_block}" ] ; then | ||
| save_env -f "${env_block}" next_entry | ||
| fi | ||
| set boot_once=true | ||
| else | ||
| set default="${saved_entry}" | ||
| fi | ||
|
|
||
| if [ x"${feature_menuentry_id}" = xy ]; then | ||
| menuentry_id_option="--id" | ||
| else | ||
| menuentry_id_option="" | ||
| fi | ||
|
|
||
| export menuentry_id_option | ||
|
|
||
| if [ "${prev_saved_entry}" ]; then | ||
| set saved_entry="${prev_saved_entry}" | ||
| save_env saved_entry | ||
| set prev_saved_entry= | ||
| save_env prev_saved_entry | ||
| set boot_once=true | ||
| fi | ||
|
|
||
| function savedefault { | ||
| if [ -z "${boot_once}" ]; then | ||
| saved_entry="${chosen}" | ||
| save_env saved_entry | ||
| fi | ||
| } | ||
|
|
||
| function load_video { | ||
| if [ x$feature_all_video_module = xy ]; then | ||
| insmod all_video | ||
| else | ||
| insmod efi_gop | ||
| insmod efi_uga | ||
| insmod ieee1275_fb | ||
| insmod vbe | ||
| insmod vga | ||
| insmod video_bochs | ||
| insmod video_cirrus | ||
| fi | ||
| } | ||
|
|
||
| if [ x$feature_default_font_path = xy ] ; then | ||
| font=unicode | ||
| else | ||
| insmod part_msdos | ||
| insmod ext2 | ||
| set root='hd0,msdos1' | ||
| if [ x$feature_platform_search_hint = xy ]; then | ||
| search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| else | ||
| search --no-floppy --fs-uuid --set=root b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| fi | ||
| font="/usr/share/grub2/unicode.pf2" | ||
| fi | ||
|
|
||
| if loadfont $font ; then | ||
| set gfxmode=auto | ||
| load_video | ||
| insmod gfxterm | ||
| set locale_dir=$prefix/locale | ||
| set lang=ru_RU | ||
| insmod gettext | ||
| fi | ||
| terminal_output gfxterm | ||
| insmod part_msdos | ||
| insmod ext2 | ||
| set root='hd0,msdos1' | ||
| if [ x$feature_platform_search_hint = xy ]; then | ||
| search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| else | ||
| search --no-floppy --fs-uuid --set=root b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| fi | ||
| insmod gfxmenu | ||
| loadfont ($root)/boot/grub2/themes/openSUSE/ascii.pf2 | ||
| loadfont ($root)/boot/grub2/themes/openSUSE/DejaVuSans10.pf2 | ||
| loadfont ($root)/boot/grub2/themes/openSUSE/DejaVuSans12.pf2 | ||
| loadfont ($root)/boot/grub2/themes/openSUSE/DejaVuSans-Bold14.pf2 | ||
| insmod png | ||
| set theme=($root)/boot/grub2/themes/openSUSE/theme.txt | ||
| export theme | ||
| if [ x${boot_once} = xtrue ]; then | ||
| set timeout=0 | ||
| elif [ x$feature_timeout_style = xy ] ; then | ||
| set timeout_style=menu | ||
| set timeout=8 | ||
| # Fallback normal timeout code in case the timeout_style feature is | ||
| # unavailable. | ||
| else | ||
| set timeout=8 | ||
| fi | ||
| ### END /etc/grub.d/00_header ### | ||
|
|
||
| ### BEGIN /etc/grub.d/00_tuned ### | ||
| set tuned_params="" | ||
| ### END /etc/grub.d/00_tuned ### | ||
|
|
||
| ### BEGIN /etc/grub.d/10_linux ### | ||
| menuentry 'openSUSE Tumbleweed' --class opensuse --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-b66c1028-cd4a-4c08-b92d-fc4b9840845d' { | ||
| load_video | ||
| set gfxpayload=keep | ||
| insmod gzio | ||
| insmod part_msdos | ||
| insmod ext2 | ||
| set root='hd0,msdos1' | ||
| if [ x$feature_platform_search_hint = xy ]; then | ||
| search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| else | ||
| search --no-floppy --fs-uuid --set=root b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| fi | ||
| echo 'Загружается Linux 4.8.6-2-default …' | ||
| linux /boot/vmlinuz-4.8.6-2-default root=UUID=b66c1028-cd4a-4c08-b92d-fc4b9840845d splash=silent quiet showopts elevator=cfq | ||
| echo 'Загружается начальный виртуальный диск …' | ||
| initrd /boot/initrd-4.8.6-2-default | ||
| } | ||
| submenu 'Дополнительные параметры для openSUSE Tumbleweed' --hotkey=1 $menuentry_id_option 'gnulinux-advanced-b66c1028-cd4a-4c08-b92d-fc4b9840845d' { | ||
| menuentry 'openSUSE Tumbleweed, с Linux 4.8.6-2-default' --hotkey=2 --class opensuse --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.8.6-2-default-advanced-b66c1028-cd4a-4c08-b92d-fc4b9840845d' { | ||
| load_video | ||
| set gfxpayload=keep | ||
| insmod gzio | ||
| insmod part_msdos | ||
| insmod ext2 | ||
| set root='hd0,msdos1' | ||
| if [ x$feature_platform_search_hint = xy ]; then | ||
| search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| else | ||
| search --no-floppy --fs-uuid --set=root b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| fi | ||
| echo 'Загружается Linux 4.8.6-2-default …' | ||
| linux /boot/vmlinuz-4.8.6-2-default root=UUID=b66c1028-cd4a-4c08-b92d-fc4b9840845d splash=silent quiet showopts elevator=cfq | ||
| echo 'Загружается начальный виртуальный диск …' | ||
| initrd /boot/initrd-4.8.6-2-default | ||
| } | ||
| menuentry 'openSUSE Tumbleweed, с Linux 4.8.6-1-default' --class opensuse --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.8.6-1-default-advanced-b66c1028-cd4a-4c08-b92d-fc4b9840845d' { | ||
| load_video | ||
| set gfxpayload=keep | ||
| insmod gzio | ||
| insmod part_msdos | ||
| insmod ext2 | ||
| set root='hd0,msdos1' | ||
| if [ x$feature_platform_search_hint = xy ]; then | ||
| search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos1 --hint-efi=hd0,msdos1 --hint-baremetal=ahci0,msdos1 --hint='hd0,msdos1' b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| else | ||
| search --no-floppy --fs-uuid --set=root b66c1028-cd4a-4c08-b92d-fc4b9840845d | ||
| fi | ||
| echo 'Загружается Linux 4.8.6-1-default …' | ||
| linux /boot/vmlinuz-4.8.6-1-default root=UUID=b66c1028-cd4a-4c08-b92d-fc4b9840845d splash=silent quiet showopts elevator=cfq | ||
| echo 'Загружается начальный виртуальный диск …' | ||
| initrd /boot/initrd-4.8.6-1-default | ||
| } | ||
| } | ||
|
|
||
| ### END /etc/grub.d/10_linux ### | ||
|
|
||
| ### BEGIN /etc/grub.d/20_linux_xen ### | ||
|
|
||
| ### END /etc/grub.d/20_linux_xen ### | ||
|
|
||
| ### BEGIN /etc/grub.d/20_memtest86+ ### | ||
| ### END /etc/grub.d/20_memtest86+ ### | ||
|
|
||
| ### BEGIN /etc/grub.d/30_os-prober ### | ||
| ### END /etc/grub.d/30_os-prober ### | ||
|
|
||
| ### BEGIN /etc/grub.d/40_custom ### | ||
| # This file provides an easy way to add custom menu entries. Simply type the | ||
| # menu entries you want to add after this comment. Be careful not to change | ||
| # the 'exec tail' line above. | ||
| ### END /etc/grub.d/40_custom ### | ||
|
|
||
| ### BEGIN /etc/grub.d/41_custom ### | ||
| if [ -f ${config_directory}/custom.cfg ]; then | ||
| source ${config_directory}/custom.cfg | ||
| elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then | ||
| source $prefix/custom.cfg; | ||
| fi | ||
| ### END /etc/grub.d/41_custom ### | ||
|
|
||
| ### BEGIN /etc/grub.d/80_suse_btrfs_snapshot ### | ||
| ### END /etc/grub.d/80_suse_btrfs_snapshot ### | ||
|
|
||
| ### BEGIN /etc/grub.d/90_persistent ### | ||
| ### END /etc/grub.d/90_persistent ### | ||
|
|
||
| ### BEGIN /etc/grub.d/95_textmode ### | ||
| ### END /etc/grub.d/95_textmode ### |
Oops, something went wrong.