Changeset 2337

Timestamp:

10/28/07 09:11:34 (6 years ago)

Author:

alanbach-guest

Message:

Better other OS detection using os-prober: debian/control: added os-prober and di-utils-mapdevfs to deps

Location:

pkg/main/parsix-installer/trunk

Files:

• boot-tools.bm (modified) (3 diffs)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• parsix-installer (modified) (1 diff)

pkg/main/parsix-installer/trunk/boot-tools.bm

@@ -545 +545 @@
 }
 
+grub_write_chain() {
+        cat >> $TARGET_MNT_POINT/boot/grub/menu.lst <<EOF
+
+# This entry automatically added by the Parsix installer for a non-linux OS
+# on $partition
+title           $title
+root            $grubdrive
+savedefault
+EOF
+        # Only set makeactive if grub is installed in the mbr
+        if [ "$bootdev" = "(hd0)" ]; then
+                cat >> $TARGET_MNT_POINT/boot/grub/menu.lst <<EOF
+makeactive
+EOF
+        fi
+        # DOS/Windows can't deal with booting from a non-first hard drive
+        case $shortname in
+            MS*|Win*)
+                grubdisk="$(echo "$grubdrive" | sed 's/^(//; s/)$//; s/,.*//')"
+                case $grubdisk in
+                    hd0)        ;;
+                    hd*)
+                        cat >> $TARGET_MNT_POINT/boot/grub/menu.lst <<EOF
+map             (hd0) ($grubdisk)
+map             ($grubdisk) (hd0)
+EOF
+                        ;;
+                esac
+                ;;
+        esac
+        cat >> $TARGET_MNT_POINT/boot/grub/menu.lst <<EOF
+chainloader     +1
+
+EOF
+} # grub_write_chain end
+
+grub_write_divider() {
+        cat >> $TARGET_MNT_POINT/boot/grub/menu.lst << EOF
+
+# This is a divider, added to separate the menu items below from the Debian
+# ones.
+title           Other operating systems:
+root
+
+EOF
+} # grub_write_divider end
 
 install_grub()
@@ -651 +697 @@
         perl -pi -e "s|^# kopt=root=(.*) ro|# kopt=root=\1 ro $GRUB_CMDLINE|g" $TARGET_MNT_POINT/boot/grub/menu.lst
 
-        # Add other OS' :-)
-        # Sorry x86-only for now ... :-/
+        # Add other Operating Systems
+        os-prober > /tmp/os-probed
 
         export device_map=$TARGET_MNT_POINT/boot/grub/device.map
 
-        while read p m f relax;
-        do
-                [ "${p:5:2}" != "fd" ] && case "$f" in
-                        vfat|msdos)
-                                gp=$(translate_linux_to_grub $p) || continue
-                                [ ${p:8} -le 4 ] && cat << EOF
-title Windows 95/98/ME (${p:5})
-root $gp
-makeactive
-chainloader +1
-EOF
-                        ;;
-                        ntfs)
-                                gp=$(translate_linux_to_grub $p) || continue
-                                [ ${p:8} -le 4 ] && cat << EOF
-title Windows 2K/XP/2003 (${p:5})
-chainloader $gp+1
-EOF
-                        ;;
-                esac
-        done < /etc/fstab >> $TARGET_MNT_POINT/boot/grub/menu.lst
+        if [ -s /tmp/os-probed ]; then
+          grub_write_divider
+        fi
+
+        for os in $(cat /tmp/os-probed); do
+          title=$(echo "$os" | cut -d: -f2)
+          shortname=$(echo "$os" | cut -d: -f3)
+          type=$(echo "$os" | cut -d: -f4)
+          
+          case "$type" in
+                chain)
+                        partition=$(mapdevfs $(echo "$os" | cut -d: -f1))
+                        grubdrive=$(translate_linux_to_grub "$partition") || true
+                        if [ -n "$grubdrive" ]; then
+                                    grub_write_chain
+                        fi
+                ;;
+          esac
+        done
+        # End Adding other Operating Systems
 
         # update menu.lst
@@ -691 +736 @@
 [ -x /usr/sbin/mkinitramfs -a ! -d /lib/modules/$BOOT_KERNEL/kernel/fs/cramfs ] && echo ramdisk = /usr/sbin/mkinitramfs >> $TARGET_MNT_POINT/etc/kernel-img.conf
 
-        # install grub
-        
         # in case of jfs/xfs force installation to mbr - usually not needed
-
         case $FS_TYPE in
                 jfs|xfs) BOOT_WHERE="mbr";;

pkg/main/parsix-installer/trunk/debian/changelog

@@ +1 @@
+parsix-installer (0.81.0) barry; urgency=low
+
+  * Better other OS detection using os-prober
+    - debian/control: added os-prober and di-utils-mapdevfs
+      to deps
+
+ -- Alan Baghumian <alan@technotux.org>  Sun, 28 Oct 2007 11:38:49 +0330
+
 parsix-installer (0.80.2.7) barry; urgency=low
 

pkg/main/parsix-installer/trunk/debian/control

@@ -8 +8 @@
 Package: parsix-installer
 Architecture: all
-Depends: dialog, initramfs-tools, perl, bash (>>2.05), gdm, grub (>>0.95), whois, initscripts, usleep-parsix, sysv-freeze, dmidecode
+Depends: dialog, initramfs-tools, perl, bash (>>2.05), gdm, grub (>>0.95), whois, initscripts, usleep-parsix, sysv-freeze, dmidecode, os-probe, di-utils-mapdevfs
 Recommends: xdialog
 Conflicts: parsix-menu (<= 0.6.2), parsix-manpages (<= 0.2.0)

pkg/main/parsix-installer/trunk/parsix-installer

@@ -19 +19 @@
 #
 
-VERSION="0.80.2"
+VERSION="0.81.0"
 CONFIG_FILE="$HOME/.knofig"
 LOG="$HOME/.knofig_log"