1 --- a/packages/installator/scripts/installator.sh Wed Dec 31 20:51:15 2008 +0100
2 +++ b/packages/installator/scripts/installator.sh Wed Dec 31 21:46:15 2008 +0100
3 @@ -115,7 +115,10 @@
4 # Setup of GRUB config file using initial base config file ($1) and the
5 # boot device UUID ($2) and boot device GRUB descriptor (ROOTDEV as $3)
6 # with additional entries for Xorg if appropriate (USE_XORG as $4)
7 +# and an option according to the type of FS ($5).
8 setup_grub () {
9 + local OPT_FS_TYPE
10 +
11 # conditional HDTV menu entry if X.org is found
12 if [ "$4" = yes ]; then
13 append_grub_conf $1 "GeeXboX HDTV $VERSION" hdtv "" ""
14 @@ -136,7 +139,8 @@
15
16 # now setup installation specific options
17 sed -i "s/_ROOTDEV_/$3/g" $1
18 - sed -i "s/_DEVNAME_/UUID=${2}/g" $1
19 + [ "$5" = vfat ] && OPT_FS_TYPE=" vfat"
20 + sed -i "s/_DEVNAME_/UUID=${2}$OPT_FS_TYPE/g" $1
21 }
22
23 # Returns the value to use for a given variable ($1) as was found
24 @@ -433,6 +437,7 @@
25 # Installs and configures the GRUB bootloader
26 # $1 is DEV
27 # $2 is USE_XORG
28 +# $3 is MKFS_TYPE
29 install_grub (){
30 local ROOTDEV
31 local GRUBPREFIX=/boot/grub
32 @@ -441,6 +446,7 @@
33 local SPLASHIMAGE="$GRUBPREFIX/grub-splash.xpm.gz"
34 local LOC_DEV=$1
35 local LOC_USE_XORG=$2
36 + local LOC_MKFS_TYPE=$3
37
38 TMP_DISK=`echo "$LOC_DEV" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%'`
39 TMP_DISKNAME="${TMP_DISK#/dev/}"
40 @@ -497,7 +503,7 @@
41 # to retrieve the right UUID with vfat.
42 get_uuid "$LOC_DEV"
43
44 - setup_grub $GRUBDIR/single.lst $DEV_UUID $ROOTDEV $LOC_USE_XORG
45 + setup_grub $GRUBDIR/single.lst $DEV_UUID $ROOTDEV $LOC_USE_XORG $LOC_MKFS_TYPE
46
47 dbglg "*** Start GRUB Single.lst ***"
48 cat $GRUBDIR/single.lst >> $LOGFILE
49 @@ -589,7 +595,7 @@
50 done
51 IFS=$saveifs
52
53 - setup_grub $GRUBDIR/menu.lst $DEV_UUID $ROOTDEV $LOC_USE_XORG
54 + setup_grub $GRUBDIR/menu.lst $DEV_UUID $ROOTDEV $LOC_USE_XORG $LOC_MKFS_TYPE
55
56 dbglg "*** Start GRUB menu.lst ***"
57 cat $GRUBDIR/menu.lst >> $LOGFILE
58 @@ -690,7 +696,7 @@
59 # Adjust the location of core boot files to suit non-CDROM install
60 mv di/GEEXBOX/boot/vmlinuz di/GEEXBOX/boot/initrd.gz di/
61
62 -install_grub "$DEV" "$USE_XORG"
63 +install_grub "$DEV" "$USE_XORG" "$MKFS_TYPE"
64
65 # Remove unneeded boot dir from mounted install drive
66 rm -rf di/GEEXBOX/boot