Changeset 93109 in vbox for trunk/src/VBox/Main/UnattendedTemplates

Timestamp:

Dec 31, 2021 2:29:54 AM (3 years ago)

Author:

vboxsync

Message:

Main/UnattendedOs2Installer: Updates :-)

Location:

trunk/src/VBox/Main/UnattendedTemplates

Files:

• os2_cid_install.cmd (modified) (8 diffs)
• os2_response_files.rsp (modified) (3 diffs)

trunk/src/VBox/Main/UnattendedTemplates/os2_cid_install.cmd

@@ -23 +23 @@
 cd s:\os2image\disk_6
 
-lvm.exe /NEWMBR:1
-if ERRORLEVEL 0 goto lvm_newmbr_ok
+lvm.exe /NEWMBR:1 && goto lvm_newmbr_ok
 echo ** error: Writing a new MBR on disk 1 failed.
 goto lvm_failed
@@ -31 +30 @@
 lvm.exe "/SETNAME:DRIVE,[ D1 ],BootDrive"
 
-lvm.exe /CREATE:PARTITION,OS2Boot,1,1024,PRIMARY,BOOTABLE
-if ERRORLEVEL 0 goto lvm_create_partition_ok
+lvm.exe /CREATE:PARTITION,OS2Boot,1,1024,PRIMARY,BOOTABLE && goto lvm_create_partition_ok
 echo ** error: Creating boot partition on disk 1 failed.
 goto lvm_failed
 :lvm_create_partition_ok
 
-lvm.exe /CREATE:VOLUME,COMPATIBILITY,BOOTOS2,C:,OS2Boot,1,OS2Boot
-if ERRORLEVEL 0 goto lvm_create_volume_ok
+lvm.exe /CREATE:VOLUME,COMPATIBILITY,BOOTOS2,C:,OS2Boot,1,OS2Boot && goto lvm_create_volume_ok
 echo ** error: Creating boot volume on disk 1 failed.
 goto lvm_failed
 :lvm_create_volume_ok
 
-lvm.exe /SETSTARTABLE:VOLUME,OS2Boot
-if ERRORLEVEL 0 goto lvm_set_startable_ok
+lvm.exe /SETSTARTABLE:VOLUME,OS2Boot && goto lvm_set_startable_ok
 echo ** error: Setting boot volume on disk 1 startable failed.
 goto lvm_failed
 :lvm_set_startable_ok
 
-lvm.exe "/CREATE:PARTITION,Data,1,LOGICAL,NotBootable,[ FS1 ]"
-if ERRORLEVEL 0 goto lvm_create_data_partition_ok
+lvm.exe "/CREATE:PARTITION,Data,1,LOGICAL,NotBootable,[ FS1 ]" && goto lvm_create_data_partition_ok
 echo ** error: Creating data partition on disk 1 failed.
 goto lvm_failed
 :lvm_create_data_partition_ok
 
-lvm.exe /CREATE:VOLUME,LVM,D:,Data,1,Data
-if ERRORLEVEL 0 goto lvm_create_data_volume_ok
+lvm.exe /CREATE:VOLUME,LVM,D:,Data,1,Data && goto lvm_create_data_volume_ok
 echo ** error: Creating data volume on disk 1 failed.
 goto lvm_failed
@@ -86 +80 @@
 s:
 
-FORMAT C: /FS:HPFS /V:OS2Boot < S:\VBoxCID\YES.TXT
-if ERRORLEVEL 0 goto format_boot_ok
+FORMAT C: /FS:HPFS /V:OS2Boot < S:\VBoxCID\YES.TXT && goto format_boot_ok
 echo ** error: Formatting C: failed.
 PAUSE
 :format_boot_ok
 
-FORMAT D: /FS:JFS /V:Data < S:\VBoxCID\YES.TXT
-if ERRORLEVEL 0 goto format_data_ok
+FORMAT D: /FS:JFS /V:Data < S:\VBoxCID\YES.TXT && goto format_data_ok
 echo ** error: Formatting D: failed.
 PAUSE
@@ -107 +99 @@
 copy S:\cid\dll\os2\*.*            C:\VBoxCID
 copy S:\os2image\disk_2\inst32.dll C:\VBoxCID
-copy S:\VBoxCID\*.*                C:\VBoxCID
-if ERRORLEVEL 0 goto copy_ok
+copy S:\VBoxCID\*.*                C:\VBoxCID && goto copy_ok
 echo ** error: Copying CID stuff from CDROM to C: failed.
 PAUSE
