[Morphix-cvs] mpmis mpmis,1.7,1.8

[Brendan S. <bms...@us...>]

Update of /cvsroot/morphix/mpmis
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18673

Modified Files:
	mpmis 
Log Message:
Notes: Should now work with 0.5 as well, tested piecemeal, but should be ok.  Even if the BIOS on _2_ of your laptops does not like 0.5.         Condensed Notes: moo

Index: mpmis
===================================================================
RCS file: /cvsroot/morphix/mpmis/mpmis,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mpmis	24 Feb 2005 23:25:41 -0000	1.7
--- mpmis	27 Feb 2005 00:24:25 -0000	1.8
***************
*** 4,7 ****
--- 4,8 ----
  # Version: 1.6 Dated 2005-02-24
  #	Current version: Tested with 0.4.1.d Base
+ #                      : Also tested with 0.5pre4
  #	                 May work with other bases - which belong to us.
  #
***************
*** 22,26 ****
  # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA
  #
! # Installs a Morphix CD v0.4 to a Hard Drive as a poor mans install
  #  * Hard Drive is partitioned 
  #  * Uses one partition as the /ramdisk 
--- 23,27 ----
  # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA
  #
! # Installs a Morphix CD to a Hard Drive as a poor mans install
  #  * Hard Drive is partitioned 
  #  * Uses one partition as the /ramdisk 
***************
*** 154,161 ****
  	echo "  Currenlty no error capture for the above"
  
! 	sudo mount /cdrom/base/boot.img /mnt/test -o loop
! 	cp /mnt/test/* /tmp/"$INSTALL"1 -r
! 	sed -e s/fd0/hd0,0/g /mnt/test/boot/grub/menu.lst > /tmp/menu.lst
! 	sed -e s/fd0/hd0,0/g /mnt/test/boot/grub/lang.lst > /tmp/lang.lst
  
  	# When installing we use no swap, when installed we need to use swap
--- 155,175 ----
  	echo "  Currenlty no error capture for the above"
  
! 	#Test if its a 0.5 or a 0.4 Verison of Morphix
! 	if [ -e "/cdrom/base/boot.img" ] 
! 		then
! 		        sudo mount /cdrom/base/boot.img /mnt/test -o loop
! 		        cp /mnt/test/* /tmp/"$INSTALL"1 -r
! 			sed -e s/fd0/hd0,0/g /tmp/"$INSTALL"1/boot/grub/menu.lst > /tmp/menu.lst
! 			sed -e s/fd0/hd0,0/g /tmp/"$INSTALL"1/boot/grub/lang.lst > /tmp/lang.lst
! 	elif [ -e "/cdrom/boot/grub/iso9660_stage1_5" ]
! 		then
! 			mkdir /tmp/"$INSTALL"1/boot/
!                         cp /cdrom/boot/* /tmp/"$INSTALL"1/boot/ -r
! 			# Remember Now not using fd emulation, hence cd not fd0
! 			sed -e 's/(cd)/(hd0,0)/g' /tmp/"$INSTALL"1/boot/grub/menu.lst > /tmp/menu.lst
! 			sed -e 's/(cd)/(hd0,0)/g' /tmp/"$INSTALL"1/boot/grub/lang.lst > /tmp/lang.lst
! 			# Stage 1 is not in 0.5's grub - nice _feature_
! 			cp /lib/grub/i386-pc/stage1 /tmp/"$INSTALL"1/boot/grub/  
! 	fi
  
  	# When installing we use no swap, when installed we need to use swap
***************
*** 217,221 ****
  		echo "DELAY="$DELAY 			> /tmp/"$INSTALL"5/photo-ix.conf/photo-ix.conf
  		echo "DEVICE=/dev/"$NEWDEVICE"6" 	>>/tmp/"$INSTALL"5/photo-ix.conf/photo-ix.conf
- 		sudo umount /dev/"$INSTALL"5
  
  		echo "Copying photos from CD to Hard Drive"
--- 231,234 ----
***************
*** 225,228 ****
--- 238,242 ----
  		sudo umount /dev/"$INSTALL"6
  	fi
+ 	sudo umount /dev/"$INSTALL"5
  
  	clear