summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-08-06 19:56:46 +0000
committer Eric Hameleers <alien@slackware.com>2019-08-07 08:59:46 +0200
commit8e64bd8dadd21e2f4d9780faf564f10ce65043fe (patch)
tree0335a0582f6bb96bd8e6df7c0c47613e81beb8b9 /source/a
parent56f3f1d1b21085cbaa1191c111c1a99b80c84505 (diff)
downloadcurrent-8e64bd8dadd21e2f4d9780faf564f10ce65043fe.tar.gz
current-8e64bd8dadd21e2f4d9780faf564f10ce65043fe.tar.xz
Tue Aug 6 19:56:46 UTC 201920190806195646
a/mcelog-164-x86_64-1.txz: Upgraded. a/os-prober-1.77-x86_64-3.txz: Rebuilt. Fix cleanup() function. Thanks to USUARIONUEVO. l/ffmpeg-4.2-x86_64-1.txz: Upgraded. n/iw-5.3-x86_64-1.txz: Upgraded. extra/pure-alsa-system/ffmpeg-4.2-x86_64-1_alsa.txz: Upgraded. testing/packages/NetworkManager-1.20.0-x86_64-1.txz: Upgraded. This finally drops libnm-glib. I'm curious to hear how this will affect various NM plugins before merging it into the main tree. Please test and report any problems.
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/os-prober/os-prober.SlackBuild2
-rw-r--r--source/a/os-prober/os-prober.lvm2.diff25
2 files changed, 19 insertions, 8 deletions
diff --git a/source/a/os-prober/os-prober.SlackBuild b/source/a/os-prober/os-prober.SlackBuild
index 1098ac6b8..0c46c5773 100755
--- a/source/a/os-prober/os-prober.SlackBuild
+++ b/source/a/os-prober/os-prober.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=os-prober
VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d _ | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/os-prober/os-prober.lvm2.diff b/source/a/os-prober/os-prober.lvm2.diff
index 91f527256..a3fbf2c33 100644
--- a/source/a/os-prober/os-prober.lvm2.diff
+++ b/source/a/os-prober/os-prober.lvm2.diff
@@ -1,7 +1,18 @@
-diff -ru os-prober-1.77/common.sh os-prober-1.77.new/common.sh
---- os-prober-1.77/common.sh 2018-08-10 21:23:18.000000000 +0200
-+++ os-prober-1.77.new/common.sh 2019-08-03 23:37:48.466380378 +0200
-@@ -176,6 +176,15 @@
+diff -u -r --new-file os-prober-1.77.orig/common.sh os-prober-1.77/common.sh
+--- os-prober-1.77.orig/common.sh 2018-08-10 14:23:18.000000000 -0500
++++ os-prober-1.77/common.sh 2019-08-05 23:39:13.130356299 -0500
+@@ -4,6 +4,10 @@
+
+ cleanup_tmpdir=false
+ cleanup () {
++ local partition
++ for partition in $cleanup_ro_partitions; do
++ blockdev --setrw "$partition"
++ done
+ if $cleanup_tmpdir; then
+ rm -rf "$OS_PROBER_TMP"
+ fi
+@@ -176,6 +180,15 @@
sed 's/\\011/ /g; s/\\012/\n/g; s/\\040/ /g; s/\\134/\\/g'
}
@@ -17,9 +28,9 @@ diff -ru os-prober-1.77/common.sh os-prober-1.77.new/common.sh
find_label () {
local output
if type blkid >/dev/null 2>&1; then
-diff -ru os-prober-1.77/os-probes/common/50mounted-tests os-prober-1.77.new/os-probes/common/50mounted-tests
---- os-prober-1.77/os-probes/common/50mounted-tests 2018-08-10 21:23:18.000000000 +0200
-+++ os-prober-1.77.new/os-probes/common/50mounted-tests 2019-08-03 23:37:48.465380372 +0200
+diff -u -r --new-file os-prober-1.77.orig/os-probes/common/50mounted-tests os-prober-1.77/os-probes/common/50mounted-tests
+--- os-prober-1.77.orig/os-probes/common/50mounted-tests 2018-08-10 14:23:18.000000000 -0500
++++ os-prober-1.77/os-probes/common/50mounted-tests 2019-08-05 23:37:24.763351672 -0500
@@ -69,6 +69,15 @@
debug "mounted using GRUB, but unknown filesystem?"
type=fuseblk