@@ -121 +112 @@
 cd C:\OS2
 C:\VBoxCID\SEMAINT.EXE /S:S:\os2image /B:C: /L1:C:\VBoxCID\Maint.log /T:C:\OS2
-REM if ERRORLEVEL 0 goto semaint_ok - doesn't return 0 on success?
-REM PAUSE
+REM does not exit with status 0 on success.
+goto semaint_ok
+PAUSE
 :semaint_ok
 REM S:\OS2IMAGE\DISK_2\CMD.EXE
@@ -128 +120 @@
 cd C:\VBoxCID
 C:\VBoxCID\SEINST.EXE /S:S:\os2image /B:C: /L1:C:\VBoxCID\CIDInst.log /R:C:\VBoxCID\OS2.RSP /T:A:\
-if ERRORLEVEL 0 goto seinst_ok
+REM does not exit with status 0 on success.
+goto seinst_ok
 PAUSE
 :seinst_ok
-S:\OS2IMAGE\DISK_2\CMD.EXE
+REM S:\OS2IMAGE\DISK_2\CMD.EXE
 
 :step5
@@ -137 +130 @@
 echo Step 5 - Make C: bootable.
 echo .
-c:
-cd c:\OS2
-SYSINSTX C:
-if ERRORLEVEL 0 goto sysinstx_ok
+C:
+cd C:\OS2
+SYSINSTX C: && goto sysinstx_ok
 pause
 :sysinstx_ok
 
-echo Copying over patched OS2BOOT from A:
-cd c:\
-c:
-attrib -R -H -S OS2BOOT
-copy OS2BOOT OS2BOOT.ORG
-copy a:\OS2BOOT C:\OS2BOOT
-attrib +R +H +S OS2BOOT
+echo Copying over patched OS2LDR from A:
+attrib -R -H -S C:\OS2LDR
+copy C:\OS2LDR C:\OS2LDR.ORG
+del  C:\OS2LDR
+copy A:\OS2LDR C:\OS2LDR && goto copy_os2ldr_ok
+pause
+:copy_os2ldr_ok
+attrib +R +H +S C:\OS2LDR
 
 echo Copying over final startup.cmd
-ren C:\STARTUP.CMD C:\STARTUP.ORG
+if exist C:\STARTUP.CMD ren C:\STARTUP.CMD C:\STARTUP.ORG
 copy S:\VBoxCID\STARTUP.CMD C:\STARTUP.CMD
 
@@ -163 +156 @@
 echo Step 6 - Cleanup
 echo .
-echo ** skipped
+cd C:\
+del /N C:\*.bio
+del /N C:\*.i13
+del /N C:\*.snp
+del /N C:\CONFIG.ADD
+mkdir C:\MMTEMP 2>nul
+del /N C:\MMTEMP\*.*
+for %%i in (acpadd2 azt16dd azt32dd csbsaud es1688dd es1788dd es1868dd es1888dd es688dd jazzdd mvprobdd mvprodd sb16d2 sbawed2 sbd2 sbp2d2 sbpd2) do del /N C:\MMTEMP\OS2\DRIVERS\%%i\*.*
+for %%i in (acpadd2 azt16dd azt32dd csbsaud es1688dd es1788dd es1868dd es1888dd es688dd jazzdd mvprobdd mvprodd sb16d2 sbawed2 sbd2 sbp2d2 sbpd2) do rmdir C:\MMTEMP\OS2\DRIVERS\%%i
+rmdir C:\MMTEMP\OS2\DRIVERS
+rmdir C:\MMTEMP\OS2
+rmdir C:\MMTEMP
+copy C:\CONFIG.SYS C:\VBoxCID && del /N C:\*.SYS
+copy C:\VBoxCID\CONFIG.SYS C:\
 
 :step7
 echo .
