387eb4a377
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/os-prober#2e94fd7ad1e4447a86142639b48e4d5334664d1a
36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
|
|
index 9bc5154..541079e 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')"
|
|
@@ -140,8 +140,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir/boot" ] || ls "$dir"/usr/lib*/ld*.so*)
|
|
short="Devuan"
|
|
long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat "$dir/etc/devuan_version")")"
|
|
else
|
|
- short="Linux"
|
|
- long="unknown Linux distribution"
|
|
+ exit 1
|
|
+# short="Linux"
|
|
+# long="unknown Linux distribution"
|
|
fi
|
|
|
|
label="$(count_next_label "$short")"
|
|
@@ -151,6 +152,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
|