Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Antynea/grub-btrfs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.11
Choose a base ref
...
head repository: Antynea/grub-btrfs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
17 contributors

Commits on Jan 7, 2022

  1. Fixed output to be gramatically correct (#193)

    @budswa
    budswa authored Jan 7, 2022
    Copy the full SHA
    8dbe80c View commit details

Commits on Jan 20, 2022

  1. Fixed grammatical mistake in the output (#194)

    @budswa
    budswa authored Jan 20, 2022
    Copy the full SHA
    a146cd5 View commit details

Commits on Jan 28, 2022

  1. Update README.md (#197) 

    Reformat, beautify and clarify the README.md and promote consistent wording.
The install section regarding timeshift has changed the most.
    @Semnodime
    Semnodime authored Jan 28, 2022
    Copy the full SHA
    fc4a5a8 View commit details

Commits on Feb 16, 2022

  1. Add Kali Linux to README (#201) 

    Kali Linux added grub-btrfs to its repository. This commit reflects that.
    @Re4son
    Re4son authored Feb 16, 2022
    Copy the full SHA
    3dc1d89 View commit details

Commits on Jun 26, 2022

  1. 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>
    @Megver83
    Megver83 committed Jun 26, 2022
    Copy the full SHA
    0182e11 View commit details

Commits on Sep 2, 2022

  1. Merge pull request #210 from Megver83/openrc 

    OpenRC scripts: add configuration file
    @Schievel1
    Schievel1 authored Sep 2, 2022
    Copy the full SHA
    c78bd25 View commit details

  2. grub-btrfsd: Fix #211 for OpenRC-Daemon

    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    d54f3d7 View commit details

  3. grub-btrfs: Give messages when the script exits

    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    6280f95 View commit details

  4. grub-btrfsd: Update README.md, Fix #213 

    Signed-off-by: Jaeger <Pascal.Jaeger@bode-kassel.com>
    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    14c42b8 View commit details

  5. grub-btrfsd: Merge openrc and systemd daemon 

    Fix #213, Fix #211, Fix #215
    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    961675c View commit details

  6. general: Formatted Readme a bit

    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    8c8ee20 View commit details

  7. grub-btrfsd: add verbose and syslog options 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    9064d61 View commit details

  8. grub-btrfsd: fix problem missing /run/timeshift 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Sep 2, 2022
    Copy the full SHA
    5805029 View commit details

Commits on Sep 3, 2022

  1. grub-btrfsd: Change the LogLevel 

    Against spamming the syslog
    @Schievel1
    Schievel1 authored Sep 3, 2022
    Copy the full SHA
    44573e5 View commit details

Commits on Sep 5, 2022

  1. grub-btrfsd: better instructions for daemon config 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Sep 5, 2022
    Copy the full SHA
    4580c0f View commit details

Commits on Oct 18, 2022

  1. 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 #222
    @S-trace
    S-trace committed Oct 18, 2022
    Copy the full SHA
    19f62ee View commit details

Commits on Oct 21, 2022

  1. Merge pull request #223 from S-trace/fix_silent_failure 

    Fix silent update-grub failure if root FS is not supported by GRUB2
    @Schievel1
    Schievel1 authored Oct 21, 2022
    Copy the full SHA
    bc09bbd View commit details

  2. grub-btrfsd: Error message when grub(-btrfs) fails 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Oct 21, 2022
    Copy the full SHA
    4c63b65 View commit details

  3. 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>
    @Schievel1
    Schievel1 committed Oct 21, 2022
    Copy the full SHA
    de68795 View commit details

  4. Merge branch 'master' into update-daemon

    @Schievel1
    Schievel1 authored Oct 21, 2022
    Copy the full SHA
    36cee77 View commit details

  5. Merge pull request #218 from Schievel1/update-daemon 

    Merge openRC and systemd daemon
    @Schievel1
    Schievel1 authored Oct 21, 2022
    Copy the full SHA
    a6e9caf View commit details

  6. general: Update README, better instructions 

    for Fedora

Fix: #221

Signed-off-by: Pascal Jaeger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Oct 21, 2022
    Copy the full SHA
    57687ac View commit details

Commits on Nov 20, 2022

  1. grub-btrfs: sanitize title menu entries 

    Closes #198

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 20, 2022
    Copy the full SHA
    b2b5307 View commit details

  2. grub-btrfsd: error when inotifywait is not found 

    Fix #227

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 20, 2022
    Copy the full SHA
    d406ce7 View commit details

  3. grub-btrfs: Add warning when there is no entry in grub.cfg 

    Fix #219

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 20, 2022
    Copy the full SHA
    75f7d85 View commit details

  4. Readme: make instructions on how to run the script clearer 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 20, 2022
    Copy the full SHA
    ead3849 View commit details

  5. Update README.md

    @Schievel1
    Schievel1 authored Nov 20, 2022
    Copy the full SHA
    1969132 View commit details

Commits on Nov 21, 2022

  1. grub-btrfs: print version of the script with --version 

    Close #225

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 21, 2022
    Copy the full SHA
    33810a9 View commit details

  2. 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>
    @Schievel1
    Schievel1 committed Nov 21, 2022
    Copy the full SHA
    c9620d5 View commit details

Commits on Nov 23, 2022

  1. Readme, Manpages: Improve structure 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 23, 2022
    Copy the full SHA
    2186d83 View commit details

  2. grub-btrfsd: Add flag for colorless output 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 23, 2022
    Copy the full SHA
    13b6df8 View commit details

  3. Version 4.12 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 23, 2022
    Copy the full SHA
    02c3fbb View commit details

  4. Post release version bump 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 23, 2022
    Copy the full SHA
    1d760ad View commit details

Commits on Nov 25, 2022

  1. grub-btrfsd: make dir check of snapshots dir a warning 

    Bug #234

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 25, 2022
    Copy the full SHA
    91c4aac View commit details

  2. grub-btrfsd: add flag or old timeshift 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 25, 2022
    Copy the full SHA
    4942989 View commit details

Commits on Nov 26, 2022

  1. 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>
    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    6f15432 View commit details

  2. Readme: discribe new version generation 

    Fix #237

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    9e34f53 View commit details

  3. grub-btrfsd: fixed message about flag dependencies 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    efc4657 View commit details

  4. Post release version bump 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    e3d0792 View commit details

  5. grub-btrfs: Add possibility to configure where grub-btrfs.cfg is crea… 

    …ted and searched for

Closes #187

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    bfad9dc View commit details

  6. Merge branch 'make-prefix-configurable'

    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    fe48642 View commit details

  7. Merge branch 'improve-version-generation'

    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    f594a56 View commit details

  8. Merge branch 'fix-snap-dir-check'

    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    b661e4e View commit details

  9. Readme: added instructions for --timeshift-old 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Nov 26, 2022
    Copy the full SHA
    bc167ff View commit details

Commits on Nov 29, 2022

  1. Don't display warnings when the mount command is used

    @kevinchevreuil @Schievel1
    kevinchevreuil authored and Schievel1 committed Nov 29, 2022
    Copy the full SHA
    6980771 View commit details

Commits on Dec 4, 2022

  1. grub-btrfsd: Fix non POSIX redirect 

    Squashed commit of the following:

commit d75feb5
Author: Pascal J <pascal.jaeger@leimstift.de>
Date:   Sun Dec 4 22:07:01 2022 +0100

    grub-btrsd: update shebang

commit a643797
Author: Pavin Joseph <pavinjosdev@gmail.com>
Date:   Sun Dec 4 22:52:31 2022 +0530

    Update grub-btrfsd

commit fe42568
Author: Pavin Joseph <pavinjosdev@gmail.com>
Date:   Sun Dec 4 04:07:05 2022 +0530

    Update grub-btrfsd

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Dec 4, 2022
    Copy the full SHA
    29ec43e View commit details

Commits on Dec 6, 2022

  1. grub-btrfs: Improve variable defaults 

    Fix #244

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Dec 6, 2022
    Copy the full SHA
    f0ed56d View commit details

  2. grub-btrfs: add custom kernel parameters option for snapshots 

    Fix #214, #160

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Dec 6, 2022
    Copy the full SHA
    934ab21 View commit details

  3. manpages: correct some minor things 

    Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Dec 6, 2022
    Copy the full SHA
    f131c38 View commit details

Commits on Dec 7, 2022

  1. grub-btrfsd: Use bash as interpreter 

    Fix: #248

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
    @Schievel1
    Schievel1 committed Dec 7, 2022
    Copy the full SHA
    e03e87d View commit details
Showing with 2,015 additions and 251 deletions.
  1. +6 −0 .codespellrc
  2. +22 −0 .github/workflows/codespell.yml
  3. +162 −77 41_snapshots-btrfs
  4. +89 −22 Makefile
  5. +283 −109 README.md
  6. +35 −3 config
  7. +0 −6 grub-btrfs-openrc
  8. +0 −12 grub-btrfs.path
  9. +0 −11 grub-btrfs.service
  10. +335 −9 grub-btrfsd
  11. +17 −0 grub-btrfsd.confd
  12. +13 −0 grub-btrfsd.initd
  13. +23 −0 grub-btrfsd.service
  14. +6 −2 initramfs/readme.md
  15. +288 −0 manpages/grub-btrfs.8.man
  16. +215 −0 manpages/grub-btrfs.8.org
  17. +84 −0 manpages/grub-btrfsd.8.man
  18. +73 −0 manpages/grub-btrfsd.8.org
  19. +280 −0 temp/grub-btrfs.8
  20. +84 −0 temp/grub-btrfsd.8
6 changes: 6 additions & 0 deletions .codespellrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[codespell]
skip = .git,*.pdf,*.svg,go.sum,.codespellrc
check-hidden = true
# ignore-regex =
# ist -- unfortunate variable
ignore-words-list = ist
22 changes: 22 additions & 0 deletions .github/workflows/codespell.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: Codespell

on:
push:
branches: [master]
pull_request:
branches: [master]

permissions:
contents: read

jobs:
codespell:
name: Check for spelling errors
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v3
- name: Codespell
uses: codespell-project/actions-codespell@v2
Loading