mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
83f17a22c6
a/kernel-firmware-20240913_6c88d9b-noarch-1.txz: Upgraded. a/os-prober-1.83-x86_64-2.txz: Rebuilt. I have seen the reports that os-prober can take an excessive amount of time, but haven't had it take more than a minute and a half here on my most populated (and fairly slow) machine. But I've found and applied a patch that might help... let's see if this speeds things up on affected machines. d/git-2.46.1-x86_64-1.txz: Upgraded. d/python-setuptools-75.0.0-x86_64-1.txz: Upgraded. l/at-spi2-core-2.54.0-x86_64-1.txz: Upgraded. l/gsettings-desktop-schemas-47-x86_64-1.txz: Upgraded. l/libjpeg-turbo-3.0.4-x86_64-1.txz: Upgraded. l/python-pysol_cards-0.18.0-x86_64-1.txz: Upgraded. l/vte-0.78.0-x86_64-1.txz: Upgraded. testing/packages/kernel-generic-6.11.0-x86_64-1.txz: Added. testing/packages/kernel-headers-6.11.0-x86-1.txz: Added. testing/packages/kernel-source-6.11.0-noarch-1.txz: Added.
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
|
|
index b9c24dd..52db3f6 100755
|
|
--- a/os-probes/mounted/common/90linux-distro
|
|
+++ b/os-probes/mounted/common/90linux-distro
|
|
@@ -19,7 +19,7 @@ subvol="$5"
|
|
# symlinks we need to also check in $dir/usr/lib* for distributions that
|
|
# moved /lib* to /usr and only left symlinks behind.
|
|
# TODO: look for ld-linux.so on arches that have it
|
|
-if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null; then
|
|
+#if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*) >/dev/null 2>/dev/null; then
|
|
if [ -e "$dir/etc/os-release" ]; then
|
|
short="$(grep ^NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g; s/[[:space:]].*//')"
|
|
long="$(grep ^PRETTY_NAME= "$dir/etc/os-release" | sed 's/^[^=]*=//; s/^['\''"]\(.*\)['\''"]$/\1/; s/\\\(.\)/\1/g')"
|
|
@@ -146,8 +146,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*)
|
|
short="Exherbo"
|
|
long="Exherbo Linux"
|
|
else
|
|
- short="Linux"
|
|
- long="unknown Linux distribution"
|
|
+ exit 1
|
|
+# short="Linux"
|
|
+# long="unknown Linux distribution"
|
|
fi
|
|
|
|
label="$(count_next_label "$short")"
|
|
@@ -157,6 +158,6 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*)
|
|
result "$partition:$long:$label:linux"
|
|
fi
|
|
exit 0
|
|
-else
|
|
- exit 1
|
|
-fi
|
|
+#else
|
|
+# exit 1
|
|
+#fi
|