Menu
▾
▴
[Morphix-cvs] mpmis mpmis,1.13,1.14
|
From: Brendan S. <bms...@us...> - 2005-11-04 21:40:45
|
Update of /cvsroot/morphix/mpmis In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24337 Modified Files: mpmis Log Message: All grub files to be corrected with (hd0,0) fromhd=/dev/hd?5 noswap Index: mpmis =================================================================== RCS file: /cvsroot/morphix/mpmis/mpmis,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** mpmis 4 Sep 2005 18:21:54 -0000 1.13 --- mpmis 4 Nov 2005 21:40:37 -0000 1.14 *************** *** 172,177 **** sudo mount $BOOT_IMG_M /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 --- 172,178 ---- sudo mount $BOOT_IMG_M /mnt/test -o loop cp /mnt/test/* /tmp/"$INSTALL"1 -r ! ORGBD="fd0" ! #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 *************** *** 179,184 **** 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/ --- 180,186 ---- cp /cdrom/boot/* /tmp/"$INSTALL"1/boot/ -r # Remember Now not using fd emulation, hence cd not fd0 ! ORGBD="cd" ! #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/ *************** *** 192,217 **** sudo mount $BOOT_IMG_M /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.ls fi # When installing we use no swap, when installed we need to use swap - sed -e s/noswap//g /tmp/menu.lst > /tmp/menu0.lst - sed -e s/noswap//g /tmp/lang.lst > /tmp/lang2.lst # Comment out Slashimage ! sed -e s/splashimage/\#slashimage/g /tmp/menu0.lst > /tmp/menu2.lst ! ! sed -e 's/vmlinuz/vmlinuz\ fromhd=\/dev\/INSTALL5/g' /tmp/menu2.lst > /tmp/menu3.lst ! sed -e 's/vmlinuz/vmlinuz\ fromhd=\/dev\/INSTALL5/g' /tmp/lang2.lst > /tmp/lang3.lst ! ! sed -e "s/INSTALL/$INSTALL/g" /tmp/menu3.lst > /tmp/"$INSTALL"1/boot/grub/menu.lst ! sed -e "s/INSTALL/$INSTALL/g" /tmp/lang3.lst > /tmp/"$INSTALL"1/boot/grub/lang.lst ! ! #This has caused me some problems ! if [-e "/tmp/"$INSTALL"1/boot/grub/morphix.xpm.gz" ] ! then ! sudo rm /tmp/"$INSTALL"1/boot/grub/morphix.xpm.gz ! fi if [ -n "$BOOT_IMG_M" ] then --- 194,220 ---- sudo mount $BOOT_IMG_M /mnt/test -o loop cp /mnt/test/* /tmp/"$INSTALL"1 -r ! ORGBD="fd0" ! #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.ls fi + # When installing we use no swap, when installed we need to use swap # Comment out Slashimage ! # sed -e s/splashimage/\#slashimage/g /tmp/menu0.lst > /tmp/menu2.lst ! for TMP_GRUB_FILE in /tmp/"$INSTALL"1/boot/grub/*.lst ! do ! #GROUP SEDS ! sed -e "s/($ORGBD)/(hd0,0)/g" $TMP_GRUB_FILE > /tmp/menu.lst ! sed -e s/noswap//g /tmp/menu.lst > /tmp/menu0.lst ! sed -e 's/vmlinuz/vmlinuz\ fromhd=\/dev\/ZINSTALL5/g' /tmp/menu0.lst > /tmp/menu.lst ! sed -e "s/ZINSTALL/$INSTALL/g" /tmp/menu.lst > /tmp/menu0.lst ! sudo cp /tmp/menu0.lst $TMP_GRUB_FILE ! done #This has caused me some problems ! # if [-e "/tmp/"$INSTALL"1/boot/grub/morphix.xpm.gz" ] ! # then ! # sudo rm /tmp/"$INSTALL"1/boot/grub/morphix.xpm.gz ! # fi if [ -n "$BOOT_IMG_M" ] then |