Author: uelsk8s
Date: Thu Oct 30 16:59:32 2008
New Revision: 251
Modified:
branches/iVL/FMain.class
branches/iVL/MdlConfLilo.module
branches/iVL/installer.gambas
Log:
run alsa config quietly - getting ready for ISO test
Modified: branches/iVL/FMain.class
==============================================================================
--- branches/iVL/FMain.class (original)
+++ branches/iVL/FMain.class Thu Oct 30 16:59:32 2008
@@ -264,6 +264,7 @@
frmNext = FrmLilo
CASE "FrmLilo"
+ MdlConfLilo.PERFORM_BINDING()
'make sure lilo has not been bypassed
IF FrmLilo.YNLiloBox.Value = FALSE THEN
' do some simple checks to make sure nothing is left blank
before proceeding
@@ -274,7 +275,6 @@
RETURN
END IF
' Now that lilo has been setup, write it to the config
- MdlConfLilo.PERFORM_BINDING()
MdlConfLilo.GENERATE_LILO_DOT_CONF()
MdlConfLilo.GATHER_OTHER_LINUX_KERNELS_AND_INITRDS()
MdlConfLilo.WRITE_LILO_DOT_CONF()
@@ -330,6 +330,7 @@
MdlNetConf.WRITE_INET()
'offer to reboot here
+ ME.END_INSTALLER()
frmNext = FrmAlsaConf
' frmNext = FrmLilo ' this is already done
Modified: branches/iVL/MdlConfLilo.module
==============================================================================
--- branches/iVL/MdlConfLilo.module (original)
+++ branches/iVL/MdlConfLilo.module Thu Oct 30 16:59:32 2008
@@ -311,15 +311,6 @@
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 "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)
-'SHELL "echo \"" & sOut & "\" >" & 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
@@ -335,13 +326,22 @@
"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"
+"/sbin/vhwconf" &
+"/sbin/valsaconf-quiet"
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 "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)
+SHELL "echo \"" & sOut & "\" >" & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
+SHELL "chmod +x " & ClsGlobal.sTargetMnt
&/ "var/log/setup/init/config-stage2"
'SHELL "chroot /mnt/target " WAIT
END
Modified: branches/iVL/installer.gambas
==============================================================================
Binary files. No diff available.
|
