Update 41_snapshots-btrfs

2026-03-04 21:15:02 +08:00 · 2018-02-03 22:59:03 +01:00 · 2018-02-03 22:57:04 +01:00 · 2018-02-03 22:31:43 +01:00 · 2018-02-03 21:50:40 +01:00 · 2018-01-26 11:00:55 +01:00
3 changed files with 87 additions and 65 deletions
--- a/10-update_grub.conf
+++ b/10-update_grub.conf
@@ -0,0 +1,2 @@
+[Service]
+ExecStartPost=/usr/sbin/grub-mkconfig -o /boot/grub/grub.cfg
--- a/110
+++ b/110
@@ -1,59 +1,63 @@
 #! /usr/bin/env bash
 #
 #
-#################################################################################################################################################
-# Written by: Antynea																#
-#																		#
-# Purpose: Include btrfs snapshots at boot options (grub-menu).											#
-#																		#
-# What this script does:															#
-# - Automatically List snapshots existing on root partition (btrfs).										#
-# - Automatically Detect if "/boot" is in separate partition.											#
-# - Automatically Detect kernel, initramfs and intel microcode in "/boot" directory on snapshots. (For custon name, see below.)			#
-# - Automatically Create corresponding "menuentry" in grub.cfg , which ensures a very easy rollback.						#
-#																		#
-# How to use it:																#
-# - Add this lines to /etc/default/grub:													#
-#																		#
-# * GRUB_BTRFS_SUBMENUNAME="Arch Linux snapshots" 												#
-#	(Name appearing in the Grub menu.)													#
-# * GRUB_BTRFS_PREFIXENTRY="Snapshot:"        		   											#
-#	(Add a name ahead your snapshots entries in the Grub menu.) 										#
-# * GRUB_BTRFS_DISPLAY_PATH_SNAPSHOT="true"													#
-#	(Show full path snapshot or only name in the Grub menu)											#
-# * GRUB_BTRFS_TITLE_FORMAT="p/d/n"														#
-#	(Custom title, shows/hides p"prefix" d"date" n"name" in the Grub menu, separator "/", custom order available)				#
-# * GRUB_BTRFS_LIMIT="100"															#
-#	(Limit the number of snapshots populated in the GRUB menu.)										#
-# * GRUB_BTRFS_SUBVOLUME_SORT="descending"													#
-#	(Sort the found subvolumes by newest first ("descending") or oldest first ("ascending").						#
-#	If "ascending" is chosen then the $GRUB_BTRFS_LIMIT oldest subvolumes will populate the menu.)						#
-# * GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND="true"													#
-#	(Show snapshots found during run "grub-mkconfig")											#
-# * GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND="true"												#
-#	(Show Total of snapshots found during run "grub-mkconfig")										#
-# * GRUB_BTRFS_NKERNEL=("vmlinuz-linux") 		 											#
-#	(Use only if you have custom kernel name or auto-detect failed.)									#
-# * GRUB_BTRFS_NINIT=("initramfs-linux.img" "initramfs-linux-fallback.img")									#
-#	(Use only if you have custom initramfs name or auto-detect failed.)									#
-# * GRUB_BTRFS_INTEL_UCODE=("intel-ucode.img") 													#
-#	(Use only if you have custom intel-ucode or auto-detect failed.)		    							#
-# * GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("var/lib/docker" "nosnapshot")										#
-#	(Ignore specific path during run "grub-mkconfig")											#
-# * GRUB_BTRFS_CREATE_ONLY_HARMONIZED_ENTRIES="false"												#
-#	(Create entries with matching version number instead of all possible combinations of kernel and initramfs)				#
-#																		#
-# - Generate grub.cfg (on Arch Linux use grub-mkconfig -o /boot/grub/grub.cfg)									#
-#																		#
-# - grub-btrfs automatically generates snapshots entries.											#
-# - You will see it appear different entries (e.g : Snapshot: [2014-02-12 11:24:37] my snapshot name overkill)					#
-#																		#
-#																		#
-# To do:																	#
-#																		#
-#	* Snapper support ....															#
-#																		#
-#################################################################################################################################################
+#########################################################################################################################################################################
+# Written by: Antynea																			#
+# BTC donation address: 1Lbvz244WA8xbpHek9W2Y12cakM6rDe5Rt														#
+#																					#
+# Purpose: Include btrfs snapshots at boot options (grub-menu).														#
+#																					#
+# What this script does:																		#
+# Simple rollback using snapshots you made previously.															#
+# - Automatically List snapshots existing on root partition (btrfs).													#
+# - Automatically Detect if "/boot" is in separate partition.														#
+# - Automatically Detect kernel, initramfs and intel microcode in "/boot" directory on snapshots. (For custon name, see below.)						#
+# - Automatically Create corresponding "menuentry" in grub.cfg , which ensures a very easy rollback.									#
+# - Automatically detect snapper and use snapper's snapshot description if available.											#
+#																					#
+# How to use it:																			#
+# - Add this lines to /etc/default/grub:																#
+#																					#
+# * GRUB_BTRFS_SUBMENUNAME="Arch Linux snapshots" 															#
+#	(Name appearing in the Grub menu.)																#
+# * GRUB_BTRFS_PREFIXENTRY="Snapshot:"        		   														#
+#	(Add a name ahead your snapshots entries in the Grub menu.) 													#
+# * GRUB_BTRFS_DISPLAY_PATH_SNAPSHOT="true"																#
+#	(Show full path snapshot or only name in the Grub menu)														#
+# * GRUB_BTRFS_TITLE_FORMAT="p/d/n"																	#
+#	(Custom title, shows/hides p"prefix" d"date" n"name" in the Grub menu, separator "/", custom order available)							#
+# * GRUB_BTRFS_LIMIT="100"																		#
+#	(Limit the number of snapshots populated in the GRUB menu.)													#
+# * GRUB_BTRFS_SUBVOLUME_SORT="descending"																#
+#	(Sort the found subvolumes by newest first ("descending") or oldest first ("ascending").									#
+#	If "ascending" is chosen then the $GRUB_BTRFS_LIMIT oldest subvolumes will populate the menu.)									#
+# * GRUB_BTRFS_SHOW_SNAPSHOTS_FOUND="true"																#
+#	(Show snapshots found during run "grub-mkconfig")														#
+# * GRUB_BTRFS_SHOW_TOTAL_SNAPSHOTS_FOUND="true"															#
+#	(Show Total of snapshots found during run "grub-mkconfig")													#
+# * GRUB_BTRFS_NKERNEL=("vmlinuz-linux") 		 														#
+#	(Use only if you have custom kernel name or auto-detect failed.)												#
+# * GRUB_BTRFS_NINIT=("initramfs-linux.img" "initramfs-linux-fallback.img")												#
+#	(Use only if you have custom initramfs name or auto-detect failed.)												#
+# * GRUB_BTRFS_INTEL_UCODE=("intel-ucode.img") 																#
+#	(Use only if you have custom intel-ucode or auto-detect failed.)		    										#
+# * GRUB_BTRFS_IGNORE_SPECIFIC_PATH=("var/lib/docker" "nosnapshot")													#
+#	(Ignore specific path during run "grub-mkconfig")														#
+# * GRUB_BTRFS_CREATE_ONLY_HARMONIZED_ENTRIES="false"															#
+#	(Create entries with matching version number instead of all possible combinations of kernel and initramfs)							#
+#																					#
+# - Generate grub.cfg (on Arch Linux use grub-mkconfig -o /boot/grub/grub.cfg)												#
+#																					#
+# - grub-btrfs automatically generates snapshots entries.														#
+# - You will see it appear different entries (e.g : Snapshot: [2014-02-12 11:24:37] my snapshot name overkill)								#
+#																					#
+# Automatically update grub																		#
+#  If you would like grub to automatically update when Snapper timeline snapshots and cleanups occur, simply install 10-update_grub.conf in the following locations:	#
+# - /etc/systemd/system/snapper-timeline.service.d/															#
+# - /etc/systemd/system/snapper-cleanup.service.d/															#
+# Once the configuration files are in place, systemctl daemon-reload should be run to reload the units and make the changes active.					#
+#																					#
+#########################################################################################################################################################################

 set -e

