On 07/19/2015 03:39 PM, Gordon Messmer wrote: > >> Please use "diff -u". Standard diff format is mostly unreadable. >> Unified diff is much more comprehensible. > > ... and maybe output to a file and attach that file. Your client is > wrapping lines, making it hard to read the output. diff -u attached. It looks worse ( to me ) than the last one. -- Paul Cartwright Registered Linux User #367800 and new counter #561587
--- grub.cfg 2015-07-19 07:46:32.105534489 -0400 +++ grub.8-300 2015-07-19 07:45:44.066151663 -0400 @@ -69,7 +69,7 @@ ### END /etc/grub.d/00_header ### ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Fedora (4.0.8-300.fc22.x86_64) 22 (Twenty Two)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.8-300.fc22.x86_64-advanced-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { +menuentry 'Fedora (4.0.8-300.fc22.x86_64+debug) 22 (Twenty Two)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.7-300.fc22.x86_64-advanced-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { load_video set gfxpayload=keep insmod gzio @@ -81,10 +81,10 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-4.0.8-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet - initrd16 /boot/initramfs-4.0.8-300.fc22.x86_64.img + linux16 /boot/vmlinuz-4.0.8-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet LANG=en_US.UTF-8 + initrd16 /boot/initramfs-4.0.8-300.fc22.x86_64+debug.img } -menuentry 'Fedora (4.0.8-300.fc22.x86_64) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.8-300.fc22.x86_64-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { +menuentry 'Fedora (4.0.8-300.fc22.x86_64) 22 (Twenty Two)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.7-300.fc22.x86_64-advanced-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { load_video set gfxpayload=keep insmod gzio @@ -96,7 +96,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-4.0.8-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro single rhgb quiet + linux16 /boot/vmlinuz-4.0.8-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet LANG=en_US.UTF-8 initrd16 /boot/initramfs-4.0.8-300.fc22.x86_64.img } menuentry 'Fedora (4.0.7-300.fc22.x86_64) 22 (Twenty Two)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.7-300.fc22.x86_64-advanced-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -111,7 +111,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-4.0.7-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet + linux16 /boot/vmlinuz-4.0.7-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet initrd16 /boot/initramfs-4.0.7-300.fc22.x86_64.img } menuentry 'Fedora (4.0.7-300.fc22.x86_64) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.7-300.fc22.x86_64-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -141,7 +141,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-4.0.6-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet + linux16 /boot/vmlinuz-4.0.6-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet initrd16 /boot/initramfs-4.0.6-300.fc22.x86_64.img } menuentry 'Fedora (4.0.6-300.fc22.x86_64) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.6-300.fc22.x86_64-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -159,36 +159,6 @@ linux16 /boot/vmlinuz-4.0.6-300.fc22.x86_64 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro single rhgb quiet initrd16 /boot/initramfs-4.0.6-300.fc22.x86_64.img } -menuentry 'Fedora (4.0.8-300.fc22.x86_64+debug) 22 (Twenty Two)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.8-300.fc22.x86_64+debug-advanced-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { - load_video - set gfxpayload=keep - insmod gzio - insmod part_msdos - insmod ext2 - set root='hd1,msdos6' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos6 --hint-efi=hd1,msdos6 --hint-baremetal=ahci1,msdos6 --hint='hd1,msdos6' a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 - else - search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 - fi - linux16 /boot/vmlinuz-4.0.8-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet - initrd16 /boot/initramfs-4.0.8-300.fc22.x86_64+debug.img -} -menuentry 'Fedora (4.0.8-300.fc22.x86_64+debug) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.8-300.fc22.x86_64+debug-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { - load_video - set gfxpayload=keep - insmod gzio - insmod part_msdos - insmod ext2 - set root='hd1,msdos6' - if [ x$feature_platform_search_hint = xy ]; then - search --no-floppy --fs-uuid --set=root --hint-bios=hd1,msdos6 --hint-efi=hd1,msdos6 --hint-baremetal=ahci1,msdos6 --hint='hd1,msdos6' a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 - else - search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 - fi - linux16 /boot/vmlinuz-4.0.8-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro single rhgb quiet - initrd16 /boot/initramfs-4.0.8-300.fc22.x86_64+debug.img -} menuentry 'Fedora (4.0.7-300.fc22.x86_64+debug) 22 (Twenty Two)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.7-300.fc22.x86_64+debug-advanced-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { load_video set gfxpayload=keep @@ -201,7 +171,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-4.0.7-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet + linux16 /boot/vmlinuz-4.0.7-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet initrd16 /boot/initramfs-4.0.7-300.fc22.x86_64+debug.img } menuentry 'Fedora (4.0.7-300.fc22.x86_64+debug) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.7-300.fc22.x86_64+debug-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -231,7 +201,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-4.0.6-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet + linux16 /boot/vmlinuz-4.0.6-300.fc22.x86_64+debug root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet initrd16 /boot/initramfs-4.0.6-300.fc22.x86_64+debug.img } menuentry 'Fedora (4.0.6-300.fc22.x86_64+debug) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.0.6-300.fc22.x86_64+debug-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -260,7 +230,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-0-rescue-78db501f7f8d403c938e4d646de9a9c4 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet + linux16 /boot/vmlinuz-0-rescue-78db501f7f8d403c938e4d646de9a9c4 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet initrd16 /boot/initramfs-0-rescue-78db501f7f8d403c938e4d646de9a9c4.img } menuentry 'Fedora (0-rescue-78db501f7f8d403c938e4d646de9a9c4) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-0-rescue-78db501f7f8d403c938e4d646de9a9c4-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -288,7 +258,7 @@ else search --no-floppy --fs-uuid --set=root a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 fi - linux16 /boot/vmlinuz-0-rescue-7a49ecb4c939408baf9f3ced07af2fe4 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet + linux16 /boot/vmlinuz-0-rescue-7a49ecb4c939408baf9f3ced07af2fe4 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro rhgb quiet initrd16 /boot/initramfs-0-rescue-7a49ecb4c939408baf9f3ced07af2fe4.img } menuentry 'Fedora (0-rescue-7a49ecb4c939408baf9f3ced07af2fe4) 22 (Twenty Two) (recovery mode)' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-0-rescue-7a49ecb4c939408baf9f3ced07af2fe4-recovery-a1f0e69f-f7b4-41b3-8a88-adbc6d59d957' { @@ -305,7 +275,7 @@ linux16 /boot/vmlinuz-0-rescue-7a49ecb4c939408baf9f3ced07af2fe4 root=UUID=a1f0e69f-f7b4-41b3-8a88-adbc6d59d957 ro single rhgb quiet initrd16 /boot/initramfs-0-rescue-7a49ecb4c939408baf9f3ced07af2fe4.img } -if [ "x$default" = 'Fedora (4.0.8-300.fc22.x86_64) 22 (Twenty Two)' ]; then default='Advanced options for Fedora>Fedora (4.0.8-300.fc22.x86_64) 22 (Twenty Two)'; fi; +if [ "x$default" = 'Fedora (4.0.7-300.fc22.x86_64) 22 (Twenty Two)' ]; then default='Advanced options for Fedora>Fedora (4.0.7-300.fc22.x86_64) 22 (Twenty Two)'; fi; ### END /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/20_linux_xen ###
-- users mailing list users@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe or change subscription options: https://admin.fedoraproject.org/mailman/listinfo/users Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct Guidelines: http://fedoraproject.org/wiki/Mailing_list_guidelines Have a question? Ask away: http://ask.fedoraproject.org