From: FollieHiyuki <FollieHiyuki@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: grub-btrfs: update to 4.9; patch for modular configs
Date: Tue, 13 Apr 2021 18:03:51 +0200 [thread overview]
Message-ID: <20210413160351.kwGfGohc-XczqmGFWGZgrhwq4vxQkajyHD8V-EBBHlY@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30195@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 2012 bytes --]
New comment by FollieHiyuki on void-packages repository
https://github.com/void-linux/void-packages/pull/30195#issuecomment-818854386
Comment:
I agree with moving the file using `post_install()`. I would rather patch the source to reflect the new config path:
```
diff --git a/41_snapshots-btrfs b/41_snapshots-btrfs
index 2a1f215..ca71206 100755
--- a/41_snapshots-btrfs
+++ b/41_snapshots-btrfs
@@ -41,7 +41,7 @@ prefix="/usr"
exec_prefix="/usr"
datarootdir="/usr/share"
sysconfdir="/etc"
-grub_btrfs_config="${sysconfdir}/default/grub-btrfs/config"
+grub_btrfs_config="${sysconfdir}/conf.d/grub-btrfs"
[[ -f "$grub_btrfs_config" ]] && . "$grub_btrfs_config"
. "$datarootdir/grub/grub-mkconfig_lib"
diff --git a/Makefile b/Makefile
index 6ffe8c1..12c760d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,6 @@ install:
exit 1; \
fi
@install -Dm755 -t "$(DESTDIR)/etc/grub.d/" 41_snapshots-btrfs
- @install -Dm644 -t "$(DESTDIR)/etc/default/grub-btrfs/" config
@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.service
@install -Dm644 -t "$(LIB_DIR)/systemd/system/" grub-btrfs.path
@install -Dm644 -t "$(SHARE_DIR)/licenses/$(PKGNAME)/" LICENSE
@@ -33,7 +32,6 @@ uninstall:
fi
@grub_dirname="$$(grep -oP '^[[:space:]]*GRUB_BTRFS_GRUB_DIRNAME=\K.*' "$(DESTDIR)/etc/default/grub-btrfs/config" | sed "s|\s*#.*||;s|(\s*\(.\+\)\s*)|\1|;s|['\"]||g")"; \
rm -f "$${grub_dirname:-/boot/grub}/grub-btrfs.cfg"
- @rm -f "$(DESTDIR)/etc/default/grub-btrfs/config"
@rm -f "$(DESTDIR)/etc/grub.d/41_snapshots-btrfs"
@rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.service"
@rm -f "$(LIB_DIR)/systemd/system/grub-btrfs.path"
```
and use `/etc/conf.d/grub-btrfs` (instead of `grub-btrfs.cfg`) so that it aligns with our naming scheme (as for `snapper`)
And maybe rename `grub-btrfs-runit` to `runit-grub-btrfs` for naming consistency (we have `runit-iptables` and `runit-kdump` for example)
next prev parent reply other threads:[~2021-04-13 16:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 1:41 [PR PATCH] grub-btrfs: " teldra
2021-04-13 7:12 ` [PR PATCH] [Updated] " teldra
2021-04-13 7:13 ` [PR PATCH] [Updated] grub-btrfs: update to 4.9; " teldra
2021-04-13 16:03 ` FollieHiyuki [this message]
2021-04-13 16:11 ` FollieHiyuki
2021-04-13 17:14 ` ericonr
2021-04-13 22:03 ` [PR PATCH] [Updated] " teldra
2021-04-13 22:04 ` grub-btrfs: update to 4.9 teldra
2021-04-14 12:07 ` [PR PATCH] [Merged]: " ericonr
2021-04-14 12:29 ` sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210413160351.kwGfGohc-XczqmGFWGZgrhwq4vxQkajyHD8V-EBBHlY@z \
--to=folliehiyuki@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).