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
309 Commits 8 Branches 60 Tags
b661e4e03f05d11456cddc7c32de104d37857217
Commit Graph

309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pascal Jäger
b661e4e03f Merge branch 'fix-snap-dir-check' 2022-11-26 17:46:45 +01:00
Pascal Jäger
f594a56232 Merge branch 'improve-version-generation' 2022-11-26 17:44:06 +01:00
Pascal Jäger
fe48642596 Merge branch 'make-prefix-configurable' 2022-11-26 17:38:15 +01:00
Pascal Jäger
bfad9dcc1d grub-btrfs: Add possibility to configure where grub-btrfs.cfg is created and searched for 
Closes #187

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-26 15:14:00 +01:00
Pascal Jäger
e3d0792a74 Post release version bump 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-26 15:10:28 +01:00
Pascal Jäger
efc4657aab grub-btrfsd: fixed message about flag dependencies 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-26 15:06:44 +01:00
Pascal Jäger
9e34f53ef8 Readme: discribe new version generation 
Fix #237

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-26 15:03:10 +01:00
Pascal Jäger
6f154329c7 grub-btrfsd: fix if...else in daemon 
add description of feature in manpage
fix non sh compatible commands in daemon

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-26 10:06:19 +01:00
Pascal Jäger
4942989d7f grub-btrfsd: add flag or old timeshift 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-25 16:58:07 +01:00
Pascal Jäger
91c4aac82c grub-btrfsd: make dir check of snapshots dir a warning 
Bug #234

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-25 08:52:49 +01:00
Pascal Jäger
1d760ad730 Post release version bump 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-23 16:11:45 +01:00
Pascal Jäger
02c3fbb23a Version 4.12 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
4.12 		2022-11-23 15:58:11 +01:00
Pascal Jäger
13b6df8e9a grub-btrfsd: Add flag for colorless output 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-23 15:57:52 +01:00
Pascal Jäger
2186d831cd Readme, Manpages: Improve structure 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-23 15:57:10 +01:00
Pascal Jäger
c9620d5d18 grub-btrfs: Change syntax error message 
I noticed that this is confusing in #230, user would search for errors in
the grub-btrfs.cfg file although the old grub-btrfs.cfg file is never
overwritten with grub-btrfs.new

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-21 22:59:22 +01:00
Pascal Jäger
33810a9274 grub-btrfs: print version of the script with --version 
Close #225

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-21 22:59:22 +01:00
Pascal J
1969132073 Update README.md 2022-11-20 23:13:51 +01:00
Pascal Jäger
ead3849613 Readme: make instructions on how to run the script clearer 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-20 22:27:38 +01:00
Pascal Jäger
75f7d85261 grub-btrfs: Add warning when there is no entry in grub.cfg 
Fix #219

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-20 22:15:48 +01:00
Pascal Jäger
d406ce795c grub-btrfsd: error when inotifywait is not found 
Fix #227

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-20 21:34:40 +01:00
Pascal Jäger
b2b5307fe4 grub-btrfs: sanitize title menu entries 
Closes #198

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-20 21:19:45 +01:00
Pascal Jaeger
57687ac0ab general: Update README, better instructions 
for Fedora

Fix: #221

Signed-off-by: Pascal Jaeger <pascal.jaeger@leimstift.de>
 2022-10-21 08:59:23 +02:00
Pascal J
a6e9caf6f4 Merge pull request #218 from Schievel1/update-daemon 
Merge openRC and systemd daemon
 2022-10-21 08:32:30 +02:00
Pascal J
36cee77bd8 Merge branch 'master' into update-daemon 2022-10-21 08:32:02 +02:00
Pascal Jäger
de68795d70 grub-btrfsd: better support commandline timeshift 
When a snapshot is created with `timeshift --create` an the commandline,
sometimes the daemon is not fast enough between the
first (/run/timeshift) inotifywait and the second (an the actual
snapshot directory) inotifywait. Even without any `sleep` between them.
So now the grub (sub)menu is always created once in its own process when the daemon sees a
timeshift startup.

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-10-21 08:27:51 +02:00
Pascal Jäger
4c63b65e9e grub-btrfsd: Error message when grub(-btrfs) fails 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-10-21 08:26:17 +02:00
Pascal J
bc09bbda65 Merge pull request #223 from S-trace/fix_silent_failure 
Fix silent update-grub failure if root FS is not supported by GRUB2
 2022-10-21 08:02:14 +02:00
Soul Trace
19f62ee6e6 Fix silent update-grub failure if root FS is not supported by GRUB2 
If root FS is on volume not supported by GRUB2 - `update-grub` silently fails because `snapshots-btrfs` GRUB hook
silently fails at `root_fs=$(${grub_probe} --target="fs" /)` due to `set -e` at the beginning of `snapshots-btrfs`.

Failure of commands in test clause in Bash does not trigger set -v error and can be handled in script to
exit gracefully - implement this.

