Attachment 8084 Details for Bug 18780 – full diff of grub.cfg from install and from update-grub2 in system

full diff of grub.cfg from install and from update-grub2 in system

grub.cfg.diff (text/plain), 2.89 KB, created by Barry Jackson on 2016-06-28 18:31:32 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Barry Jackson

Created: 2016-06-28 18:31:32 CEST

Size: 2.89 KB

patch

obsolete

>--- grub.cfg	2016-06-28 17:01:38.409462320 +0100
>+++ grub.cfg.new	2016-06-28 17:03:47.286273972 +0100
>@@ -131,7 +131,7 @@
> 	else
> 	  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
> 	fi
>-	linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=/dev/sda4 ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
>+	linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
> 	initrdefi /boot/initrd-4.6.3-desktop-1.mga6.img
> }
> submenu 'Advanced options for Mageia' $menuentry_id_option 'gnulinux-advanced-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
>@@ -148,7 +148,7 @@
> 		else
> 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
> 		fi
>-		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=/dev/sda4 ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
>+		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
> 		initrdefi /boot/initrd-4.6.3-desktop-1.mga6.img
> 	}
> 	menuentry 'Mageia (4.6.3-desktop-1.mga6) 6 (recovery mode)' --class mageia --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.6.3-desktop-1.mga6-recovery-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
>@@ -163,7 +163,7 @@
> 		else
> 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
> 		fi
>-		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=/dev/sda4 ro failsafe 
>+		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro failsafe 
> 		initrdefi /boot/initrd-4.6.3-desktop-1.mga6.img
> 	}
> 	menuentry 'Mageia (desktop) 6' --class mageia --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-desktop-advanced-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
>@@ -179,7 +179,7 @@
> 		else
> 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
> 		fi
>-		linuxefi /boot/vmlinuz-desktop root=/dev/sda4 ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
>+		linuxefi /boot/vmlinuz-desktop root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
> 		initrdefi /boot/initrd-desktop.img
> 	}
> 	menuentry 'Mageia (desktop) 6 (recovery mode)' --class mageia --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-desktop-recovery-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
>@@ -194,7 +194,7 @@
> 		else
> 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
> 		fi
>-		linuxefi /boot/vmlinuz-desktop root=/dev/sda4 ro failsafe 
>+		linuxefi /boot/vmlinuz-desktop root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro failsafe 
> 		initrdefi /boot/initrd-desktop.img
> 	}
> }

--- grub.cfg	2016-06-28 17:01:38.409462320 +0100
+++ grub.cfg.new	2016-06-28 17:03:47.286273972 +0100
@@ -131,7 +131,7 @@
 	else
 	  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
 	fi
-	linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=/dev/sda4 ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
+	linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
 	initrdefi /boot/initrd-4.6.3-desktop-1.mga6.img
 }
 submenu 'Advanced options for Mageia' $menuentry_id_option 'gnulinux-advanced-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
@@ -148,7 +148,7 @@
 		else
 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
 		fi
-		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=/dev/sda4 ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
+		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
 		initrdefi /boot/initrd-4.6.3-desktop-1.mga6.img
 	}
 	menuentry 'Mageia (4.6.3-desktop-1.mga6) 6 (recovery mode)' --class mageia --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-4.6.3-desktop-1.mga6-recovery-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
@@ -163,7 +163,7 @@
 		else
 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
 		fi
-		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=/dev/sda4 ro failsafe 
+		linuxefi /boot/vmlinuz-4.6.3-desktop-1.mga6 root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro failsafe 
 		initrdefi /boot/initrd-4.6.3-desktop-1.mga6.img
 	}
 	menuentry 'Mageia (desktop) 6' --class mageia --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-desktop-advanced-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
@@ -179,7 +179,7 @@
 		else
 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
 		fi
-		linuxefi /boot/vmlinuz-desktop root=/dev/sda4 ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
+		linuxefi /boot/vmlinuz-desktop root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro   splash quiet noiswmd resume=UUID=1097bb8c-3820-4b3a-b796-b417c9aa56d8 vga=791
 		initrdefi /boot/initrd-desktop.img
 	}
 	menuentry 'Mageia (desktop) 6 (recovery mode)' --class mageia --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-desktop-recovery-93ccb9dc-ef4e-401a-9e24-c4ee130f08ec' {
@@ -194,7 +194,7 @@
 		else
 		  search --no-floppy --fs-uuid --set=root 93ccb9dc-ef4e-401a-9e24-c4ee130f08ec
 		fi
-		linuxefi /boot/vmlinuz-desktop root=/dev/sda4 ro failsafe 
+		linuxefi /boot/vmlinuz-desktop root=UUID=93ccb9dc-ef4e-401a-9e24-c4ee130f08ec ro failsafe 
 		initrdefi /boot/initrd-desktop.img
 	}
 }

Actions: View

Attachments on bug 18780: 8084 | 8195 | 8196 | 8197 | 8198 | 8207 | 8213