Matt/grub-btrfs
1
0
Fork 0
mirror of https://github.com/Antynea/grub-btrfs.git synced 2026-10-20 02:42:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop script if root partition isn't btrfs filesystem

Browse Source 
Add filesystem check on the root partition.
If the filesystem isn't btrfs, stop execution.
Update error message for btrfs-prog.
This commit is contained in:
Antynea
2020-10-01 19:37:43 +02:00
committed by GitHub
parent 64c08a0807
commit 9a771d9842
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
41_snapshots-btrfs
+5 -2
View File
@@ -110,6 +110,8 @@ boot_uuid=$(${grub_probe} --device ${boot_device} --target="fs_uuid" 2>/dev/null
# Type filesystem of boot partition # Type filesystem of boot partition
boot_fs=$(${grub_probe} --target="fs" /boot 2>/dev/null) boot_fs=$(${grub_probe} --target="fs" /boot 2>/dev/null)
## Probe info "Root partition" ## Probe info "Root partition"
# Type filesystem of root partition
root_fs=$(${grub_probe} --target="fs" / 2>/dev/null)
# Root device # Root device
root_device=$(${grub_probe} --target=device /) root_device=$(${grub_probe} --target=device /)
# UUID of the root partition # UUID of the root partition
@@ -144,10 +146,11 @@ print_error()
test_btrfs() test_btrfs()
{ {
[[ "$root_fs" != "btrfs" ]] && print_error "Root partition isn't a btrfs filesystem.\nThis script only supports snapshots of the btrfs filesystem."
set +e set +e
type btrfs >/dev/null 2>&1 type btrfs >/dev/null 2>&1
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
print_error "This script only supports snapshots of the btrfs filesystem, make sure you have btrfs-progs on your system." print_error "Unable to retrieve info from btrfs filesystem, make sure you have btrfs-progs on your system."
fi fi
set -e set -e
} }
@@ -513,7 +516,7 @@ boot_separate()
### Start ### Start
printf "Detecting snapshots ...\n" >&2 ; printf "Detecting snapshots ...\n" >&2 ;
# if btrfs prog isn't installed, exit # Only support btrfs snapshots
test_btrfs test_btrfs
# Delete existing config # Delete existing config
#rm -f --preserve-root "/boot/$grub_directory/grub-btrfs.cfg" #rm -f --preserve-root "/boot/$grub_directory/grub-btrfs.cfg"