Matt/grub-btrfs
1
0
Fork 0
mirror of https://github.com/Antynea/grub-btrfs.git synced 2026-03-04 12:56:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
320 Commits 8 Branches 60 Tags
feature/ubuntu-init
Commit Graph

320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pascal Jäger
6bc0ee806f Makefile: Ignore ubuntu initramfs uninstall fail 
this stops the Makefile with an error, if it can not find
`initramfs/ubuntu/setup` (which it wont in case of a non-Ubuntu distro.)

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2023-01-22 20:00:46 +01:00
Luis Marsano
2b9c1d2730 update Makefile for mkinitramfs 
introduce feature flag for mkinitramfs in Makefile
extend install & uninstall targets when feature flag is true
document flag in help target
 2023-01-15 14:26:12 -05:00
Luis Marsano
1749789f9a define uninstall subcommand for ubuntu setup 
parse options and subcommands in setup script
update readme
 2023-01-15 14:26:08 -05:00
Luis Marsano
695f4b06ba add setup instructions for ubuntu initramfs 2022-12-20 20:23:43 -05:00
Luis Marsano
d5541253d3 specialize overlay script & refactor 
kernel parameters normally identify root filesystem as readonly before boot process remounts them writable, so the readonly parameter does not identify readonly filesystems
the script reduces scope to btrfs for simplicity
as a standard linux util, findmnt is copied & used
arrange commands so executables are checked before file system queries and short-circuit evaluation skips unavailable commands
for robustness, trap on error & exit events
replace panic with failure logging, since panic doesn't appear to break to shell
 2022-12-20 20:23:38 -05:00
Luis Marsano
4e4e853f2d define initramfs scripts for ubuntu 
provide a hook to require overlayfs module so the file system is available
define a general script to overlay any readonly root filesystem into a non-persistent, writable filesystem
 2022-12-20 12:36:42 -05:00
Pascal Jäger
89ef805e81 grub-btrfsd: do no append with += to optional args 
This does not work anymore, but it should be similar to the systemd
service file anyway, where things are just written in one line.

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-12-10 22:20:15 +01:00
Pascal Jäger
e03e87dd64 grub-btrfsd: Use bash as interpreter 
Fix: #248

Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-12-07 15:01:10 +01:00
Pascal Jäger
29ec43e9a6 grub-btrfsd: Fix non POSIX redirect 
Squashed commit of the following:

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

    grub-btrsd: update shebang

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

    Update grub-btrfsd

commit fe42568785
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>
 2022-12-04 22:11:00 +01:00
Kevin Chevreuil - Kaisen
6980771cd2 Don't display warnings when the mount command is used 2022-11-29 14:47:18 +01:00
Pascal Jäger
bc167ffe00 Readme: added instructions for --timeshift-old 
Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
 2022-11-26 17:59:38 +01:00
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