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

Merge branch 'master' into improve-config

Browse Source
This commit is contained in:
Pascal J
2023-01-22 20:07:54 +01:00
committed by GitHub
parent f131c38300 89ef805e81
commit 1d33404c78
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+4 -7
View File
@@ -287,18 +287,15 @@ snapshots="/.snapshots" # Snapper in the root directory
#snapshots="/run/timeshift/backup/timeshift-btrfs/snapshots" # Timeshift < v22.06 #snapshots="/run/timeshift/backup/timeshift-btrfs/snapshots" # Timeshift < v22.06
## Optional arguments to run with the daemon ## Optional arguments to run with the daemon
# Append options to this like this:
# optional_args="--syslog --timeshift-auto --verbose"
# Possible options are: # Possible options are:
# -t, --timeshift-auto Automatically detect Timeshifts snapshot directory for timeshift >= 22.06 # -t, --timeshift-auto Automatically detect Timeshifts snapshot directory for timeshift >= 22.06
# -o, --timeshift-old Activate for timeshift versions <22.06 # -o, --timeshift-old Look for snapshots in directory of Timeshift <v22.06 (requires --timeshift-auto)
# -l, --log-file Specify a logfile to write to # -l, --log-file Specify a logfile to write to
# -v, --verbose Let the log of the daemon be more verbose # -v, --verbose Let the log of the daemon be more verbose
# -s, --syslog Write to syslog # -s, --syslog Write to syslog
# Uncomment the line to activate the option optional_args="--syslog"
optional_args+="--syslog " # write to syslog by default
#optional_args+="--timeshift-auto "
#optional_args+="--timeshift-old "
#optional_args+="--log-file /var/log/grub-btrfsd.log "
#optional_args+="--verbose "
``` ```
After that, the daemon should be restarted with After that, the daemon should be restarted with
config
+1
View File
@@ -1,5 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
GRUB_BTRFS_VERSION=4.12-improve-config-2022-12-06T22:10:24+00:00 GRUB_BTRFS_VERSION=4.12-improve-config-2022-12-06T22:10:24+00:00
# Disable grub-btrfs. # Disable grub-btrfs.
grub-btrfsd
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env sh #!/usr/bin/env bash
# Copyright 2022 Pascal Jaeger # Copyright 2022 Pascal Jaeger
# Distributed under the terms of the GNU General Public License v3 # Distributed under the terms of the GNU General Public License v3
# Update GRUB when new BTRFS snapshots are created. # Update GRUB when new BTRFS snapshots are created.
grub-btrfsd.confd
+4 -7
View File
@@ -6,15 +6,12 @@ snapshots="/.snapshots" # Snapper in the root directory
#snapshots="/run/timeshift/backup/timeshift-btrfs/snapshots" # Timeshift < v22.06 #snapshots="/run/timeshift/backup/timeshift-btrfs/snapshots" # Timeshift < v22.06
## Optional arguments to run with the daemon ## Optional arguments to run with the daemon
# Append options to this like this:
# optional_args="--syslog --timeshift-auto --verbose"
# Possible options are: # Possible options are:
# -t, --timeshift-auto Automatically detect Timeshifts snapshot directory for timeshift >= 22.06 # -t, --timeshift-auto Automatically detect Timeshifts snapshot directory for timeshift >= 22.06
# -o, --timeshift-old Activate for timeshift versions <22.06 # -o, --timeshift-old Look for snapshots in directory of Timeshift <v22.06 (requires --timeshift-auto)
# -l, --log-file Specify a logfile to write to # -l, --log-file Specify a logfile to write to
# -v, --verbose Let the log of the daemon be more verbose # -v, --verbose Let the log of the daemon be more verbose
# -s, --syslog Write to syslog # -s, --syslog Write to syslog
# Uncomment the line to activate the option optional_args="--syslog"
optional_args+="--syslog " # write to syslog by default
#optional_args+="--timeshift-auto "
#optional_args+="--timeshift-old "
#optional_args+="--log-file /var/log/grub-btrfsd.log "
#optional_args+="--verbose "