From: <cod...@go...> - 2008-10-28 01:17:09
|
Author: uelsk8s Date: Mon Oct 27 18:16:01 2008 New Revision: 242 Added: branches/iVL/FrmHalSwitch.class branches/iVL/FrmHalSwitch.form 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/FrmRootPass.class branches/iVL/FrmUserAdd.class branches/iVL/MdlConfLilo.module Log: started adding hardware config Modified: branches/iVL/.lang/ClsGlobal.pot ============================================================================== --- branches/iVL/.lang/ClsGlobal.pot (original) +++ branches/iVL/.lang/ClsGlobal.pot Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/ClsGlobal.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/ClsPartSel.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/ClsWinDrives.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FMain.class +# /home/uel/svn-install-ng/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -82,23 +82,23 @@ msgid "The VectorLinux installer will now exit. Enjoy your new operating system" msgstr "" -#: FMain.class:443 +#: FMain.class:435 msgid "Process Overview" msgstr "" -#: FMain.class:463 +#: FMain.class:455 msgid "Next" msgstr "" -#: FMain.class:469 +#: FMain.class:461 msgid "Back" msgstr "" -#: FMain.class:475 +#: FMain.class:467 msgid "Exit Installation" msgstr "" -#: FMain.class:491 +#: FMain.class:483 msgid "Button1" msgstr "" Modified: branches/iVL/.lang/FrmDiskPart.pot ============================================================================== --- branches/iVL/.lang/FrmDiskPart.pot (original) +++ branches/iVL/.lang/FrmDiskPart.pot Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmDiskPart.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmPartScheme.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmPartSel.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmPkgSel.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmSelISO.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmSummary.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/FrmWinDrives.class +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlCore.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlDiskPart.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlObjSizer.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlPartSel.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlPkgSel.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlSetup.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlSummarize.module +# /home/uel/svn-install-ng/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 Mon Oct 27 18:16:01 2008 @@ -1,4 +1,4 @@ -# /home/vluser/projects/installer/MdlWinDrives.module +# /home/uel/svn-install-ng/MdlWinDrives.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/iVL/DevLog ============================================================================== --- branches/iVL/DevLog (original) +++ branches/iVL/DevLog Mon Oct 27 18:16:01 2008 @@ -7,3 +7,8 @@ +-I added the non-gui config code to run in the BG when lilo window starts. + this is how it is done in old installer. + we still need vhalswitch, ALSA-config(this should be done in xterm IMO), vxconf, hwinit??, and runlevel??. + we can skip last 2 IMO + I added code to mount all needed binds to liloconfig and stoppped mount/umount in root, and useradd. \ No newline at end of file Added: branches/iVL/FrmHalSwitch.class ============================================================================== --- (empty file) +++ branches/iVL/FrmHalSwitch.class Mon Oct 27 18:16:01 2008 @@ -0,0 +1,2 @@ +' Gambas class file + Added: branches/iVL/FrmHalSwitch.form ============================================================================== --- (empty file) +++ branches/iVL/FrmHalSwitch.form Mon Oct 27 18:16:01 2008 @@ -0,0 +1,18 @@ +# Gambas Form File 2.0 + +{ Form Form + MoveScaled(0,0,64,64) + Text = ("") + { TextBox1 TextBox + MoveScaled(1,1,46,9) + Text = ("Would you like to use Vl-Hot or HAL to manage your removable devices?") + } + { RadioButton1 RadioButton + MoveScaled(2,17,15,3) + Text = ("HAL") + } + { RadioButton2 RadioButton + MoveScaled(2,23,16,3) + Text = ("VL-Hot") + } +} Modified: branches/iVL/FrmRootPass.class ============================================================================== --- branches/iVL/FrmRootPass.class (original) +++ branches/iVL/FrmRootPass.class Mon Oct 27 18:16:01 2008 @@ -36,10 +36,10 @@ IF ME.tbPasswd1.Text = ME.tbPasswd2.Text THEN 'Message("chroot /mnt/target /sbin/passwdx root " & ME.tbPasswd1.Text) ' bind mounting necessary here - SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT - SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT - SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT - SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT + 'SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT + 'SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT + 'SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT + 'SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT SHELL "chroot /mnt/target /sbin/passwdx root " & ME.tbPasswd1.Text WAIT 'Message("Root password Set.") ME.tbPasswd1.Clear @@ -51,10 +51,10 @@ ME.tbPasswd1.SetFocus ENDIF ENDIF - SHELL "umount " & ClsGlobal.sTargetMnt &/ "sys" WAIT - SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT - SHELL "umount " & ClsGlobal.sTargetMnt &/ "tmp" WAIT - SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT + 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "sys" WAIT + 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "proc" WAIT + 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "tmp" WAIT + 'SHELL "umount " & ClsGlobal.sTargetMnt &/ "dev" WAIT END PUBLIC SUB Form_Resize() Modified: branches/iVL/FrmUserAdd.class ============================================================================== --- branches/iVL/FrmUserAdd.class (original) +++ branches/iVL/FrmUserAdd.class Mon Oct 27 18:16:01 2008 @@ -132,10 +132,10 @@ ' need to do some binding for this to work 'PRINT "Mounting system locations with bind options" - SHELL "mount -o bind /sys /mnt/target/sys" WAIT - SHELL "mount -o bind /tmp /mnt/target/tmp" WAIT - SHELL "mount -o bind /proc /mnt/target/proc" WAIT - SHELL "mount -o bind /dev /mnt/target/dev" WAIT + 'SHELL "mount -o bind /sys /mnt/target/sys" WAIT + 'SHELL "mount -o bind /tmp /mnt/target/tmp" WAIT + 'SHELL "mount -o bind /proc /mnt/target/proc" WAIT + 'SHELL "mount -o bind /dev /mnt/target/dev" WAIT 'PRINT "Deleting old user group" SHELL "chroot /mnt/target /usr/sbin/groupdel " & ME.tbUsername.Text WAIT '& " &> /dev/null" WAIT @@ -168,10 +168,10 @@ ENDIF ENDIF ENDIF - SHELL "umount /mnt/target/dev" WAIT - SHELL "umount /mnt/target/proc" WAIT - SHELL "umount /mnt/target/tmp" WAIT - SHELL "umount /mnt/target/sys" WAIT + 'SHELL "umount /mnt/target/dev" WAIT + 'SHELL "umount /mnt/target/proc" WAIT + 'SHELL "umount /mnt/target/tmp" WAIT + 'SHELL "umount /mnt/target/sys" WAIT Modified: branches/iVL/MdlConfLilo.module ============================================================================== --- branches/iVL/MdlConfLilo.module (original) +++ branches/iVL/MdlConfLilo.module Mon Oct 27 18:16:01 2008 @@ -301,17 +301,42 @@ DIM sOut AS String +SHELL "mount -o bind /sys " & ClsGlobal.sTargetMnt &/ "sys" WAIT +SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT +SHELL "mount -o bind /tmp " & ClsGlobal.sTargetMnt &/ "tmp" WAIT SHELL "mount -o bind /dev " & ClsGlobal.sTargetMnt &/ "dev" WAIT -SHELL "mount -o bind /proc " & ClsGlobal.sTargetMnt &/ "proc" WAIT -SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT -SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT +'SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT +'SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup/init" WAIT 'SHELL "touch " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" -sOut = "#!/bin/bash \n" & -"/sbin/config-stage1 gui-installer" -File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut) +'sOut = "#!/bin/bash \n" & +'"/sbin/config-stage1 gui-installer" +'File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2", sOut) 'SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" -SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" - +'SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "var/log/setup/init/config-stage2" + +'We will run the commands neccisary to setup the newly installed system here +SHELL "mkdir -p " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT +SHELL "chmod 700 " & ClsGlobal.sTargetMnt &/ "var/log/setup" WAIT +sOut = "#!/bin/bash \n" & +"chmod +x /etc/rc.d/rc.udev" & +"/etc/rc.d/rc.udev restart" & +"/etc/rc.d/rc.modules" & +"/sbin/vlsetup" & +"sh /var/log/scripts/gsb-desktop* & 2>/dev/null" & +"rm -r /root/.mc 2>/dev/null" & +"for i in /usr/share/icons/*;do cd $i 2>/dev/null && if [ -e convert.sh ];then sh convert.sh & 2>/dev/null;fi;done" & +"for i in /var/log/scripts/x11-fonts*;do sh $i &>/dev/null;done" & +"update-mime-database /usr/share/mime/" & +"cd /usr/lib && ln -sf preloadable_libintl.so libgnuintl.so.8 && rm libintl.so 2>/dev/null; ln -s preloadable_libintl.so libintl.so" & +"/sbin/vhwconf" +File.Save(ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng", sOut) +SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng" +SHELL "chmod +x " & ClsGlobal.sTargetMnt &/ "var/log/setup/config-vinstall-ng" + +SHELL "chroot /mnt/target /sbin/depmod -aq" WAIT +SHELL "chroot /mnt/target /var/log/setup/config-vinstall-ng &" +'SHELL "chroot /mnt/target " WAIT + END |