From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] base-files: vkpurge: fix for empty /boot
Date: Sun, 05 Apr 2020 08:42:22 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20666@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages base-files-vkpurge-empty-boot
https://github.com/void-linux/void-packages/pull/20666
base-files: vkpurge: fix for empty /boot
On system with empty /boot (example: /boot on external device and not
mounted:
* `vkpurge list` reports `*`, which is incorrect, and
* `vkpurge rm all` run `remove_kernel` for all file names in $PWD,
this will normally harmless except when efibootmgr is used and some
files with special name, let's say "V" "o" "i" "d" in $PWD, then,
efibootmgr will remove all boot entries.
Fix it by checking for `vmlinu[xz]-*` explicitly.
A sane system shouldn't have that file.
A patch file from https://github.com/void-linux/void-packages/pull/20666.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-base-files-vkpurge-empty-boot-20666.patch --]
[-- Type: text/x-diff, Size: 1639 bytes --]
From b866dab155e4657b947502b8153ea96e4602afb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Sun, 5 Apr 2020 13:33:50 +0700
Subject: [PATCH] base-files: vkpurge: fix for empty /boot
On system with empty /boot (example: /boot on external device and not
mounted:
* `vkpurge list` reports `*`, which is incorrect, and
* `vkpurge rm all` run `remove_kernel` for all file names in $PWD,
this will normally harmless except when efibootmgr is used and some
files with special name, let's say "V" "o" "i" "d" in $PWD, then,
efibootmgr will remove all boot entries.
Fix it by checking for `vmlinu[xz]-*` explicitly.
A sane system shouldn't have that file.
---
srcpkgs/base-files/files/vkpurge | 1 +
srcpkgs/base-files/template | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge
index 97fc88fa635..92098ec736e 100644
--- a/srcpkgs/base-files/files/vkpurge
+++ b/srcpkgs/base-files/files/vkpurge
@@ -29,6 +29,7 @@ list_kernels() {
kver=${k##*-}
case "$kver" in
"$running") ;;
+ "*") ;; # /boot isn't mounted -> no vmlinu[xz]
$pattern) printf "%s\n" "$kver" ;;
esac
done
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index a54f2391c1a..9946595366d 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,7 +1,7 @@
# Template file for 'base-files'
pkgname=base-files
version=0.140
-revision=12
+revision=13
bootstrap=yes
depends="xbps-triggers"
short_desc="Void Linux base system files"
next reply other threads:[~2020-04-05 6:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-05 6:42 sgn [this message]
2020-04-05 9:01 ` [PR PATCH] [Updated] " sgn
2020-04-06 7:33 ` [PR PATCH] [Merged]: " xtraeme
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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20666@inbox.vuxu.org \
--to=sgn@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).