-echo Step 7 - Post install actions
+echo Step 7 - Install guest additions.
+echo .
+@@VBOX_COND_IS_INSTALLING_ADDITIONS@@
+mkdir C:\VBoxAdd
+copy S:\VBoxAdditions\OS2\*.*  C:\VBoxAdd && goto ga_copy_ok
+pause
+:ga_copy_ok
+echo TODO: Write script editing Config.sys for GAs
+@@VBOX_COND_ELSE@@
+echo Not requested. Skipping.
+@@VBOX_COND_END@@
+
+:step8
+echo .
+echo Step 8 - Install the test execution service (TXS).
+echo .
+@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@
+mkdir C:\ValKit
+mkdir D:\TestArea
+copy S:\VBoxValidationKit\*.* C:\VBoxValKit && goto valkit_copy_1_ok
+pause
+:valkit_copy_1_ok
+copy S:\VBoxValidationKit\os2\x86\*.* C:\VBoxValKit && goto valkit_copy_2_ok
+pause
+:valkit_copy_2_ok
+@@VBOX_COND_ELSE@@
+echo Not requested. Skipping.
+@@VBOX_COND_END@@
+
+:step9
+@@VBOX_COND_HAS_POST_INSTALL_COMMAND@@
+echo .
+echo Step 9 - Custom actions: "@@VBOX_INSERT_POST_INSTALL_COMMAND@@"
 echo .
 cd C:\VBoxCID
 C:
-
-:step8
-echo .
-echo Step 8 - Done.
+@@VBOX_INSERT_POST_INSTALL_COMMAND@@
+@@VBOX_COND_END@@
+
+
+:done
+echo .
+echo Finally Done.  Now we reboot.
 echo .
 cd C:\OS2

trunk/src/VBox/Main/UnattendedTemplates/os2_response_files.rsp

@@ -18 +18 @@
 BREAK=OFF
 
-LIBPATH=.;A:\;S:\OS2IMAGE\DISK_1;S:\OS2IMAGE\DISK_2;S:\OS2IMAGE\DISK_3;S:\OS2IMAGE\DISK_4;S:\OS2IMAGE\DISK_5;S:\OS2IMAGE\DISK_6;S:\OS2IMAGE\DISK_7
-SET PATH=.;S:\OS2IMAGE\DISK_1;S:\OS2IMAGE\DISK_2;S:\OS2IMAGE\DISK_3;S:\OS2IMAGE\DISK_4;S:\OS2IMAGE\DISK_5;S:\OS2IMAGE\DISK_6;S:\OS2IMAGE\DISK_7
-SET DPATH=.;A:\;
+REM Just to be on the safe side, all paths include disk #1 thru #6, omitting #0
+REM as it doesn't contain much interesting.
+LIBPATH=.;A:\;S:\OS2IMAGE\DISK_1;S:\OS2IMAGE\DISK_2;S:\OS2IMAGE\DISK_3;S:\OS2IMAGE\DISK_4;S:\OS2IMAGE\DISK_5;S:\OS2IMAGE\DISK_6;S:\OS2IMAGE\DISK_7;
+SET PATH=.;S:\OS2IMAGE\DISK_1;S:\OS2IMAGE\DISK_2;S:\OS2IMAGE\DISK_3;S:\OS2IMAGE\DISK_4;S:\OS2IMAGE\DISK_5;S:\OS2IMAGE\DISK_6;S:\OS2IMAGE\DISK_7;
+SET DPATH=.;A:\;S:\OS2IMAGE\DISK_1;S:\OS2IMAGE\DISK_2;S:\OS2IMAGE\DISK_3;S:\OS2IMAGE\DISK_4;S:\OS2IMAGE\DISK_5;S:\OS2IMAGE\DISK_6;S:\OS2IMAGE\DISK_7;
 
 COUNTRY=001,COUNT437.SYS
@@ -47 +49 @@
 REM PROTSHELL=S:\OS2IMAGE\DISK_2\CMD.EXE
 REM Run the os2_cid_install.cmd file (renamed to VBOXCID.CMD on the ISO).
-PROTSHELL=S:\OS2IMAGE\DISK_2\CMD.EXE /C S:\VBOXCID\VBOXCID.CMD
+PROTSHELL=S:\OS2IMAGE\DISK_2\CMD.EXE /C S:\VBOXCID.CMD
 
 @@VBOX_SPLITTER_END[CONFIG.SYS]@@
@@ -63 +65 @@
 @@VBOX_SPLITTER_START[STARTUP.CMD]@@
 REM The startup file for C: for use after the successful install.
+@@VBOX_COND_IS_INSTALLING_ADDITIONS@@
+C:\VBoxAdd\VBoxService.exe
+@@VBOX_COND_END@@
 dhcpstrt -i lan0
+@@VBOX_COND_IS_INSTALLING_TEST_EXEC_SERVICE@@
+C:\VBoxValKit\TestExecService.exe --scratch=D:\TestArea --cdrom=E:\ --foreground
+pause
+@@VBOX_COND_END@@
+
 @@VBOX_SPLITTER_END[STARTUP.CMD]@@