Ooops

by default, message en
add translate message fr

41_snapshots-btrfs

@@ -17,6 +17,9 @@ nkernel=("vmlinuz-linux")
 ## fr: nom(s) de(s) l'init
 ## en: Name(s) of the init(s)
 ninit=("initramfs-linux.img" "initramfs-linux-fallback.img")
+## fr: nom du microcode intel
+## en: Name intel-ucode
+intel_ucode=("intel-ucode.img")
 
 
 ###########################
@@ -25,6 +28,10 @@ ninit=("initramfs-linux.img" "initramfs-linux-fallback.img")
 ### fr: NE PAS TOUCHER  ###
 ### en: DO NOT TOUCH    ###
 ###########################
+## fr: internationalisation
+## en: Internationalization
+export TEXTDOMAIN=grub-btrfs-git
+export TEXTDOMAINDIR="/usr/share/locale"
 ## fr: paramêtre des chaînes --hint
 ## en: Parameter of the chains --hint (Translation unclear)
 pboot=$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null)
@@ -47,8 +54,8 @@ echo "submenu '$submenuname' {"
 # en: Treat the kernel variables (Translation unclear)
 for kernel in ${nkernel[@]}; do
 	# fr: on test si le(s) nom(s) du(des) kernel existe(nt), autrement on affiche une erreur et on sort
-	# en: Check the specified kernel(s) exist, if it/they don't display an error and exit
-	if [ ! -f /boot/$kernel ]; then echo "/boot/$kernel: fr: Fichier inexistant en: File does not exist" >&2; exit 1; fi
+	# en: Check the specified kernel(s) exist, if it/they don't, display an error and exit
+	if [ ! -f /boot/$kernel ]; then gettext_printf $"Error: /boot/$kernel, kernel does not exist" >&2; exit 1; fi
 	# fr: on vérifie le nombre de kernel présent, si >1 on crée un menu
 	# en: If there are >1 kernels, create a menu
 	if [ ${#nkernel[*]} != 1 ]; then echo "	submenu '$kernel' {
@@ -60,19 +67,23 @@ for kernel in ${nkernel[@]}; do
 		# fr: On écarte les snapshots avec un statut de suppression
 		# en: Discard deleted snapshots
 		if [ $item = "DELETED" ]; then continue; fi
-		# fr: on crée un menu pour chaque snapshot présent
-		# en: Create a menu for remaining snapshots
-		echo "		submenu '$prefixentry $item' {"
+		# fr: affiche la liste des snapshots trouvés
+		# en: Output name of snapshot
+		gettext_printf $"Found Snapshot: %s\n" "$item" >&2
+		# fr: on crée un menu pour chaque snapshot présent (nom + date de création)
+		# en: Create a menu for remaining snapshots (name + creation date)
+		date_time=$($bindir/btrfs subvolume list -s / | $bindir/grep $item | $bindir/cut -d" " -f 11-12)
+		echo "		submenu '$prefixentry $item [$date_time]' {"
 		# fr: si plusieurs kernel on été trouvé, on affiche un titre indicatif
-		# en: Display message if more than one kernel is found
+		# en: if more than one kernel is found, create a menu
 		if [ ${#nkernel[*]} != 1 ]; then echo "			submenu '---> Kernel: $kernel <---' { echo }"; fi
-		# fr: on traite la variable de l'initframs
+		# fr: on traite la variable de l'initramfs
 		# en: Treat the initramfs variables (Translation unclear)
 		for init in ${ninit[@]}; do
-			# fr: on test si le(s) nom(s) du(des) initframs existe(nt), autrement on affiche une erreur et on sort
-			# en: Check the specified initramfs(es) exist, if it/they don't display an error and exit
-			if [ ! -f /boot/$init ]; then echo "/boot/$init: Fichier inexistant" >&2; exit 1; fi
-			# fr: on traite chaque entrée des snapshots avec leurs kernel et initframs respectifs
+			# fr: on test si le(s) nom(s) du(des) initramfs existe(nt), autrement on affiche une erreur et on sort
+			# en: Check the specified initramfs(es) exist, if it/they don't, display an error and exit
+			if [ ! -f /boot/$init ]; then gettext_printf $"Error: /boot/$init, initramfs does not exist" >&2; exit 1; fi
+			# fr: on traite chaque entrée des snapshots avec leurs kernel et initramfs respectifs
 			# en: Specify a kernel and initramfs for every snapshot
 			echo "\
 			menuentry '$item $init' --class arch --class gnu-linux --class gnu --class os "\$menuentry_id_option" 'gnulinux-snapshots-$uuid'{
@@ -89,13 +100,29 @@ for kernel in ${nkernel[@]}; do
 				if [ $uuid = $buuid ]; then
 					echo "\
 				linux	/$item/boot/$kernel root=UUID=$uuid rw rootflags=subvol=$item $params
-				echo    'Loading initial ramdisk ...'
+				echo    'Loading initial ramdisk ...'"
+				# fr: on vérifie la présence du microcode intel
+				# en: Check intel microcode exist
+					if [ -f /boot/$intel_ucode ]; then
+						echo "\
+				initrd	/$item/boot/$intel_ucode /$item/boot/$init"
+					else
+						echo "\
 				initrd	/$item/boot/$init"
+					fi
 				else
 					echo "\
 				linux	/$kernel root=UUID=$uuid rw rootflags=subvol=$item $params
-				echo    'Loading initial ramdisk ...'
+				echo    'Loading initial ramdisk ...'"
+				# fr: on vérifie la présence du microcode intel
+				# en: Check intel microcode exist
+				if [ -f /boot/$intel_ucode ]; then
+						echo "\
+				initrd	/$intel_ucode /$init"
+					else
+						echo "\
 				initrd  /$init"
+					fi
 				fi
 				echo "\
 			}"

README.md

@@ -1,4 +1,34 @@
-grub-btrfs
-==========
+### grub-btrfs
+
+
+This is a version 0.xx of grub-btrfs :
+
+#### Desciption
 
 grub-btrfs, add support for btrfs snapshots into grub menu
+
+#### What does grub-btrfs v0.xx do :
+
+Simple rollback using snapshots you made previous.
+
+Makes a list of all snapshots, kernels, initramfs present on the filesystem and then creates a corresponding entered with name and date of snapshots in grub.cfg, which ensures a very easy rollback.
+
+#### How to use it :
+
+1. Edit 41_snapshots-btrfs file :
+
+	* submenuname = name menu appear in grub ( e.g: submenuname="ArchLinux Snapshots" )
+
+	* prefixentry = add a name ahead your snapshots entries ( e.g: prefixentry="Snapshot" )
+
+	* nkernel= name kernel you use it ( e.g: nkernel=("vmlinuz-linux") )
+
+	* ninit= name initramfs (ramdisk) you use it ( e.g: ninit=("initramfs-linux.img" "initramfs-linux-fallback.img") )
+
+	* intel_ucode= name intel microcode you use it ( e.g: intel_ucode=("intel-ucode.img") )
+
+2. Generate grub.cfg (on Archlinux is grub-mkconfig -o /boot/grub/grub.cfg )
+
+grub-btrfs automatically generates snapshots entries.
+
+you will see it appear different entries, e.g : Prefixentry name of snapshot [2013-02-11 04:00:00]