grub.cfg.diff

grub.cfg.diff

diff --git a/mnt/boot/grub/grub.cfg b/mnt/archliger/boot/grub/grub.cfg
old mode 100755
new mode 100644
index e0a49aa..64876ae
--- a/mnt/boot/grub/grub.cfg
+++ b/mnt/archliger/boot/grub/grub.cfg
@@ -85,7 +85,7 @@ if loadfont $font ; then
   load_video
   insmod gfxterm
   set locale_dir=$prefix/locale
-  set lang=en_US
+  set lang=en_CA
   insmod gettext
 fi
 terminal_input console
@@ -134,6 +134,73 @@ fi
 ### END /etc/grub.d/00_header ###
 
 ### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Manjaro Linux' --class manjaro --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-d7454cfc-6cae-46a7-bfe9-44d65e53c57b' {
+	savedefault
+	load_video
+	set gfxpayload=keep
+	insmod gzio
+	insmod part_gpt
+	insmod cryptodisk
+	insmod luks
+	insmod gcry_rijndael
+	insmod gcry_rijndael
+	insmod gcry_sha256
+	insmod ext2
+	cryptomount -u cc0d2f3567044dffb1f6fd3cd8f98c52
+	set root='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'
+	if [ x$feature_platform_search_hint = xy ]; then
+	  search --no-floppy --fs-uuid --set=root --hint='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'  d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+	else
+	  search --no-floppy --fs-uuid --set=root d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+	fi
+	linux	/boot/vmlinuz-5.15-x86_64 root=UUID=d7454cfc-6cae-46a7-bfe9-44d65e53c57b rw  cryptdevice=UUID=cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52:luks-cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52 root=/dev/mapper/luks-cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52 apparmor=1 security=apparmor udev.log_priority=3
+	initrd	/boot/amd-ucode.img /boot/initramfs-5.15-x86_64.img
+}
+submenu 'Advanced options for Manjaro Linux' $menuentry_id_option 'gnulinux-advanced-d7454cfc-6cae-46a7-bfe9-44d65e53c57b' {
+	menuentry 'Manjaro Linux (Kernel: 5.15.7-1-MANJARO x64)' --class manjaro --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.15.7-1-MANJARO x64-advanced-d7454cfc-6cae-46a7-bfe9-44d65e53c57b' {
+	savedefault
+		load_video
+		set gfxpayload=keep
+		insmod gzio
+		insmod part_gpt
+		insmod cryptodisk
+		insmod luks
+		insmod gcry_rijndael
+		insmod gcry_rijndael
+		insmod gcry_sha256
+		insmod ext2
+		cryptomount -u cc0d2f3567044dffb1f6fd3cd8f98c52
+		set root='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'
+		if [ x$feature_platform_search_hint = xy ]; then
+		  search --no-floppy --fs-uuid --set=root --hint='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'  d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+		else
+		  search --no-floppy --fs-uuid --set=root d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+		fi
+		linux	/boot/vmlinuz-5.15-x86_64 root=UUID=d7454cfc-6cae-46a7-bfe9-44d65e53c57b rw  cryptdevice=UUID=cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52:luks-cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52 root=/dev/mapper/luks-cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52 apparmor=1 security=apparmor udev.log_priority=3
+		initrd	/boot/amd-ucode.img /boot/initramfs-5.15-x86_64.img
+	}
+	menuentry 'Manjaro Linux (Kernel: 5.15.7-1-MANJARO x64 - fallback initramfs)' --class manjaro --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-5.15.7-1-MANJARO x64-fallback-d7454cfc-6cae-46a7-bfe9-44d65e53c57b' {
+		load_video
+		set gfxpayload=keep
+		insmod gzio
+		insmod part_gpt
+		insmod cryptodisk
+		insmod luks
+		insmod gcry_rijndael
+		insmod gcry_rijndael
+		insmod gcry_sha256
+		insmod ext2
+		cryptomount -u cc0d2f3567044dffb1f6fd3cd8f98c52
+		set root='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'
+		if [ x$feature_platform_search_hint = xy ]; then
+		  search --no-floppy --fs-uuid --set=root --hint='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'  d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+		else
+		  search --no-floppy --fs-uuid --set=root d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+		fi
+		linux	/boot/vmlinuz-5.15-x86_64 root=UUID=d7454cfc-6cae-46a7-bfe9-44d65e53c57b rw  cryptdevice=UUID=cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52:luks-cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52 root=/dev/mapper/luks-cc0d2f35-6704-4dff-b1f6-fd3cd8f98c52 apparmor=1 security=apparmor udev.log_priority=3
+		initrd	/boot/initramfs-5.15-x86_64-fallback.img
+	}
+}
 
 ### END /etc/grub.d/10_linux ###
 
@@ -170,4 +237,10 @@ fi
 ### END /etc/grub.d/41_snapshots-btrfs ###
 
 ### BEGIN /etc/grub.d/60_memtest86+ ###
+if [ "${grub_platform}" == "pc" ]; then
+    menuentry "Memory Tester (memtest86+)" --class memtest86 --class gnu --class tool {
+        search --fs-uuid --no-floppy --set=root --hint='cryptouuid/cc0d2f3567044dffb1f6fd3cd8f98c52'  d7454cfc-6cae-46a7-bfe9-44d65e53c57b
+        linux16 /boot/memtest86+/memtest.bin 
+    }
+fi
 ### END /etc/grub.d/60_memtest86+ ###