--- a/README.md
+++ b/README.md
@@ -1,14 +1,15 @@
 [![GitHub release](https://img.shields.io/github/release/Antynea/grub-btrfs.svg)](https://github.com/Antynea/grub-btrfs)
  
-### grub-btrfs
+## grub-btrfs

 This is a version 2.xx of grub-btrfs
-
-#### Description
+##### BTC donation address: 1Lbvz244WA8xbpHek9W2Y12cakM6rDe5Rt
+##
+### Description

 grub-btrfs, Include btrfs snapshots at boot options. (grub menu)
-
-#### What does grub-btrfs v2.xx do :
+##
+### What does grub-btrfs v2.xx do :

 Simple rollback using snapshots you made previously.

@@ -21,9 +22,8 @@ Simple rollback using snapshots you made previously.
 * Automatically Create corresponding "menuentry" in grub.cfg , which ensures a very easy rollback.

 * Automatically detect snapper and use snapper's snapshot description if available.
-
-
-#### How to use it:
+##
+### How to use it:

 Add this lines to /etc/default/grub:

@@ -88,12 +88,28 @@ Generate grub.cfg (on Arch linux use grub-mkconfig -o /boot/grub/grub.cfg )
 grub-btrfs automatically generates snapshots entries.

 You will see it appear differents entries (e.g : Snapshot: 2018-01-03 15:08:41  @test1 )
+##
+### Automatically update grub

+If you would like grub to automatically update when Snapper timeline snapshots and cleanups occur, simply install `10-update_grub.conf` in the following locations:

-#### TO DO
+- `/etc/systemd/system/snapper-timeline.service.d/`
+- `/etc/systemd/system/snapper-cleanup.service.d/`

-* don't hesitate to ask for improvements
+Once the configuration files are in place, `systemctl daemon-reload` should be run to reload the units and make the changes active.

-
-## discussion
+##
+### Discussion
 Pour les francophones : https://forums.archlinux.fr/viewtopic.php?f=18&t=17177
+##
+### Special thanks for assistance and contributions
+
+* [maximbaz](https://github.com/maximbaz)
+* [crossroads1112](https://github.com/crossroads1112)
+* [penetal](https://github.com/penetal)
+* [wesbarnett](https://github.com/wesbarnett)
+* [Psykar](https://github.com/Psykar)
+* [anyc](https://github.com/anyc)
+* [daftaupe](https://github.com/daftaupe)
+* [N-Parsons](https://github.com/N-Parsons)
+##
Author	SHA1	Message	Date
Antynea	1b40cfee20	Update 41_snapshots-btrfs Update 41_snapshots-btrfs	2018-02-03 22:59:03 +01:00
Antynea	358dedc392	Update 41_snapshots-btrfs Update 41_snapshots-btrfs	2018-02-03 22:57:04 +01:00
Antynea	55dc182b34	Update README.md	2018-02-03 22:31:43 +01:00
Nathan Parsons	23ddb063cb	Add systemd service configuration for grub updating (#38 ) * Add systemd service configuration for grub updating This configuration file causes `update-grub` to be run after Snapper's cleanup and timeline services are run by systemd * Make invoked command more universal * Note the need to run systemctl daemon-reload	2018-02-03 21:50:40 +01:00
Antynea	ca51d74265	Update README.md	2018-01-26 11:00:55 +01:00
Antynea	f8937a3fc7	Update README.md	2018-01-26 10:58:04 +01:00
Antynea	9265eb96de	Update README.md	2018-01-26 10:55:45 +01:00
Antynea	72edee3d1c	Update README.md	2018-01-26 10:54:37 +01:00
Antynea	d24ba197a8	Update README.md	2018-01-26 10:53:42 +01:00
Antynea	0e826391f1	Update 41_snapshots-btrfs	2018-01-26 09:19:33 +01:00
Antynea	7166d939fa	Update README.md	2018-01-26 09:18:13 +01:00