mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
36 lines
1.4 KiB
Diff
36 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
|