[PR PATCH] efibootmgr: correct install message

[PR PATCH] efibootmgr: correct install message

[NeelChotai]

[-- Attachment #1: Type: text/plain, Size: 1620 bytes --]

There is a new pull request by NeelChotai against master on the void-packages repository

https://github.com/NeelChotai/void-packages efibootmgr-message-fix
https://github.com/void-linux/void-packages/pull/29098

efibootmgr: correct install message
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ x ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29098.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-efibootmgr-message-fix-29098.patch --]
[-- Type: text/x-diff, Size: 994 bytes --]

From fc4aac50db2fb1888b3bb4e4113254535705d4d3 Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Sat, 27 Feb 2021 20:03:09 +0000
Subject: [PATCH] efibootmgr: correct install message

---
 srcpkgs/efibootmgr/INSTALL.msg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/efibootmgr/INSTALL.msg b/srcpkgs/efibootmgr/INSTALL.msg
index 2b27d196f3e..c1c3d065767 100644
--- a/srcpkgs/efibootmgr/INSTALL.msg
+++ b/srcpkgs/efibootmgr/INSTALL.msg
@@ -4,7 +4,7 @@ Enable this by editing /etc/default/efibootmgr-kernel-hook.
 
 The efi variables need to be accessible in order for this to work, so
 add this line to your fstab and reboot or mount manually:
-  efivarfs /sys/firmware/efi/efivars efivarfs 0 0
+  efivarfs /sys/firmware/efi/efivars efivarfs defaults 0 0
 -----------------------------------------------------------------------
 Kernel cmd options can be configured in /etc/default/efibootmgr-kernel-hook,
 but you always have to reconfigure the kernel:

Re: efibootmgr: correct install message

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29098#issuecomment-787128566

Comment:
Wow, this install msg is huge. Do you think it could be moved to `README.voidlinux` file instead? Or even partly to void-docs... Having this fly by during installation makes it very easy to miss other important ones. (You're also missing a revbump).

Re: [PR PATCH] [Updated] efibootmgr: correct install message

[NeelChotai]

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is an updated pull request by NeelChotai against master on the void-packages repository

https://github.com/NeelChotai/void-packages efibootmgr-message-fix
https://github.com/void-linux/void-packages/pull/29098

efibootmgr: correct install message
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29098.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-efibootmgr-message-fix-29098.patch --]
[-- Type: text/x-diff, Size: 2395 bytes --]

From b16454975a54f8a191b08e12acb95af4652debca Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Sat, 27 Feb 2021 20:03:09 +0000
Subject: [PATCH] efibootmgr: correct install message, document mount
 instructions

---
 srcpkgs/efibootmgr/INSTALL.msg            | 2 +-
 srcpkgs/efibootmgr/files/README.voidlinux | 5 +++++
 srcpkgs/efibootmgr/template               | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/efibootmgr/files/README.voidlinux

diff --git a/srcpkgs/efibootmgr/INSTALL.msg b/srcpkgs/efibootmgr/INSTALL.msg
index 2b27d196f3e..c1c3d065767 100644
--- a/srcpkgs/efibootmgr/INSTALL.msg
+++ b/srcpkgs/efibootmgr/INSTALL.msg
@@ -4,7 +4,7 @@ Enable this by editing /etc/default/efibootmgr-kernel-hook.
 
 The efi variables need to be accessible in order for this to work, so
 add this line to your fstab and reboot or mount manually:
-  efivarfs /sys/firmware/efi/efivars efivarfs 0 0
+  efivarfs /sys/firmware/efi/efivars efivarfs defaults 0 0
 -----------------------------------------------------------------------
 Kernel cmd options can be configured in /etc/default/efibootmgr-kernel-hook,
 but you always have to reconfigure the kernel:
diff --git a/srcpkgs/efibootmgr/files/README.voidlinux b/srcpkgs/efibootmgr/files/README.voidlinux
new file mode 100644
index 00000000000..e95191f7d22
--- /dev/null
+++ b/srcpkgs/efibootmgr/files/README.voidlinux
@@ -0,0 +1,5 @@
+Some systems do not automatically mount efivars. If /sys/firmware/efi/efivars is empty, your system is affected.
+
+In order to to automatically mount efivars, add the following entry to /etc/fstab:
+
+efivarfs /sys/firmware/efi/efivars efivarfs defaults 0 0
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index e9b1bff036a..ca131efb1b1 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
 version=17
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel popt-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
@@ -39,7 +39,7 @@ do_install() {
 }
 
 post_install() {
-	vlicense COPYING
+	vdoc ${FILESDIR}/README.voidlinux
 	vmkdir etc/
 	vinstall "${FILESDIR}/efibootmgr-kernel-hook.confd" 644 etc/default efibootmgr-kernel-hook
 	vinstall ${FILESDIR}/kernel.d/efibootmgr.post-install 744 \

Re: efibootmgr: correct install message

[NeelChotai]

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/29098#issuecomment-787133560

Comment:
> Wow, this install msg is huge. Do you think it could be moved to `README.voidlinux` file instead? Or even partly to void-docs... Having this fly by during installation makes it very easy to miss other important ones. (You're also missing a revbump).

Added a README.voidlinux and revbumped, thanks for the reminder.

Strangely, efivars only needs to be manually mounted on my Dell systems. My PC mounts efivars automatically just fine.

Re: efibootmgr: correct install message

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29098#issuecomment-787133921

Comment:
I think it would be reasonable to move the entire contents of this to README.voidlinux and make the install message nothing more than

> See /usr/share/doc/efibootmgr/README.voidlinux for instructions on using efibootmgr to automatically manage EFI boot entries.

I believe `/sys/firmware/efi/efivars` might automatically mounted by elogind for some reason. Systems without elogind probably need to mount it explicitly.

Re: [PR PATCH] [Updated] efibootmgr: correct install message

[NeelChotai]

[-- Attachment #1: Type: text/plain, Size: 1623 bytes --]

There is an updated pull request by NeelChotai against master on the void-packages repository

https://github.com/NeelChotai/void-packages efibootmgr-message-fix
https://github.com/void-linux/void-packages/pull/29098

efibootmgr: correct install message
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/29098.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-efibootmgr-message-fix-29098.patch --]
[-- Type: text/x-diff, Size: 3718 bytes --]

From 9a827f9464c914aeeb532d21cd9fc82ddafe94fe Mon Sep 17 00:00:00 2001
From: Neel Chotai <neel@chot.ai>
Date: Sat, 27 Feb 2021 20:03:09 +0000
Subject: [PATCH] efibootmgr: move setup instructions to README.voidlinux

---
 srcpkgs/efibootmgr/INSTALL.msg            | 21 ++-------------------
 srcpkgs/efibootmgr/files/README.voidlinux | 19 +++++++++++++++++++
 srcpkgs/efibootmgr/template               |  4 ++--
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 srcpkgs/efibootmgr/files/README.voidlinux

diff --git a/srcpkgs/efibootmgr/INSTALL.msg b/srcpkgs/efibootmgr/INSTALL.msg
index 2b27d196f3e..3c1f4796dba 100644
--- a/srcpkgs/efibootmgr/INSTALL.msg
+++ b/srcpkgs/efibootmgr/INSTALL.msg
@@ -1,19 +1,2 @@
-efibootmgr can automatically generate EFI boot entries to
-directly boot the kernel after every kernel update or installation.
-Enable this by editing /etc/default/efibootmgr-kernel-hook.
-
-The efi variables need to be accessible in order for this to work, so
-add this line to your fstab and reboot or mount manually:
-  efivarfs /sys/firmware/efi/efivars efivarfs 0 0
------------------------------------------------------------------------
-Kernel cmd options can be configured in /etc/default/efibootmgr-kernel-hook,
-but you always have to reconfigure the kernel:
-
-	$ xbps-reconfigure -f linux4.8
-	(or any other kernel version)
-
-This is also required after the first installation of this package.
------------------------------------------------------------------------
-The bootorder itself is not changed, so your previous boot loader will
-stay enabled until you can edit the order in your firmware interface or
-using "efibootmgr -o <hexnum>"
+See /usr/share/doc/efibootmgr/README.voidlinux for instructions on
+using efibootmgr to automatically manage EFI boot entries.
diff --git a/srcpkgs/efibootmgr/files/README.voidlinux b/srcpkgs/efibootmgr/files/README.voidlinux
new file mode 100644
index 00000000000..98844fd85a6
--- /dev/null
+++ b/srcpkgs/efibootmgr/files/README.voidlinux
@@ -0,0 +1,19 @@
+efibootmgr can automatically generate EFI boot entries to
+directly boot the kernel after every kernel update or installation.
+Enable this by editing /etc/default/efibootmgr-kernel-hook.
+
+The EFI variables need to be accessible in order for this to work, so
+add this line to your fstab and reboot or mount manually:
+  efivarfs /sys/firmware/efi/efivars efivarfs defaults 0 0
+-----------------------------------------------------------------------
+Kernel cmd options can be configured in /etc/default/efibootmgr-kernel-hook,
+but you always have to reconfigure the kernel:
+
+	$ xbps-reconfigure -f linux4.8
+	(or any other kernel version)
+
+This is also required after the first installation of this package.
+-----------------------------------------------------------------------
+The bootorder itself is not changed, so your previous boot loader will
+stay enabled until you can edit the order in your firmware interface or
+using "efibootmgr -o <hexnum>"
diff --git a/srcpkgs/efibootmgr/template b/srcpkgs/efibootmgr/template
index e9b1bff036a..ca131efb1b1 100644
--- a/srcpkgs/efibootmgr/template
+++ b/srcpkgs/efibootmgr/template
@@ -1,7 +1,7 @@
 # Template file for 'efibootmgr'
 pkgname=efibootmgr
 version=17
-revision=3
+revision=4
 hostmakedepends="pkg-config"
 makedepends="libefivar-devel popt-devel"
 short_desc="Tool to modify UEFI Firmware Boot Manager Variables"
@@ -39,7 +39,7 @@ do_install() {
 }
 
 post_install() {
-	vlicense COPYING
+	vdoc ${FILESDIR}/README.voidlinux
 	vmkdir etc/
 	vinstall "${FILESDIR}/efibootmgr-kernel-hook.confd" 644 etc/default efibootmgr-kernel-hook
 	vinstall ${FILESDIR}/kernel.d/efibootmgr.post-install 744 \

Re: efibootmgr: correct install message

[NeelChotai]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

New comment by NeelChotai on void-packages repository

https://github.com/void-linux/void-packages/pull/29098#issuecomment-787144742

Comment:
> I think it would be reasonable to move the entire contents of this to README.voidlinux and make the install message nothing more than
> 
> > See /usr/share/doc/efibootmgr/README.voidlinux for instructions on using efibootmgr to automatically manage EFI boot entries.
> 
> I believe `/sys/firmware/efi/efivars` might automatically mounted by elogind for some reason. Systems without elogind probably need to mount it explicitly.

That explains it, and your suggestion sounds good - implemented.

Re: [PR PATCH] [Merged]: efibootmgr: correct install message

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1446 bytes --]

There's a merged pull request on the void-packages repository

efibootmgr: correct install message
https://github.com/void-linux/void-packages/pull/29098

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->