From: <cod...@go...> - 2008-12-05 16:54:31
|
Author: M0...@gm... Date: Fri Dec 5 08:52:50 2008 New Revision: 375 Modified: branches/iVL/.lang/ClsGlobal.pot branches/iVL/.lang/ClsPartSel.pot branches/iVL/.lang/ClsWinDrives.pot branches/iVL/.lang/FMain.pot branches/iVL/.lang/FrmDiskPart.pot branches/iVL/.lang/FrmPartScheme.pot branches/iVL/.lang/FrmPartSel.pot branches/iVL/.lang/FrmPkgSel.pot branches/iVL/.lang/FrmSelISO.pot branches/iVL/.lang/FrmSummary.pot branches/iVL/.lang/FrmWinDrives.pot branches/iVL/.lang/MdlCore.pot branches/iVL/.lang/MdlDiskPart.pot branches/iVL/.lang/MdlObjSizer.pot branches/iVL/.lang/MdlPartSel.pot branches/iVL/.lang/MdlPkgSel.pot branches/iVL/.lang/MdlSetup.pot branches/iVL/.lang/MdlSummarize.pot branches/iVL/.lang/MdlWinDrives.pot branches/iVL/DevLog branches/iVL/MdlLilo.module Log: Added MBR Cleaning Modified: branches/iVL/.lang/ClsGlobal.pot ============================================================================== --- branches/iVL/.lang/ClsGlobal.pot (original) +++ branches/iVL/.lang/ClsGlobal.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/ClsGlobal.class +# /home/vluser/devel/installer/ClsGlobal.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/ClsPartSel.pot ============================================================================== --- branches/iVL/.lang/ClsPartSel.pot (original) +++ branches/iVL/.lang/ClsPartSel.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/ClsPartSel.class +# /home/vluser/devel/installer/ClsPartSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/ClsWinDrives.pot ============================================================================== --- branches/iVL/.lang/ClsWinDrives.pot (original) +++ branches/iVL/.lang/ClsWinDrives.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/ClsWinDrives.class +# /home/vluser/devel/installer/ClsWinDrives.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FMain.pot ============================================================================== --- branches/iVL/.lang/FMain.pot (original) +++ branches/iVL/.lang/FMain.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FMain.class +# /home/vluser/devel/installer/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmDiskPart.class +# /home/vluser/devel/installer/FrmDiskPart.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmPartScheme.pot ============================================================================== --- branches/iVL/.lang/FrmPartScheme.pot (original) +++ branches/iVL/.lang/FrmPartScheme.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmPartScheme.class +# /home/vluser/devel/installer/FrmPartScheme.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmPartSel.pot ============================================================================== --- branches/iVL/.lang/FrmPartSel.pot (original) +++ branches/iVL/.lang/FrmPartSel.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmPartSel.class +# /home/vluser/devel/installer/FrmPartSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmPkgSel.pot ============================================================================== --- branches/iVL/.lang/FrmPkgSel.pot (original) +++ branches/iVL/.lang/FrmPkgSel.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmPkgSel.class +# /home/vluser/devel/installer/FrmPkgSel.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmSelISO.pot ============================================================================== --- branches/iVL/.lang/FrmSelISO.pot (original) +++ branches/iVL/.lang/FrmSelISO.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmSelISO.class +# /home/vluser/devel/installer/FrmSelISO.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmSummary.pot ============================================================================== --- branches/iVL/.lang/FrmSummary.pot (original) +++ branches/iVL/.lang/FrmSummary.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmSummary.class +# /home/vluser/devel/installer/FrmSummary.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/FrmWinDrives.pot ============================================================================== --- branches/iVL/.lang/FrmWinDrives.pot (original) +++ branches/iVL/.lang/FrmWinDrives.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/FrmWinDrives.class +# /home/vluser/devel/installer/FrmWinDrives.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlCore.pot ============================================================================== --- branches/iVL/.lang/MdlCore.pot (original) +++ branches/iVL/.lang/MdlCore.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlCore.module +# /home/vluser/devel/installer/MdlCore.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlDiskPart.pot ============================================================================== --- branches/iVL/.lang/MdlDiskPart.pot (original) +++ branches/iVL/.lang/MdlDiskPart.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlDiskPart.module +# /home/vluser/devel/installer/MdlDiskPart.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlObjSizer.pot ============================================================================== --- branches/iVL/.lang/MdlObjSizer.pot (original) +++ branches/iVL/.lang/MdlObjSizer.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlObjSizer.module +# /home/vluser/devel/installer/MdlObjSizer.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlPartSel.pot ============================================================================== --- branches/iVL/.lang/MdlPartSel.pot (original) +++ branches/iVL/.lang/MdlPartSel.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlPartSel.module +# /home/vluser/devel/installer/MdlPartSel.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlPkgSel.pot ============================================================================== --- branches/iVL/.lang/MdlPkgSel.pot (original) +++ branches/iVL/.lang/MdlPkgSel.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlPkgSel.module +# /home/vluser/devel/installer/MdlPkgSel.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlSetup.pot ============================================================================== --- branches/iVL/.lang/MdlSetup.pot (original) +++ branches/iVL/.lang/MdlSetup.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlSetup.module +# /home/vluser/devel/installer/MdlSetup.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlSummarize.pot ============================================================================== --- branches/iVL/.lang/MdlSummarize.pot (original) +++ branches/iVL/.lang/MdlSummarize.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlSummarize.module +# /home/vluser/devel/installer/MdlSummarize.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/.lang/MdlWinDrives.pot ============================================================================== --- branches/iVL/.lang/MdlWinDrives.pot (original) +++ branches/iVL/.lang/MdlWinDrives.pot Fri Dec 5 08:52:50 2008 @@ -1,4 +1,4 @@ -# /root/installer/MdlWinDrives.module +# /home/vluser/devel/installer/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/DevLog ============================================================================== --- branches/iVL/DevLog (original) +++ branches/iVL/DevLog Fri Dec 5 08:52:50 2008 @@ -1,3 +0,0 @@ -- Added test to check for existing partitions before offering to use existing partitions - This way if no partitions are found (unpartitioned hard drive) the user will be lead into gparted -- Updated binary \ No newline at end of file Modified: branches/iVL/MdlLilo.module ============================================================================== --- branches/iVL/MdlLilo.module (original) +++ branches/iVL/MdlLilo.module Fri Dec 5 08:52:50 2008 @@ -27,10 +27,35 @@ PRIVATE i AS Integer ' used for object key +PUBLIC SUB CLEAN_MBR() + + DIM sTarget AS String + + IF Left(Trim(FrmLiloSetup.cbLIloTarget.Text), Len(("MBR of"))) = ("MBR of") THEN + sTarget = Right(Trim(FrmLiloSetup.cbLIloTarget.Text), Len(FrmLiloSetup.cbLIloTarget.Text) - InStr(FrmLiloSetup.cbLIloTarget.text, "/")) + + IF Exist("/usr/bin/ms-sys") THEN + 'SHELL "dd if /dev/" & Trim(sTarget) & " of=/boot/MBR.$( date +" + SHELL "/usr/bin/ms-sys -z " & Trim(sTarget) WAIT + ELSE + RETURN + END IF + +ELSE + RETURN + +END IF + + +END + + + PUBLIC FUNCTION TRIGGER_LILO_SETUP() AS Integer DIM IRET AS Integer MdlCore.WARN_STATUS("") + ME.CLEAN_MBR() ' Check MBR and clean if necessary ME.GENERATE_LILO_DOT_CONF ' Generates and write lilo.conf ME.COPY_KERNELS_AND_INITRDS ' copy kernels and initrs to the right place 'Moved binding to FMain.class right after packages finish installing. |