[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#592924: os-prober MINIX detection



Package: os-prober
Version: 1.38
Severity: normal
Tags: patch

The MINIX detection criterial is fairly old, no recent MINIX installation can be detected correctly.
As we are developing some new boot features of MINIX (Multiboot compliant for example), we are also 
trying to make configuring GRUB easier, as a result the detection of os-prober is patched.

The patch is as below:

Index: packages/os-prober/os-probes/mounted/x86/80minix
===================================================================
--- packages/os-prober/os-probes/mounted/x86/80minix	(revision 64312)
+++ packages/os-prober/os-probes/mounted/x86/80minix	(working copy)
@@ -7,11 +7,20 @@
 dir="$2"
 type="$3"
 
-if [ "$type" = minix ] && [ -f "$dir/minix" ]; then
-	# XXX will chain loading work?
-        label="$(count_next_label Minix)"
-	result "$partition:Minix:$label:chain"
-	exit 0
+if [ "$type" = minix ] || [ "$type" = ext2 ] ; then
+	if [ -e "$dir/boot/image_big" ]; then
+		if [ -e "$dir/boot/image_latest" ]; then
+			boot="minix"
+		else
+			boot="chain"
+		fi
+
+		label="$(count_next_label Minix)"
+		result "$partition:Minix:$label:$boot"
+		exit 0
+	else
+		exit 1
+	fi
 else
 	exit 1
 fi


-- System Information:
Debian Release: squeeze/sid
  APT prefers lucid-updates
  APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid-proposed'), (500, 'lucid-backports'), (500, 'lucid')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages os-prober depends on:
ii  libc6                  2.11.1-0ubuntu7.2 Embedded GNU C Library: Shared lib

os-prober recommends no packages.

os-prober suggests no packages.

-- no debconf information
Index: packages/os-prober/os-probes/mounted/x86/80minix
===================================================================
--- packages/os-prober/os-probes/mounted/x86/80minix	(revision 64312)
+++ packages/os-prober/os-probes/mounted/x86/80minix	(working copy)
@@ -7,11 +7,20 @@
 dir="$2"
 type="$3"
 
-if [ "$type" = minix ] && [ -f "$dir/minix" ]; then
-	# XXX will chain loading work?
-        label="$(count_next_label Minix)"
-	result "$partition:Minix:$label:chain"
-	exit 0
+if [ "$type" = minix ] || [ "$type" = ext2 ] ; then
+	if [ -e "$dir/boot/image_big" ]; then
+		if [ -e "$dir/boot/image_latest" ]; then
+			boot="minix"
+		else
+			boot="chain"
+		fi
+
+		label="$(count_next_label Minix)"
+		result "$partition:Minix:$label:$boot"
+		exit 0
+	else
+		exit 1
+	fi
 else
 	exit 1
 fi

Reply to: