Matt/grub-btrfs
1
0
Fork 0
mirror of https://github.com/Antynea/grub-btrfs.git synced 2026-03-04 13:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
375 Commits 8 Branches 60 Tags
14fa71c994e77ee7f2dd77ab4a755f19a3127570
Commit Graph

375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jalopy
14fa71c994 add support for detached LUKS header and UUID fallbacks (#378) 
Two hard failures prevented 41-snapshots-btrfs from generating a
snapshot submenu when the root LUKS header is detached and cryptdevice=
uses a /dev/disk/by-id path:

* grub-probe --target=fs_uuid aborted on detached headers.
* grep-based extraction of UUID from GRUB_CMDLINE_LINUX_DEFAULT failed
  when cryptdevice= did not contain “UUID=…”.

This patch:

1. Wraps grub-probe in a try/blkid/lsblk cascade that always returns the
   filesystem UUID or prints a clear error.
2. Replaces the fixed “cryptomount -u $(grep …UUID=…)” line with logic
   that:
   • accepts both UUID=… and /dev/disk/by-id/… syntaxes,
   • resolves paths to a canonical UUID with blkid,
   • emits ‘cryptomount -u <uuid>’ when possible,
   • falls back to ‘cryptomount -a’ only if no UUID can be extracted.
3. Keeps the previous behavior unchanged for unencrypted systems or for
   installations that already worked.

Result: snapshot menu is produced and boots correctly on standard
(setup with inline header), detached-header, and by-id configurations;
no regression for existing users.
 2026-01-02 10:52:31 +01:00
Wayne Galen
2fcfbe9676 Ignore Podman container images (#380) 
Same basic pattern as with Docker, but Podman uses a slightly different
path for this
v4.14 		2025-09-17 07:41:59 +02:00
TNE
9e171282da Get default early initrd list from GRUB_EARLY_INITRD_LINUX_STOCK (#389) 
This mimics the behavior of grub more precisely

Fixes #388
 2025-09-17 07:41:05 +02:00
cip91sk
b509fcaf61 add support for booting snapshots on LUKS encrypted disk (#333) 
* add support for booting snapshots on LUKS encrypted disk

* documentation for booting from LUKS encrypted devices

* better detecting cryptdevice UUID
 2025-01-06 08:11:45 +01:00
Pascal J
f682e17b30 Merge pull request #321 from StollD/set-subvolid 
Add support for GRUB patches from SUSE
 2024-04-08 17:02:40 +02:00
Pascal J
72a3dc092b Merge pull request #325 from aidan-gibson/master 
Fix RAID
 2024-03-27 18:16:20 +01:00
Aidan Gibson
6cb200a50b Fix RAID 2024-03-24 19:11:54 -07:00
Dorian Stoll
ece8d87151 Add support for GRUB patches from SUSE 
Some GRUBs out there (Fedora, openSUSE) have an option that makes all
paths relative to the default subvolume of the filesystem. This can be
used to include /boot in your snapshots and roll them back without
having to regenerate grub.cfg.

However, enabling that option will break grub-btrfs, because loading the
kernel from a different snapshot requires the paths to be absolute.

To make this work, GRUB has to be told explicitly to access the root
subvolume when booting to a snapshot.
 2024-03-10 12:56:37 +01:00
Pascal J
346a9868b8 Merge pull request #318 from expoodo/yabsnap_info_support 
add support for yabsnap snapshot information
 2024-03-06 14:48:24 +01:00
Pascal Jäger
b8465d14db fix spelling 2024-03-06 14:43:57 +01:00
Pascal J
0bc09317d8 Merge branch 'master' into yabsnap_info_support 2024-03-06 14:41:49 +01:00
Pascal J
94d742d1d4 Merge pull request #311 from bastien-roucaries/fix_bashism 
Fix bashism
 2024-03-06 14:24:44 +01:00
Pascal Jäger
363d7da3a7 fix typo uper -> upper 2024-03-06 14:23:26 +01:00
expoodo
585268dad7 Merge branch 'Antynea:master' into yabsnap_info_support 2024-02-19 15:18:18 -05:00
expoodo
34b54de71c removed redundant array slice 2024-02-19 15:16:26 -05:00
expoodo
a8713bbd0b mention yabsnap 2024-02-19 15:12:38 -05:00
Pascal Jäger
ac45f09af3 do not install compressed manpages 
Fix #317

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2024-02-19 14:59:57 +01:00
expoodo
d41991979e add support for yabsnap snapshots info 2024-02-18 20:24:13 -05:00
Pascal J
99fc835e9c Merge pull request #305 from felixonmars/patch-1 
Update Arch Linux package URL in README.md
 2024-01-29 10:45:04 +01:00
Pascal J
5e608f8d96 Merge pull request #309 from yarikoptic/enh-codespell 
Add codespell support (config, workflow to alert on new typos) + make it fix typos
 2024-01-29 10:44:42 +01:00
Bastien Roucariès
465b56107f Add double quote if needed 2024-01-27 17:42:06 +00:00
Bastien Roucariès
7aa227b378 Fix 41_snapshots-btrs bashish [[ ]] 2024-01-27 17:38:55 +00:00
Yaroslav Halchenko
4ff82352bb Fix indentation after codespell 2023-12-21 19:25:54 -05:00
Yaroslav Halchenko
98a5bbe8c5 [DATALAD RUNCMD] run codespell throughout fixing typo automagically 
=== Do not change lines below ===
{
 "chain": [],
 "cmd": "codespell -w",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}
^^^ Do not change lines above ^^^
 2023-12-21 19:25:13 -05:00
Yaroslav Halchenko
abd2889464 [DATALAD RUNCMD] Do interactive fixing of some ambigous typos 
=== Do not change lines below ===
{
 "chain": [],
 "cmd": "codespell -w -i 3 -C 2 ./grub-btrfsd",
 "exit": 0,
 "extra_inputs": [],
 "inputs": [],
 "outputs": [],
 "pwd": "."
}
^^^ Do not change lines above ^^^
 2023-12-21 19:25:10 -05:00
Yaroslav Halchenko
25a9876ad4 Add rudimentary codespell config 2023-12-21 19:24:42 -05:00
Yaroslav Halchenko
d82ee289c3 Add github action to codespell master on push and PRs 2023-12-21 19:24:13 -05:00
Felix Yan
ef150c17bb Update Arch Linux package URL in README.md 
The old URL returns 404 now.
 2023-11-21 16:42:56 +02:00
Brian Morison
490720a13c Update grub-btrfsd (#289) 
fix grub.cfg path in grub submenu creation
 2023-07-26 21:18:10 +02:00
Pascal J
ade5a91d55 fix #285 (#287) 4.13 2023-06-05 08:55:44 +02:00
Pascal Jäger
9a8a1b7d50 fix #278 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-04-28 18:26:25 +02:00
Pascal J
d51c96433c Remove openrc instructions for updating at system boot/ shutdown 2023-04-13 10:54:03 +02:00
Dan MacDonald
f461ea9cf1 More improvements to the README (#276) 
* More improvements to the README

* Fix typo in README

* Adjust README according to Pascal's advice
 2023-04-13 10:52:24 +02:00
Dan MacDonald
85571aab62 Correct first sentence of README 2023-04-11 08:52:34 +02:00
Dan MacDonald
2bbfddc46a Several edits and tweaks to the README 2023-04-11 08:52:34 +02:00
Pascal Jäger
3ce858f18d grub-btrfsd: refactor whole script 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-04-05 18:05:29 +02:00
Pascal Jäger
dd96f22888 grub-btrfsd: Check if all dirs exist 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-04-05 17:26:58 +02:00
Pascal Jäger
35429e02a4 grub-btrfsd: Kill process group on SIGTERM/ SIGINT 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-04-05 17:10:49 +02:00
Pascal Jäger
04958d6e0b grub-btrfsd: Start subdaemon when --timeshift-auto 
Fix #272

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-04-05 17:09:30 +02:00
Pascal Jäger
c6550d0d96 grub-btrfs: unquote snap variable 
Fix #273

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-04-05 13:40:40 +02:00
Pascal Jäger
c7d4bbbe45 Makefile: don't delete temp dir after installation 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 21:50:48 +02:00
Pascal Jäger
09a2a55ee4 Makefile: make docs installation optional 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 21:39:51 +02:00
Pascal Jäger
8105a2edf7 grub-btrfsd: watch more than one snapshot dir 
Fix #262

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 21:08:16 +02:00
Pascal Jäger
879bec3697 grub-btrfsd: watch snapshots directory recursively 
Fix: #262

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 20:44:50 +02:00
Pascal Jäger
e2937f6bff grub-btrfs: update comments 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 19:46:23 +02:00
Pascal Jäger
ec5ff8b4bc grub-btrfs: get back the grub_btrfs_search_directory functionality 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 19:46:05 +02:00
Pascal Jäger
1556c345da grub-btrfs: Do root fs detection with btrfs progs 
Fix: #266 #255

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 19:44:56 +02:00
Pascal Jäger
8028a4376a grub-btrfsd: change condition to run script 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 18:56:35 +02:00
Pascal Jäger
0745117a76 Makefile: add variable GRUB_UPDATE_EXCLUDE 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-03-26 18:56:35 +02:00
Kevin Chevreuil - Kaisen
2032502e09 Makefile: add an if statement for RHEL distribs based 2023-03-26 18:56:35 +02:00