Fixes https://github.com/Antynea/grub-btrfs/issues/222
 2022-10-18 17:52:25 +03:00
Pascal Jäger
4580c0fa2c grub-btrfsd: better instructions for daemon config 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-09-05 20:20:47 +02:00
Pascal J
44573e5282 grub-btrfsd: Change the LogLevel 
Against spamming the syslog
 2022-09-03 08:31:25 +02:00
Pascal Jäger
5805029c79 grub-btrfsd: fix problem missing /run/timeshift 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-09-02 22:58:37 +02:00
Pascal Jäger
9064d61145 grub-btrfsd: add verbose and syslog options 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-09-02 22:58:37 +02:00
Pascal J
8c8ee200fd general: Formatted Readme a bit 2022-09-02 22:58:31 +02:00
Pascal Jäger
961675ca31 grub-btrfsd: Merge openrc and systemd daemon 
Fix #213, Fix #211, Fix #215
 2022-09-02 22:57:34 +02:00
Pascal J
14c42b82eb grub-btrfsd: Update README.md, Fix #213 
Signed-off-by: Jaeger <Pascal.Jaeger@bode-kassel.com>
 2022-09-02 22:57:24 +02:00
Pascal Jäger
6280f95139 grub-btrfs: Give messages when the script exits 2022-09-02 22:57:00 +02:00
Pascal Jäger
d54f3d7366 grub-btrfsd: Fix #211 for OpenRC-Daemon 2022-09-02 22:56:44 +02:00
Pascal J
c78bd25784 Merge pull request #210 from Megver83/openrc 
OpenRC scripts: add configuration file
 2022-09-02 09:25:07 +02:00
David P
0182e11951 OpenRC scripts: add configuration file 
This allows users to customize the snapshots path to work with, e.g., snapper.
If no path is configured, it will default to timeshift.

Signed-off-by: David P <megver83@parabola.nu>
 2022-06-26 19:32:11 -04:00
Re4son Kernel
3dc1d89965 Add Kali Linux to README (#201) 
Kali Linux added grub-btrfs to its repository. This commit reflects that.
 2022-02-16 04:15:44 +01:00
Semnodime
fc4a5a8e56 Update README.md (#197) 
Reformat, beautify and clarify the README.md and promote consistent wording.
The install section regarding timeshift has changed the most.
 2022-01-28 05:27:01 +01:00
budswa
a146cd5c9d Fixed grammatical mistake in the output (#194) 2022-01-20 19:04:05 +01:00
budswa
8dbe80c0bd Fixed output to be gramatically correct (#193) 2022-01-07 12:09:18 +01:00
Antynea
79ae25ea5d Update installation section 
Adds make help
v4.11 		2021-11-29 18:58:09 +01:00
Antynea
ee3c366fa4 Add missing initrd (#184) 2021-11-26 02:49:37 +01:00
Antynea
4f1aa38604 Make path of "grub-mkconfig_lib" configurable (#181) 
* Make path of "grub-mkconfig_lib" configurable

  * 41_snapshots-btrfs file:
    - Remove "datarootdir" variable, is no longer used
    - Replace "$datarootdir/grub/grub-mkconfig_lib" with "${GRUB_BTRFS_MKCONFIG_LIB:-/usr/share/grub/grub-mkconfig_lib}"

  * Config file:
    - Adds new GRUB_BTRFS_MKCONFIG_LIB variable
Might be '/usr/share/grub2/grub-mkconfig_lib' on some systems (Opensuse ...)
 2021-11-17 19:30:34 +01:00
Antynea
1accd5e272 Make name of "grub-script-check" configurable (#177) 
41_snapshots-btrfs file:
  * Remove "grub_script_check" variable

Config file;
  * Make name of "grub-script-check" configurable
    * Might be 'grub2-script-check' on some systems (Fedora ...)
 2021-11-07 14:35:17 +01:00
Antynea
2500ce8d30 Fix broken Makefile: 
* Remove empty lines.
  * Adds missing double quote.
  * Deleted files differ from installed files:
    * Installed files:
      - "$(BIN_DIR)/" grub-btrfs-openrc;
      - "$(DESTDIR)/etc/init.d/" grub-btrfsd;

    * Deleted files:
      - "$(BIN_DIR)/grub-btrfs.openrcbin";
      - "$(DESTDIR)/etc/init.d/grub-btrfs.openrc";

    * Replace deleted files with:
      - "$(BIN_DIR)/grub-btrfs-openrc;"
      - "$(DESTDIR)/etc/init.d/grub-btrfsd;"
 2021-11-07 13:55:18 +01:00
Antynea
d9f54afcb7 Update Installation section: 
Update Dependencies
 2021-11-04 12:26:23 +01:00
Antynea
33ad3273d3 * trim trailing whitespace. 
* snapshot_list function:
  * Rename some variables for better consistency.
  * Remove unused variables.
  * Ignore snapper/timeshift snapshot as soon as possible.
 2021-11-02 17:42:28 +01:00