diff --git a/system/boot/os-prober/actions.py b/system/boot/os-prober/actions.py index 1e69645b..b1249392 100644 --- a/system/boot/os-prober/actions.py +++ b/system/boot/os-prober/actions.py @@ -14,6 +14,9 @@ def build(): linux-boot-probes/common/50mounted-tests") shelltools.system("sed -i -e 's|grub-mount|grub2-mount|g' os-probes/common/50mounted-tests \ linux-boot-probes/common/50mounted-tests common.sh") + + shelltools.system("sed -i -e 's|/boot/grub/|/boot/grub2/|g' linux-boot-probes/mounted/common/40grub2 \ + linux-boot-probes/mounted/x86/40grub") shelltools.unlink("Makefile") autotools.make("newns") diff --git a/system/boot/os-prober/files/pisilinux-distro.patch b/system/boot/os-prober/files/pisilinux-distro.patch new file mode 100644 index 00000000..55c33b7a --- /dev/null +++ b/system/boot/os-prober/files/pisilinux-distro.patch @@ -0,0 +1,13 @@ +diff -Nuar a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro +--- a/os-probes/mounted/common/90linux-distro 2018-08-10 22:23:18.000000000 +0300 ++++ b/os-probes/mounted/common/90linux-distro 2021-07-18 02:11:39.137236954 +0300 +@@ -29,6 +29,9 @@ + elif [ -e "$dir/etc/altlinux-release" ]; then + short="ALTLinux" + long="$(cat "$dir/etc/altlinux-release")" ++ elif [ -e "$dir/etc/pisilinux-release" ]; then ++ short="Pisilinux" ++ long="$(cat "$dir/etc/pisilinux-release")" + elif [ -e "$dir/etc/magic-release" ]; then + short="Magic" + long="$(cat "$dir/etc/magic-release")" diff --git a/system/boot/os-prober/pspec.xml b/system/boot/os-prober/pspec.xml index b8317344..c557ba80 100644 --- a/system/boot/os-prober/pspec.xml +++ b/system/boot/os-prober/pspec.xml @@ -25,6 +25,8 @@ fedora/os-prober-mounted-partitions-fix.patch fedora/os-prober-no-dummy-mach-kernel.patch fedora/os-prober-umount-fix.patch + + pisilinux-distro.patch