Revision | 192 (tree) |
---|---|
Time | 2021-01-16 18:44:03 |
Author | ![]() |
install relies on install.lst for package-to-install list + boot floppy image is created from scratch now during build process
@@ -1,45 +0,0 @@ | ||
1 | -# | |
2 | -# This is a localization file for the Svarog386 INSTALL program | |
3 | -# | |
4 | -# Language..: Turkish | |
5 | -# Translator: anonymous | |
6 | -# | |
7 | - | |
8 | -### COMMON STUFF: TITLE BAR AND MULTIPLE CHOICE STRINGS ### | |
9 | -0.0:SVAROG386 KURULUMU | |
10 | -0.1:Svarog386'y kur | |
11 | -0.2:DOS'a k | |
12 | -0.3:Disk blmn otomatik olarak olutur | |
13 | -0.4:FDISK disk blm oluturma aracn altr | |
14 | -0.5:Herhangi bir tua basn... | |
15 | -0.6:Biimlendirmeye bala | |
16 | -# Every string below must be at most 78 characters long! (used in status bar) | |
17 | -0.10:Yukar/Aa§ = Unsur se | Enter = Seimi do§rula | ESC = nceki ekran | |
18 | -0.11:Yukar/Aa§ = Unsur se | Enter = Seimi do§rula | ESC = Dos'a k | |
19 | - | |
20 | -### LANGUAGE SELECTION & KEYBOARD LAYOUT SCREENS ### | |
21 | -1.0:Svarog386'ya ho geldiniz | |
22 | -1.1:Dilinizi aa§daki listeden seiniz: | |
23 | -1.5:Svarog386 de§iik lkelerde kullanlan klavye dzenlerini destekler. stedi§iniz klavye dzenini seiniz. | |
24 | - | |
25 | -### WELCOME SCREEN ### | |
26 | -2.0:FreeDOS ekirde§ine dayal, cretsiz ve MS-DOS uyumlu bir iletim sistemi olan Svarog386'y kurmak zeresiniz. Svarog386, 386+ bilgisayarlar hedefler ve eitli nc parti uygulamalar sunar.\n\nKAZ: E§er PC'nizde baka bir iletim sistemi kuruluysa, bu sistem Svarog386 kurulduktan sonra balamayabilir. | |
27 | - | |
28 | -### DISK SETUP ### | |
29 | -3.0:HATA: %c: srcs bulunamad. Belki sabit diskinizde nce blm oluturmanz gerekmektedir. Ltfen sabit diskinizde en az bir blm oluturun ki Svarog386 o blme kurulabilsin. Svarog386'nn en az %d MiB disk alanna ihtiya duydu§unu unutmayn.\n\nGerekli blm elle oluturmak iin FDISK blm oluturma aracn kullanabilir ya da kurulumun diskinizde otomatik olarak blm oluturmasna izin verebilirsiniz. Baka bir blm yneticisi kullanmak iin kurulumu iptal de edebilirsiniz. | |
30 | -3.1:Bilgisayarnz imdi yeniden balayacaktr. | |
31 | -3.2:HATA: %c: srcs karlabilir bir cihazdr. Kurulum iptal edilmitir. | |
32 | -3.3:HATA: %c: biimlendirilmemi gzkmektedir. Biimlendirmek ister misiniz? | |
33 | -3.4:HATA: %c: srcs yeteri kadar byk de§ildir! Svarog386 en az %d MiB boyutunda bir diske ihtiya duyar. | |
34 | -3.5:HATA: %c: srcs bo de§ildir. Svarog386, bo bir diske kurulmaldr.\n\nDiski boaltmak iin imdi biimlendirebilirsiniz. Bununla beraber, bunun diskinizdeki TM GNCEL VERLER SLECE¦N unutmaynz. | |
35 | -3.6:Svarog386'nn %c: srcsne kurulumu balamak zeredir. | |
36 | - | |
37 | -### PACKAGES INSTALLATION ### | |
38 | -# example: "Installing package 4/50: FDISK" | |
39 | -4.0:u paket kuruluyor: %d/%d: %s | |
40 | - | |
41 | -### END SCREEN ### | |
42 | -5.0:Svarog386 kurulumu sona ermitir. Bilgisayarnz imdi yeniden balayacaktr.\nLtfen kurulum diskini srcnzden karn. | |
43 | - | |
44 | -### LOG IN WELCOME TEXT ONCE SYSTEM IS INSTALLED ### | |
45 | -6.0:Svarog386'ya ho geldiniz! Yardma ihtiyacnz varsa 'HELP' yaznz. |
@@ -1,45 +0,0 @@ | ||
1 | -# | |
2 | -# This is a localization file for the Svarog386 INSTALL program | |
3 | -# | |
4 | -# Language..: Polish | |
5 | -# Translator: Mateusz Viste | |
6 | -# | |
7 | - | |
8 | -### COMMON STUFF: TITLE BAR AND MULTIPLE CHOICE STRINGS ### | |
9 | -0.0:INSTALACJA SVAROG386 | |
10 | -0.1:Instaluj Svarog386 | |
11 | -0.2:Wyjd¦ do DOS | |
12 | -0.3:Stw¢rz partycj automatycznie | |
13 | -0.4:Uruchom narzdzie partycjonowania FDISK | |
14 | -0.5:Nacinij dowolny klawisz... | |
15 | -0.6:Formatuj | |
16 | -# Every string below must be at most 78 characters long! (used in status bar) | |
17 | -0.10:G¢ra/D¢ = Wyb¢r pozycji | Enter = Zatwierd¦ wyb¢r | ESC = Poprzedni ekran | |
18 | -0.11:G¢ra/D¢ = Wyb¢r pozycji | Enter = Zatwierd¦ wyb¢r | ESC = Wyjd¦ do DOS | |
19 | - | |
20 | -### LANGUAGE SELECTION & KEYBOARD LAYOUT SCREENS ### | |
21 | -1.0:Witaj w systemie Svarog386 | |
22 | -1.1:Wybierz sw¢j jzyk z poni§szej listy: | |
23 | -1.5:Svarog386 wspiera ukady klawiatur wspierane w r¢§nych krajach. Wybierz ukad klawiatury kt¢ry ci odpowiada. | |
24 | - | |
25 | -### WELCOME SCREEN ### | |
26 | -2.0:Za chwil rozpocznie si instalacja systemu Svarog386: bezpatnego systemu operacyjnego opartego na jdrze FreeDOS, i kompatybilnego z MSDOS. Svarog386 jest przeznaczony dla komputer¢w klasy 386 wzwy§, i zawiera mn¢stwo aplikacji dodatkowych.\n\nUWAGA: Jeli tw¢j komputer posiada ju§ inny system operacyjny, system ten mo§e nie zdoa uruchomi si po instalacji Svarog386. | |
27 | - | |
28 | -### DISK SETUP ### | |
29 | -3.0:BD: Nie wykryto dysku %c:. By mo§e tw¢j dysk powinien zosta najpierw spartycjonowany. Utw¢rz co najmniej jedn partycj na twoim dysku, aby Svarog386 m¢g zosta na ni zainstalowany. Svarog386 wymaga co najmniej %d MiB miejsca.\n\nMo§esz skorzysta z narzdzia FDISK aby stworzy wymagan partycj rcznie, lub pozwoli instalatorowi stworzy j automatycznie. Mo§esz tak§e wstrzyma instalacj aby u§y jakiegokolwiek innego narzdzia do partycjonowania. | |
30 | -3.1:Tw¢j komputer zostanie teraz uruchomiony ponownie. | |
31 | -3.2:BD: Dysk %c: jest nonikiem wymiennym. Instalacja zatrzymana. | |
32 | -3.3:BD: Dysk %c: zdaje si nie by sformatowany. Czy chcesz go sformatowa? | |
33 | -3.4:BD: Dysk %c: jest za may! Svarog386 wymaga co najmniej %d MiB miejsca. | |
34 | -3.5:BD: Dysk %c: nie jest pusty. Svarog386 mo§e by zainstalowany wycznie na pustym dysku.\n\nMo§esz sformatowa dysk teraz, aby go opr¢§ni. Operacja ta sprawi jednak §e WSZYSTKIE OBECNE DANE ZOSTAN UTRACONE. | |
35 | -3.6:Za chwil rozpocznie si instalacja systemu Svarog386 na dysk %c:. | |
36 | - | |
37 | -### PACKAGES INSTALLATION ### | |
38 | -# example: "Installing package 4/50: FDISK" | |
39 | -4.0:Instalacja pakietu %d/%d: %s | |
40 | - | |
41 | -### END SCREEN ### | |
42 | -5.0:Instalacja Svarog386 zostaa zako¤czona. Tw¢j komputer zostanie teraz uruchomiony ponownie.\nWyjmij dysk instalacyjny z napdu. | |
43 | - | |
44 | -### LOG IN WELCOME TEXT ONCE SYSTEM IS INSTALLED ### | |
45 | -6.0:Witaj w systemie Svarog386! Wpisz 'HELP' jeli potrzebujesz pomocy. |
@@ -1,7 +1,6 @@ | ||
1 | 1 | @ECHO OFF |
2 | 2 | PATH A:\ |
3 | -SET NLSPATH=A:\NLS | |
4 | -SET TEMP=C:\TEMP | |
3 | +SET NLSPATH=A:\ | |
5 | 4 | PROMPT $P$G |
6 | 5 | SET DIRCMD=/P /OGNE /4 |
7 | 6 | SET FDNPKG.CFG=A:\FDNPKG.CFG |
@@ -24,8 +23,12 @@ | ||
24 | 23 | REM enable the CD only if driver succeeded |
25 | 24 | IF EXIST SVCD0001 SHSUCDX /D:SVCD0001 /Q |
26 | 25 | |
27 | -A:\FDAPM APMDOS | |
26 | +FDAPM APMDOS | |
27 | + | |
28 | 28 | ECHO. |
29 | -ECHO *** Welcome to Svarog386 *** | |
29 | +ECHO ************************** | |
30 | +ECHO *** Welcome to SvarDOS *** | |
31 | +ECHO ************************** | |
30 | 32 | ECHO. |
33 | + | |
31 | 34 | INSTALL |
@@ -0,0 +1,232 @@ | ||
1 | +; Initialization file for Free FDISK | |
2 | +; | |
3 | +; This file sets various options for Free FDISK as described below. | |
4 | +; | |
5 | +; | |
6 | +; Note: This file is optional. If this file is not found the default | |
7 | +; settings will be utilized. Blank lines are not allowed | |
8 | +; in this file. | |
9 | +; | |
10 | +; Syntax: | |
11 | +; | |
12 | +; ALLOW_4GB_FAT16={TRUE | FALSE} | |
13 | +; ALLOW_ABORT={TRUE | FALSE} | |
14 | +; AMBR={ON | OFF} | |
15 | +; CHECKEXTRA={TRUE | FALSE} | |
16 | +; COLORS={0<=N<=127} | |
17 | +; D_ALL={ON | OFF} | |
18 | +; D_CMD_ARG={ON | OFF} | |
19 | +; D_CR_PART={ON | OFF} | |
20 | +; D_DET_FR_SPC={ON | OFF} | |
21 | +; D_INPUT={ON | OFF} | |
22 | +; D_PATH={ON | OFF} | |
23 | +; D_READ_S={ON | OFF} | |
24 | +; DEL_ND_LOG={ON | OFF} | |
25 | +; DRIVE=#-####-###-## | |
26 | +; EMULATE_DISK={OFF | 1<=N<=8} | |
27 | +; FLAG_SECTOR={0 | 2<=N<=64 | 256} | |
28 | +; LABEL={ON | OFF} | |
29 | +; MONO={ON | OFF} | |
30 | +; REBOOT={ON | OFF} | |
31 | +; SET_ANY_ACT={TRUE | FALSE} | |
32 | +; VERSION={4 | 5 | 6 | FD | W95 | W95B | W98} | |
33 | +; WRITE={ON | OFF} | |
34 | +; XO={ON | OFF} | |
35 | +; | |
36 | +; Note: The "=" sign in the above syntax is optional. | |
37 | +; | |
38 | +; Description: | |
39 | +; | |
40 | +; ALLOW_4GB_FAT16 | |
41 | +; TRUE Permits the creation of 4GB, FAT16, partitions. | |
42 | +; * FALSE Limits the maximum FAT16 partition size to 2GB. | |
43 | +; | |
44 | +; ALLOW_ABORT | |
45 | +; TRUE Allows the user to abort Free FDISK without making | |
46 | +; any changes to the hard disks(s). | |
47 | +; * FALSE Normal operation. | |
48 | +; | |
49 | +; AMBR ON Writes an alternate boot loader from the file "boot.mbr." | |
50 | +; See the documentation for more details. | |
51 | +; * OFF Writes BootEasy as the boot loader. | |
52 | +; | |
53 | +; CHECKEXTRA Checks for an extra, unreported, cylinder of space near | |
54 | +; the end of all hard drives. | |
55 | +; * TRUE | |
56 | +; FALSE | |
57 | +; | |
58 | +; COLORS Changes the screen colors. | |
59 | +; * 7 Light Grey on Black | |
60 | +; 0 TO 127 | |
61 | +; | |
62 | +; D_ALL ON Show all debugging information for functions that have | |
63 | +; built-in debugging capability. | |
64 | +; * OFF All debugging information, for functions with built-in | |
65 | +; debugging capabilities, is not displayed. Individual | |
66 | +; functions may display debugging information as | |
67 | +; described elsewhere in this file. | |
68 | +; D_CMD_ARG | |
69 | +; ON Displays the remaining command line arguments as they | |
70 | +; are processed. | |
71 | +; * OFF | |
72 | +; | |
73 | +; D_CR_PART Shows debugging information for the function that | |
74 | +; creates partitions. | |
75 | +; ON | |
76 | +; * OFF | |
77 | +; | |
78 | +; D_DET_FR_SPC Shows debugging information for the function that | |
79 | +; determines the amount of free space available. | |
80 | +; ON | |
81 | +; * OFF | |
82 | +; | |
83 | +; D_INPUT Shows debugging information for the function that | |
84 | +; obtains user input. | |
85 | +; ON | |
86 | +; * OFF | |
87 | +; | |
88 | +; D_PATH ON Displays the path to Free FDISK. | |
89 | +; * OFF Opposite of the above. | |
90 | +; | |
91 | +; D_READ_S ON Displays the result of a call to void Read_Physical_Sector() | |
92 | +; * OFF | |
93 | +; | |
94 | +; DEL_ND_LOG Allows non-dos logical drives to be deleted. | |
95 | +; TRUE | |
96 | +; * FALSE | |
97 | +; | |
98 | +; EMULATE_DISK Emulates the existance of a 6.2 GB hard disk at the | |
99 | +; specified physical location. The hard disk emulated | |
100 | +; has 784 cylinders, 255 heads, and 63 sectors. If | |
101 | +; EMULATE_DISK is not set to off fdisk will automatically | |
102 | +; enter its read only mode. | |
103 | +; * OFF | |
104 | +; 1 TO 8 | |
105 | +; | |
106 | +; FLAG_SECTOR Sector number where the flags will be located. The | |
107 | +; default is 2. | |
108 | +; 0 Disables sector flagging function. | |
109 | +; 2 - 64 Flag sector. | |
110 | +; 256 Set the flag sector to the last sector in the first | |
111 | +; cylinder of the first hard disk. | |
112 | +; | |
113 | +; LABEL ON Displays "Free FDISK" along the right hand side of the | |
114 | +; screen to help avoid confusion between this program | |
115 | +; and "other" FDISK programs. | |
116 | +; * OFF No "Free FDISK" label is displayed along the right | |
117 | +; hand side of the screen. | |
118 | +; | |
119 | +; MONO ON The menus will be displayed without boldfacing the text | |
120 | +; for users of monochrome systems. | |
121 | +; * OFF The menus have boldfaced text. | |
122 | +; | |
123 | +; | |
124 | +; REBOOT ON Free FDISK will reboot the system upon exiting the | |
125 | +; program if changes were made to any partition table. | |
126 | +; * OFF Free FDISK will not, under any circumstances, reboot | |
127 | +; the system. | |
128 | +; | |
129 | +; SET_ANY_ACT If set to true, will allow the user to set any primary | |
130 | +; partition active. Otherwise, it will only set DOS | |
131 | +; partition types active. | |
132 | +; * TRUE | |
133 | +; FALSE | |
134 | +; | |
135 | +; VERSION Version number that Free FDISK will emulate while the | |
136 | +; user is using the interactive setup. | |
137 | +; 4 Emulates the MS-FDISK that came with MS-DOS 4.xx. | |
138 | +; 5 Emulates the MS-FDISK that came with MS-DOS 5.xx. | |
139 | +; 6 Emulates the MS-FDISK that came with MS-DOS 6.xx. | |
140 | +; W95 Adds support for LBA hard disks. | |
141 | +; W95B Same as W95, with the addition of FAT32 support. | |
142 | +; * W98 Same as W95B | |
143 | +; FD Setting for FreeDOS. Currently is the same as W95 | |
144 | +; with ALLOW_4GB_FAT16 set to TRUE. | |
145 | +; | |
146 | +; WRITE * ON Changes will be written the the hard disk(s). | |
147 | +; OFF Changes will not be written to the hard disk(s) and | |
148 | +; a debugging screen will be displayed. | |
149 | +; | |
150 | +; XO ON Extended options will become available in the menus. | |
151 | +; * OFF Extended options will not be available in the menus. | |
152 | +; | |
153 | +; * Designates default settings if the fdisk.ini file does not | |
154 | +; exist or the statement is absent from the fdisk.ini file. | |
155 | +; | |
156 | +; | |
157 | +; To override the autodetection of a hard disk with your own drive geometry: | |
158 | +; (This function could be used if your BIOS does not correctly detect | |
159 | +; the geometry of your hard disk.) | |
160 | +; | |
161 | +; Add the "DRIVE" statement with the syntax of: DRIVE A-BBBB-CCC-DD | |
162 | +; | |
163 | +; Where: A Represents the drive number | |
164 | +; B Represents the number of cylinders | |
165 | +; C Represents the number of heads | |
166 | +; D Represents the number of sectors | |
167 | +; i.e. DRIVE 3-0620-063-64 -> Sets drive 3 to 620 cylinders, | |
168 | +; 63 heads, and 64 sectors. | |
169 | +; NOTE: All fields specified in the DRIVE statement MUST be the EXACT | |
170 | +; number of characters as indicated above. | |
171 | +; | |
172 | +; WARNING: If the drive that you are forcing geometry values for | |
173 | +; does not exist or the values you enter are greater than | |
174 | +; what is supported by the hard disk, unpredictable problems | |
175 | +; will occur. | |
176 | +; | |
177 | +; Always proceed informational lines with a ";" so that Free FDISK ignores | |
178 | +; that line. | |
179 | +; | |
180 | +; The items and settings below can be separated by equal signs "=" or spaces. | |
181 | +; | |
182 | +; Current settings: | |
183 | +; | |
184 | + ALLOW_4GB_FAT16 FALSE | |
185 | + ALLOW_ABORT FALSE | |
186 | + AMBR OFF | |
187 | + CHECKEXTRA FALSE | |
188 | + COLORS 7 | |
189 | + DEL_ND_LOG TRUE | |
190 | + FLAG_SECTOR 2 | |
191 | + LABEL OFF | |
192 | + MONO FALSE | |
193 | + REBOOT OFF | |
194 | + SET_ANY_ACT FALSE | |
195 | + VERSION W98 | |
196 | + XO OFF | |
197 | +; | |
198 | +; Hard Disk Detection Overrides: | |
199 | +; (Replace the "#"s with the correct C/H/S values and remove the ";" | |
200 | +; from the beginning of the line to enable an override.) | |
201 | +; | |
202 | +; DRIVE 1-####-###-## | |
203 | +; DRIVE 2-####-###-## | |
204 | +; DRIVE 3-####-###-## | |
205 | +; DRIVE 4-####-###-## | |
206 | +; DRIVE 5-####-###-## | |
207 | +; DRIVE 6-####-###-## | |
208 | +; DRIVE 7-####-###-## | |
209 | +; DRIVE 8-####-###-## | |
210 | +; | |
211 | +; | |
212 | +; Uncomment the debugging settings, below, if debugging is compiled in. | |
213 | +; | |
214 | +; Debugging settings: | |
215 | +; | |
216 | +; D_ALL OFF | |
217 | +; D_CMD_ARG OFF | |
218 | +; D_CR_PART OFF | |
219 | +; D_DET_FR_SPC OFF | |
220 | +; D_INPUT OFF | |
221 | +; D_LBA OFF | |
222 | +; D_PATH OFF | |
223 | +; D_READ_S OFF | |
224 | +; EMULATE_DISK OFF | |
225 | +; | |
226 | +; WRITE ON | |
227 | +; | |
228 | +; | |
229 | +; End of file marker follows, do not remove it. | |
230 | +999 | |
231 | + | |
232 | + |
@@ -0,0 +1,280 @@ | ||
1 | +; FDISKPT.INI | |
2 | +; Partition Information File for Free FDISK | |
3 | +; | |
4 | +; | |
5 | +; | |
6 | +; | |
7 | +; Syntax: | |
8 | +; | |
9 | +; xxx,aaaaaaaa,bbbbbbbbbbbbbb,ccccccccccccccccccccccccccccccccccccccccccccccccc; | |
10 | +; | |
11 | +; Where: x=decimal number of the partition type stored in the partition table | |
12 | +; a=short description of partition type (must contain 8 characters) | |
13 | +; b=long description of partition type (must contain 15 characters) | |
14 | +; c=ignored (currently used for comments) | |
15 | +; | |
16 | +; Always proceed informational lines with a ";" so that Free FDISK ignores | |
17 | +; that line. | |
18 | +; | |
19 | +; Note: Blank lines are not allowed in this file. | |
20 | +; | |
21 | +; Partition Information: | |
22 | +000,Unused ,Unused ,Unused ; | |
23 | +001,FAT12 ,FAT12 ,Primary DOS Partition (FAT-12); | |
24 | +002,XENIX r ,Xenix root fs ,Xenix root file system ; | |
25 | +003,XENIX u ,Xenix /usr ,Xenix /usr file system (obsolete) ; | |
26 | +004,FAT16 ,FAT16 ,Primary DOS Partition (FAT-16); | |
27 | +005,Extended,Extended ,Extended Partition ; | |
28 | +006,FAT16 ,FAT16 ,Primary DOS Partition (FAT-16); | |
29 | +007,NTFS ,NTFS ,OS/2 HPFS/WinNT NTFS ; | |
30 | +008,AIX OS/2,AIX or OS/2 ,AIX or OS/2 v1.0-1.3 ; | |
31 | +009,AIX boot,AIX boot/Coher.,AIX bootable or Coherent filesystem ; | |
32 | +010,OS/2 BM ,OS/2 Boot Man. ,OS/2 Boot Manager ; | |
33 | +011,FAT32 ,FAT32 ,Primary DOS Partition (FAT-32); | |
34 | +012,FAT32 L ,FAT32 (LBA),Primary DOS Partition (LBA FAT-32); | |
35 | +013,Unknown ,Unknown ,Unknown ; | |
36 | +014,FAT16 L ,FAT16 (LBA),Primary DOS Partition (LBA FAT-16); | |
37 | +015,Ext. LBA,Extended (LBA),Extended Partition (LBA); | |
38 | +016,OPUS ,OPUS ,OPUS ; | |
39 | +017,HIDDEN12,Hidden FAT12 ,Hidden FAT12 ; | |
40 | +018,C. Diag.,Compaq Diag. ,Compaq Diagnostic Partition ; | |
41 | +019,Unknown ,Unknown ,Unknown ; | |
42 | +020,HIDDEN16,Hidden FAT16 ,Hidden FAT16 <32M 16-bit FAT ; | |
43 | +021,Unknown ,Unknown ,Unknown ; | |
44 | +022,HIDDEN16,Hidden FAT16 ,Hidden FAT16 >32M 16-bit FAT ; | |
45 | +023,HPFSHIDD,Hidden HPFS ,Hidden HPFS ; | |
46 | +024,AST W SW,AST Win swap ,AST special Windows swap file ; | |
47 | +025,Willow P,Willowtech PcoS,Willowtech Photon coS ; | |
48 | +026,Unknown ,Unknown ,Unknown ; | |
49 | +027,HIDDEN32,Hidden FAT32 ,Hidden FAT32 ; | |
50 | +028,HIDDEN32,Hidden FAT32 ,Hidden FAT32 (LBA) ; | |
51 | +029,Unknown ,Unknown ,Unknown ; | |
52 | +030,HIDDEN16,Hidden FAT16LBA,Hidden FAT16 (LBA) ; | |
53 | +031,Unknown ,Unknown ,Unknown ; | |
54 | +032,Willow O,Willowsoft O FS,Willowsoft Overture File System (OFS1) ; | |
55 | +033,Oxygen ,Oxygen ,Oxygen file system FSo2 ; | |
56 | +034,Oxygen E,Oxygen Extended,Oxygen extended partition table ; | |
57 | +035,Reserved,Reserved ,Reserved ; | |
58 | +036,NECMSDOS,NEC MS-DOS 3.X ,NEC MS-DOS 3.x ; | |
59 | +037,Unknown ,Unknown ,Unknown ; | |
60 | +038,Unknown ,Unknown ,Unknown ; | |
61 | +039,Unknown ,Unknown ,Unknown ; | |
62 | +040,Unknown ,Unknown ,Unknown ; | |
63 | +041,Unknown ,Unknown ,Unknown ; | |
64 | +042,Unknown ,Unknown ,Unknown ; | |
65 | +043,Unknown ,Unknown ,Unknown ; | |
66 | +044,Unknown ,Unknown ,Unknown ; | |
67 | +045,Unknown ,Unknown ,Unknown ; | |
68 | +046,Unknown ,Unknown ,Unknown ; | |
69 | +047,Unknown ,Unknown ,Unknown ; | |
70 | +048,Unknown ,Unknown ,Unknown ; | |
71 | +049,Reserved,Reserved ,Reserved ; | |
72 | +050,AlienNOS,Alien NOS ,Alien Internet Services' NOS ; | |
73 | +051,Reserved,Reserved ,Reserved ; | |
74 | +052,Reserved,Reserved ,Reserved ; | |
75 | +053,OS2 JFS ,OS/2 JFS ,OS/2 AIX Journaling Filesystem ; | |
76 | +054,Reserved,Reserved ,Reserved ; | |
77 | +055,Unknown ,Unknown ,Unknown ; | |
78 | +056,Theos ,Theos ,Theos ; | |
79 | +057,Plan 9 ,Plan 9 ,Plan 9 ; | |
80 | +058,Theos ,Theos ,Theos ; | |
81 | +059,Theos ,Theos ,Theos ; | |
82 | +060,PQMrecov,PQ Magic recov.,PowerQuest PartitionMagic recovery partition ; | |
83 | +061,NetwareH,Hidden Netware ,Hidden Netware ; | |
84 | +062,Unknown ,Unknown ,Unknown ; | |
85 | +063,Unknown ,Unknown ,Unknown ; | |
86 | +064,VENIX286,VENIX 80286 ,VENIX 80286 ; | |
87 | +065,P.RISC B,Personal RISC B,Personal RISC Boot ; | |
88 | +066,SFS P.G.,SFS by P. G. ,SFS by Peter Gutmann ; | |
89 | +067,PTS-DOS ,PTS-DOS 6.70 ,PTS-DOS 6.70 & BootWizard: DR-DOS ; | |
90 | +068,GoBack ,GoBack ,GoBack ; | |
91 | +069,EUMEL/El,EUMEL/Elan ,EUMEL/Elan ; | |
92 | +070,EUMEL/El,EUMEL/Elan ,EUMEL/Elan ; | |
93 | +071,EUMEL/El,EUMEL/Elan ,EUMEL/Elan ; | |
94 | +072,EUMEL/El,EUMEL/Elan ,EUMEL/Elan ; | |
95 | +073,Unknown ,Unknown ,Unknown ; | |
96 | +074,AdaOS Aq,AdaOS Aquila ,AdaOS Aquila ; | |
97 | +075,Unknown ,Unknown ,Unknown ; | |
98 | +076,Oberon ,Oberon ,Oberon ; | |
99 | +077,QNX 4.0 ,First QNX 4.0 ,First QNX 4.0 Partition ; | |
100 | +078,QNX 4.0 ,Second QNX 4.0 ,Second QNX 4.0 Partition ; | |
101 | +079,QNX 4.0 ,Third QNX 4.0 ,Third QNX 4.0 Partition ; | |
102 | +080,OnTrackR,OnTrack DM (RO),OnTrack Disk Manager (RO) ; | |
103 | +081,NOVEL ,NOVEL ,NOVEL ; | |
104 | +082,CP/M ,CP/M ,CP/M ; | |
105 | +083,OnTrackW,OnTrack DM (WO),OnTrack Disk Manager (WO?) ; | |
106 | +084,OnTrackD,OnTrack DM (DD),OnTrack Disk Manager (DDO) ; | |
107 | +085,EZ Drive,EZ Drive ,EZ Drive ; | |
108 | +086,G Bow VF,GoldenBow VF ,GoldenBow VFeature ; | |
109 | +087,Unknown ,Unknown ,Unknown -- ; | |
110 | +088,Unknown ,Unknown ,Unknown ; | |
111 | +089,Unknown ,Unknown ,Unknown ; | |
112 | +090,Unknown ,Unknown ,Unknown ; | |
113 | +091,Unknown ,Unknown ,Unknown ; | |
114 | +092,PriEdisk,Priam Edisk ,Priam Edisk ; | |
115 | +093,Unknown ,Unknown ,Unknown ; | |
116 | +094,Unknown ,Unknown ,Unknown ; | |
117 | +095,Unknown ,Unknown ,Unknown ; | |
118 | +096,Unknown ,Unknown ,Unknown ; | |
119 | +097,SpdStor ,SpeedStor ,SpeedStor ; | |
120 | +098,Unknown ,Unknown ,Unknown ; | |
121 | +099,U/M/H ,Sys V/Mach/HURD,Unix System V, Mach, GNU HURD ; | |
122 | +100,Nvll 286,Novell NW 286 ,Novell NetWare 286 ; | |
123 | +101,Nvll 311,Novell NW(3.11),Novell NetWare (3.11) ; | |
124 | +102,Unknown ,Unknown ,Unknown ; | |
125 | +103,Novell ,Novell ,Novell ; | |
126 | +104,Novell ,Novell ,Novell ; | |
127 | +105,Novell ,Novell ,Novell ; | |
128 | +106,Unknown ,Unknown ,Unknown ; | |
129 | +107,Unknown ,Unknown ,Unknown ; | |
130 | +108,Unknown ,Unknown ,Unknown ; | |
131 | +109,Unknown ,Unknown ,Unknown ; | |
132 | +110,Unknown ,Unknown ,Unknown ; | |
133 | +111,Unknown ,Unknown ,Unknown ; | |
134 | +112,DskSecur,DS Multi-Boot ,DiskSecure Multi-Boot ; | |
135 | +113,Unknown ,Unknown ,Unknown ; | |
136 | +114,Unknown ,Unknown ,Unknown ; | |
137 | +115,Reserved,Reserved ,Reserved ; | |
138 | +116,Reserved,Reserved ,Reserved ; | |
139 | +117,PC/IX ,PC/IX ,PC/IX ; | |
140 | +118,Reserved,Reserved ,Reserved ; | |
141 | +119,Unknown ,Unknown ,Unknown ; | |
142 | +120,Unknown ,Unknown ,Unknown ; | |
143 | +121,Unknown ,Unknown ,Unknown ; | |
144 | +122,Unknown ,Unknown ,Unknown ; | |
145 | +123,Unknown ,Unknown ,Unknown ; | |
146 | +124,Unknown ,Unknown ,Unknown ; | |
147 | +125,Unknown ,Unknown ,Unknown ; | |
148 | +126,Unknown ,Unknown ,Unknown ; | |
149 | +127,Unknown ,Unknown ,Unknown ; | |
150 | +128,Minix ,Minix v1.1-1.4a,Minix v1.1 - 1.4a ; | |
151 | +129,M/Linux ,Linux/Minix ,Linux 1.x/Minix v1.4b+ ; | |
152 | +130,Linux S ,Linux swap ,Linux swap ; | |
153 | +131,Linux N ,Linux native ,Linux native (ext2fs/xiafs) ; | |
154 | +132,HIDDENC:,Hidden C: ,OS/2 Hidden C: ; | |
155 | +133,Linux E ,Linux extended ,Linux extended ; | |
156 | +134,FAT16NTS,FAT16 vol/strp ,FAT16 volume/stripe set (Windows NT) ; | |
157 | +135,NTFS ,WinNT HPFS/NTFS,WinNT HPFS or NTFS ; | |
158 | +136,Unknown ,Unknown ,Unknown ; | |
159 | +137,Unknown ,Unknown ,Unknown ; | |
160 | +138,Unknown ,Unknown ,Unknown ; | |
161 | +139,Unknown ,Unknown ,Unknown ; | |
162 | +140,Unknown ,Unknown ,Unknown ; | |
163 | +141,Unknown ,Unknown ,Unknown ; | |
164 | +142,Unknown ,Unknown ,Unknown ; | |
165 | +143,Unknown ,Unknown ,Unknown ; | |
166 | +144,Unknown ,Unknown ,Unknown ; | |
167 | +145,Unknown ,Unknown ,Unknown ; | |
168 | +146,Unknown ,Unknown ,Unknown ; | |
169 | +147,Amoeba ,Amoeba file sys,Amoeba file system ; | |
170 | +148,Amoeba B,Amoeba BBT ,Amoeba bad block table ; | |
171 | +149,Unknown ,Unknown ,Unknown ; | |
172 | +150,Unknown ,Unknown ,Unknown ; | |
173 | +151,Unknown ,Unknown ,Unknown ; | |
174 | +152,Unknown ,Unknown ,Unknown ; | |
175 | +153,Unknown ,Unknown ,Unknown ; | |
176 | +154,Unknown ,Unknown ,Unknown ; | |
177 | +155,Unknown ,Unknown ,Unknown ; | |
178 | +156,Unknown ,Unknown ,Unknown ; | |
179 | +157,Unknown ,Unknown ,Unknown ; | |
180 | +158,Unknown ,Unknown ,Unknown ; | |
181 | +159,Unknown ,Unknown ,Unknown ; | |
182 | +160,PhoenixP,Phoenix NB PM ,Phoenix NoteBIOS Power Management "Save-to-Disk"; | |
183 | +161,Reserved,Reserved ,Reserved ; | |
184 | +162,Unknown ,Unknown ,Unknown ; | |
185 | +163,Reserved,Reserved ,Reserved ; | |
186 | +164,Reserved,Reserved ,Reserved ; | |
187 | +165,BSD Var.,BSD Variant ,BSD Variant ; | |
188 | +166,OpenBSD ,OpenBSD ,OpenBSD ; | |
189 | +167,NeXTStep,NeXTStep ,NeXTStep ; | |
190 | +168,Unknown ,Unknown ,Unknown ; | |
191 | +169,Unknown ,Unknown ,Unknown ; | |
192 | +170,Unknown ,Unknown ,Unknown ; | |
193 | +171,DarwBoot,Apple Boot ,Apple Darwin boot ; | |
194 | +172,Unknown ,Unknown ,Unknown ; | |
195 | +173,Unknown ,Unknown ,Unknown ; | |
196 | +174,Unknown ,Unknown ,Unknown ; | |
197 | +175,Unknown ,Unknown ,Unknown ; | |
198 | +176,Unknown ,Unknown ,Unknown ; | |
199 | +177,Unknown ,Unknown ,Unknown ; | |
200 | +178,Unknown ,Unknown ,Unknown ; | |
201 | +179,Unknown ,Unknown ,Unknown ; | |
202 | +180,Reserved,Reserved ,Reserved ; | |
203 | +181,Unknown ,Unknown ,Unknown ; | |
204 | +182,Reserved,Reserved ,Reserved ; | |
205 | +183,BSDI SS,BSDI FS SS ,BSDI file system (secondarily swap) ; | |
206 | +184,BSDIswap,BSDI swap ,BSDI swap (secondarily file system) ; | |
207 | +185,Unknown ,Unknown ,Unknown ; | |
208 | +186,Unknown ,Unknown ,Unknown ; | |
209 | +187,Unknown ,Unknown ,Unknown ; | |
210 | +188,Unknown ,Unknown ,Unknown ; | |
211 | +189,Unknown ,Unknown ,Unknown ; | |
212 | +190,Unknown ,Unknown ,Unknown ; | |
213 | +191,Unknown ,Unknown ,Unknown ; | |
214 | +192,Unknown ,Unknown ,Unknown ; | |
215 | +193,DRDOS612,DR DOS 6 LOG 12,DR DOS 6.0 LOGIN.EXE-secured 12-bit FAT ; | |
216 | +194,Unknown ,Unknown ,Unknown ; | |
217 | +195,Unknown ,Unknown ,Unknown ; | |
218 | +196,DRDOS616,DR DOS 6 LOG 16,DR DOS 6.0 LOGIN.EXE-secured 16-bit FAT ; | |
219 | +197,Unknown ,Unknown ,Unknown ; | |
220 | +198,DRDOS6 H,DR DOS 6 LOG H ,DR DOS 6.0 LOGIN.EXE-secured Huge ; | |
221 | +199,Syrinx B,Syrinx Boot ,Syrinx Boot ; | |
222 | +200,Unknown ,Unknown ,Unknown ; | |
223 | +201,Unknown ,Unknown ,Unknown ; | |
224 | +202,Unknown ,Unknown ,Unknown ; | |
225 | +203,Unknown ,Unknown ,Unknown ; | |
226 | +204,Unknown ,Unknown ,Unknown ; | |
227 | +205,Unknown ,Unknown ,Unknown ; | |
228 | +206,Unknown ,Unknown ,Unknown ; | |
229 | +207,Unknown ,Unknown ,Unknown ; | |
230 | +208,Unknown ,Unknown ,Unknown ; | |
231 | +209,Unknown ,Unknown ,Unknown ; | |
232 | +210,TinyEFAT,Tiny EFAT ,O.S.G. EFAT (Tiny Version) ; | |
233 | +211,EFAT ,EFAT ,O.S.G. EFAT (Normal Version) ; | |
234 | +212,SecuEFAT,Secured EFAT ,O.S.G. EFAT (Secured Version) ; | |
235 | +213,OptiEFAT,Optical EFAT ,O.S.G. EFAT (Optical Version) ; | |
236 | +214,Unknown ,Unknown ,Unknown ; | |
237 | +215,Unknown ,Unknown ,Unknown ; | |
238 | +216,CP/M-86 ,CP/M-86 ,CP/M-86 ; | |
239 | +217,Unknown ,Unknown ,Unknown ; | |
240 | +218,Unknown ,Unknown ,Unknown ; | |
241 | +219,CP/M ,CP/M,C CP/M,C D,CP/M, Concurrent CP/M, Concurrent DOS ; | |
242 | +220,Unknown ,Unknown ,Unknown ; | |
243 | +221,Unknown ,Unknown ,Unknown ; | |
244 | +222,Unknown ,Unknown ,Unknown ; | |
245 | +223,Unknown ,Unknown ,Unknown ; | |
246 | +224,Unknown ,Unknown ,Unknown ; | |
247 | +225,SSFAT12E,SpeedStor F12 E,SpeedStor 12-bit FAT extended ; | |
248 | +226,Unknown ,Unknown ,Unknown ; | |
249 | +227,DOS RO ,DOS RO ,DOS RO ; | |
250 | +228,SS FAT16,SpeedStor FAT16,SpeedStor 16-bit FAT ; | |
251 | +229,Reserved,Reserved ,Reserved ; | |
252 | +230,Reserved,Reserved ,Reserved ; | |
253 | +231,Unknown ,Unknown ,Unknown ; | |
254 | +232,Unknown ,Unknown ,Unknown ; | |
255 | +233,Unknown ,Unknown ,Unknown ; | |
256 | +234,Unknown ,Unknown ,Unknown ; | |
257 | +235,BeOSBFS1,BeOS BFS-1 ,BeOS BFS-1 ; | |
258 | +236,Unknown ,Unknown ,Unknown ; | |
259 | +237,Unknown ,Unknown ,Unknown ; | |
260 | +238,Unknown ,Unknown ,Unknown ; | |
261 | +239,Unknown ,Unknown ,Unknown -- ; | |
262 | +240,Linux PR,Linux/PA-RISC ,Linux/PA-RISC boot loader ; | |
263 | +241,StorageD,Storage Dim. ,Storage Dimensions ; | |
264 | +242,DOS3.3+S,DOS 3.3+ sec. ,DOS 3.3+ secondary ; | |
265 | +243,SpeedS ,SpeedStor ,SpeedStor ; | |
266 | +244,SpeedS ,SpeedStor ,SpeedStor ; | |
267 | +245,Prologue,Prologue ,Prologue ; | |
268 | +246,SpeedStr,SpeedStor ,Storage Dimensions SpeedStor ; | |
269 | +247,OSG EFAT,OSG EFAT ,O.S.G. EFAT ; | |
270 | +248,Unknown ,Unknown ,Unknown ; | |
271 | +249,Unknown ,Unknown ,Unknown ; | |
272 | +250,BochsX86,BochsX86 ,MandrakSoft's Bochs x86 emulator ; | |
273 | +251,VMware F,VMware File Sys,VMware File System ; | |
274 | +252,VMware S,VMware Swap ,VMware Swap ; | |
275 | +253,Linux R ,Linux RAID ,Linux RAID ; | |
276 | +254,LANstep ,LANstep ,LANstep ; | |
277 | +255,XenixBBT,Xenix BBT ,Xenix bad block table ; | |
278 | +; | |
279 | +;End of file marker follows. | |
280 | +999 |
@@ -501,7 +501,7 @@ | ||
501 | 501 | |
502 | 502 | |
503 | 503 | /* copy file src into dst, substituting all characters c1 by c2 */ |
504 | -static void fcopysub(char *dst, char *src, char c1, char c2) { | |
504 | +static void fcopysub(const char *dst, const char *src, char c1, char c2) { | |
505 | 505 | FILE *fdd, *fds; |
506 | 506 | int buff; |
507 | 507 | fds = fopen(src, "rb"); |
@@ -524,7 +524,7 @@ | ||
524 | 524 | } |
525 | 525 | |
526 | 526 | |
527 | -static void bootfilesgen(int targetdrv, struct slocales *locales, int cdromdrv) { | |
527 | +static void bootfilesgen(char targetdrv, const struct slocales *locales, char cdromdrv) { | |
528 | 528 | char buff[128]; |
529 | 529 | char buff2[16]; |
530 | 530 | char buff3[16]; |
@@ -607,85 +607,68 @@ | ||
607 | 607 | } |
608 | 608 | |
609 | 609 | |
610 | -static void installpackages(int targetdrv, int cdromdrv) { | |
611 | - char *pkglist[] = { | |
612 | - "A:\\UDVD2", /* this one's not part of CORE, hence it's stored right on the floppy */ | |
613 | - "APPEND", | |
614 | - "ASSIGN", | |
615 | - "ATTRIB", | |
616 | - "CHKDSK", | |
617 | - "CHOICE", | |
618 | - "COMMAND", | |
619 | - "COMP", | |
620 | - "CPIDOS", | |
621 | - "CTMOUSE", | |
622 | - "DEBUG", | |
623 | - "DEFRAG", | |
624 | - "DELTREE", | |
625 | - "DEVLOAD", | |
626 | - "DISKCOMP", | |
627 | - "DISKCOPY", | |
628 | - "DISPLAY", | |
629 | - "DOSFSCK", | |
630 | - "EDIT", | |
631 | - "EDLIN", | |
632 | - "EXE2BIN", | |
633 | - "FC", | |
634 | - "FDAPM", | |
635 | - "FDISK", | |
636 | - "FDNPKG", | |
637 | - "FIND", | |
638 | - "FORMAT", | |
639 | - "HELP", | |
640 | - "HIMEMX", | |
641 | - "KERNEL", | |
642 | - "KEYB", | |
643 | - "KEYB_LAY", | |
644 | - "LABEL", | |
645 | - "LBACACHE", | |
646 | - "MEM", | |
647 | - "MIRROR", | |
648 | - "MODE", | |
649 | - "MORE", | |
650 | - "MOVE", | |
651 | - "NANSI", | |
652 | - "NLSFUNC", | |
653 | - "PRINT", | |
654 | - "RDISK", | |
655 | - "RECOVER", | |
656 | - "REPLACE", | |
657 | - "SHARE", | |
658 | - "SHSUCDX", | |
659 | - "SORT", | |
660 | - "SWSUBST", | |
661 | - "TREE", | |
662 | - "UNDELETE", | |
663 | - "XCOPY", | |
664 | - NULL | |
665 | - }; | |
610 | +static int installpackages(char targetdrv, char cdromdrv) { | |
611 | + char pkglist[512]; | |
666 | 612 | int i, pkglistlen; |
613 | + size_t pkglistflen; | |
667 | 614 | char buff[64]; |
615 | + FILE *fd; | |
616 | + char *pkgptr; | |
668 | 617 | newscreen(3); |
669 | - /* count how long the pkg list is */ | |
670 | - for (pkglistlen = 0; pkglist[pkglistlen] != NULL; pkglistlen++); | |
671 | - /* set DOSDIR and friends */ | |
618 | + /* load pkg list */ | |
619 | + fd = fopen("install.lst", "rb"); | |
620 | + if (fd == NULL) { | |
621 | + video_putstring(10, 30, COLOR_BODY[mono], "ERROR: INSTALL.LST NOT FOUND", -1); | |
622 | + input_getkey(); | |
623 | + return(-1); | |
624 | + } | |
625 | + pkglistflen = fread(pkglist, 1, sizeof(pkglist), fd); | |
626 | + fclose(fd); | |
627 | + if (pkglistflen == sizeof(pkglist)) { | |
628 | + video_putstring(10, 30, COLOR_BODY[mono], "ERROR: INSTALL.LST TOO LARGE", -1); | |
629 | + input_getkey(); | |
630 | + return(-1); | |
631 | + } | |
632 | + pkglist[pkglistflen] = 0xff; /* mark the end of list */ | |
633 | + /* replace all \r and \n chars by 0 bytes, and count the number of packages */ | |
634 | + pkglistlen = 0; | |
635 | + for (i = 0; i < pkglistflen; i++) { | |
636 | + switch (pkglist[i]) { | |
637 | + case '\n': | |
638 | + pkglistlen++; | |
639 | + /* FALLTHRU */ | |
640 | + case '\r': | |
641 | + pkglist[i] = 0; | |
642 | + break; | |
643 | + } | |
644 | + } | |
645 | + /* set DOSDIR */ | |
672 | 646 | snprintf(buff, sizeof(buff), "%c:\\SYSTEM\\SVARDOS", targetdrv); |
673 | 647 | setenv("DOSDIR", buff, 1); |
674 | 648 | snprintf(buff, sizeof(buff), "%c:\\TEMP", targetdrv); |
675 | 649 | setenv("TEMP", buff, 1); |
676 | 650 | /* install packages */ |
677 | - for (i = 0; pkglist[i] != NULL; i++) { | |
678 | - char buff[128]; | |
679 | - snprintf(buff, sizeof(buff), kittengets(4, 0, "Installing package %d/%d: %s"), i+1, pkglistlen, pkglist[i]); | |
651 | + pkgptr = pkglist; | |
652 | + for (i = 0;; i++) { | |
653 | + char buff[64]; | |
654 | + /* move forward to nearest entry or end of list */ | |
655 | + while (*pkgptr == 0) pkgptr++; | |
656 | + if (*pkgptr == 0xff) break; | |
657 | + /* install the package */ | |
658 | + snprintf(buff, sizeof(buff), kittengets(4, 0, "Installing package %d/%d: %s"), i+1, pkglistlen, pkgptr); | |
680 | 659 | strcat(buff, " "); |
681 | - video_putstring(10, 1, COLOR_BODY[mono], buff, -1); | |
682 | - if (pkglist[i][1] == ':') { | |
683 | - snprintf(buff, sizeof(buff), "FDINST INSTALL %s.ZIP > NUL", pkglist[i]); | |
684 | - } else { | |
685 | - snprintf(buff, sizeof(buff), "FDINST INSTALL %c:\\CORE\\%s.ZIP > NUL", cdromdrv, pkglist[i]); | |
660 | + video_putstringfix(10, 1, COLOR_BODY[mono], buff, sizeof(buff)); | |
661 | + snprintf(buff, sizeof(buff), "FDINST INSTALL %c:\\%s.ZIP > NUL", cdromdrv, pkgptr); | |
662 | + if (system(buff) != 0) { | |
663 | + video_putstring(10, 30, COLOR_BODY[mono], "ERROR: PKG INSTALL FAILED", -1); | |
664 | + input_getkey(); | |
665 | + return(-1); | |
686 | 666 | } |
687 | - system(buff); | |
667 | + /* jump to next entry or end of list */ | |
668 | + while ((*pkgptr != 0) && (*pkgptr != 0xff)) pkgptr++; | |
669 | + if (*pkgptr == 0xff) break; | |
688 | 670 | } |
671 | + return(0); | |
689 | 672 | } |
690 | 673 | |
691 | 674 |
@@ -699,7 +682,7 @@ | ||
699 | 682 | } |
700 | 683 | |
701 | 684 | |
702 | -static void loadcp(struct slocales *locales) { | |
685 | +static void loadcp(const struct slocales *locales) { | |
703 | 686 | char buff[64]; |
704 | 687 | if (locales->codepage == 437) return; |
705 | 688 | video_movecursor(1, 0); |
@@ -729,7 +712,7 @@ | ||
729 | 712 | static int checkcd(char drv) { |
730 | 713 | FILE *fd; |
731 | 714 | char fname[32]; |
732 | - snprintf(fname, sizeof(fname), "%c:\\CORE\\MEM.ZIP", drv); | |
715 | + snprintf(fname, sizeof(fname), "%c:\\MEM.ZIP", drv); | |
733 | 716 | fd = fopen(fname, "rb"); |
734 | 717 | if (fd == NULL) return(-1); |
735 | 718 | fclose(fd); |
@@ -779,7 +762,7 @@ | ||
779 | 762 | if (targetdrv == MENUQUIT) goto Quit; |
780 | 763 | if (targetdrv == MENUPREV) goto WelcomeScreen; |
781 | 764 | /*askaboutsources();*/ /* IF sources are available, ask if installing with them */ |
782 | - installpackages(targetdrv, cdromdrv); /* install packages */ | |
765 | + if (installpackages(targetdrv, cdromdrv) != 0) goto Quit; /* install packages */ | |
783 | 766 | bootfilesgen(targetdrv, &locales, cdromdrv); /* generate boot files and other configurations */ |
784 | 767 | /*localcfg();*/ /* show local params (currency, etc), and propose to change them (based on localcfg) */ |
785 | 768 | /*netcfg();*/ /* basic networking config */ |
@@ -16,6 +16,7 @@ | ||
16 | 16 | BUILDIDX=`realpath ./buildidx/buildidx` |
17 | 17 | PUBDIR=`realpath ./website/download` |
18 | 18 | CDROOT=`realpath ./cdroot` |
19 | +FLOPROOT=`realpath ./floproot` | |
19 | 20 | CUSTFILES=`realpath ./files` |
20 | 21 | |
21 | 22 | GENISOIMAGE='' # can be mkisofs, genisoimage or empty for autodetection |
@@ -48,6 +49,11 @@ | ||
48 | 49 | set -e |
49 | 50 | |
50 | 51 | |
52 | +# list of packages to be part of CORE | |
53 | +COREPKGS=( "attrib" "chkdsk" "choice" "command" "cpidos" "ctmouse" "deltree" "devload" "diskcopy" "display" "dosfsck" "edit" "fc" "fdapm" "fdisk" "fdnpkg" "format" "himemx" "kernel" "keyb" "keyb_lay" "label" "mem" "mode" "more" "move" "shsucdx" "sort" "tree" "undelete" "xcopy" "udvd2" ) | |
54 | + | |
55 | + | |
56 | + | |
51 | 57 | # function that builds the packages repository |
52 | 58 | function dorepo { |
53 | 59 | # copy all zip files to the web repo |
@@ -73,71 +79,28 @@ | ||
73 | 79 | origdir=`pwd` |
74 | 80 | |
75 | 81 | mkdir "$CDROOT" |
82 | +mkdir "$FLOPROOT" | |
76 | 83 | |
77 | -# build the boot (install) floppy image first | |
78 | -cp $CUSTFILES/bootmini.img $CDROOT/boot.img | |
79 | -export MTOOLS_NO_VFAT=1 | |
80 | -mcopy -sQm -i "$CDROOT/boot.img" $CUSTFILES/floppy/* ::/ | |
81 | -if [ $? -ne 0 ] ; then exit 1 ; fi | |
82 | - | |
83 | -# link CORE packages to CDROOT | |
84 | -mkdir -p "$CDROOT/CORE" | |
85 | -cp "$REPOROOT/udvd2.zip" "$CDROOT/CORE/" | |
86 | -cp "$REPOROOT/append.zip" "$CDROOT/CORE/" | |
87 | -cp "$REPOROOT/assign.zip" "$CDROOT/CORE/" | |
88 | -cp "$REPOROOT/attrib.zip" "$CDROOT/CORE/" | |
89 | -cp "$REPOROOT/chkdsk.zip" "$CDROOT/CORE/" | |
90 | -cp "$REPOROOT/choice.zip" "$CDROOT/CORE/" | |
91 | -cp "$REPOROOT/command.zip" "$CDROOT/CORE/" | |
92 | -cp "$REPOROOT/comp.zip" "$CDROOT/CORE/" | |
93 | -cp "$REPOROOT/cpidos.zip" "$CDROOT/CORE/" | |
94 | -cp "$REPOROOT/ctmouse.zip" "$CDROOT/CORE/" | |
95 | -cp "$REPOROOT/debug.zip" "$CDROOT/CORE/" | |
96 | -cp "$REPOROOT/defrag.zip" "$CDROOT/CORE/" | |
97 | -cp "$REPOROOT/deltree.zip" "$CDROOT/CORE/" | |
98 | -cp "$REPOROOT/devload.zip" "$CDROOT/CORE/" | |
99 | -cp "$REPOROOT/diskcomp.zip" "$CDROOT/CORE/" | |
100 | -cp "$REPOROOT/diskcopy.zip" "$CDROOT/CORE/" | |
101 | -cp "$REPOROOT/display.zip" "$CDROOT/CORE/" | |
102 | -cp "$REPOROOT/dosfsck.zip" "$CDROOT/CORE/" | |
103 | -cp "$REPOROOT/edit.zip" "$CDROOT/CORE/" | |
104 | -cp "$REPOROOT/edlin.zip" "$CDROOT/CORE/" | |
105 | -cp "$REPOROOT/exe2bin.zip" "$CDROOT/CORE/" | |
106 | -cp "$REPOROOT/fc.zip" "$CDROOT/CORE/" | |
107 | -cp "$REPOROOT/fdapm.zip" "$CDROOT/CORE/" | |
108 | -cp "$REPOROOT/fdisk.zip" "$CDROOT/CORE/" | |
109 | -cp "$REPOROOT/fdnpkg.zip" "$CDROOT/CORE/" | |
110 | -cp "$REPOROOT/find.zip" "$CDROOT/CORE/" | |
111 | -cp "$REPOROOT/format.zip" "$CDROOT/CORE/" | |
112 | -cp "$REPOROOT/help.zip" "$CDROOT/CORE/" | |
113 | -cp "$REPOROOT/himemx.zip" "$CDROOT/CORE/" | |
114 | -cp "$REPOROOT/kernel.zip" "$CDROOT/CORE/" | |
115 | -cp "$REPOROOT/keyb.zip" "$CDROOT/CORE/" | |
116 | -cp "$REPOROOT/keyb_lay.zip" "$CDROOT/CORE/" | |
117 | -cp "$REPOROOT/label.zip" "$CDROOT/CORE/" | |
118 | -cp "$REPOROOT/lbacache.zip" "$CDROOT/CORE/" | |
119 | -cp "$REPOROOT/mem.zip" "$CDROOT/CORE/" | |
120 | -cp "$REPOROOT/mirror.zip" "$CDROOT/CORE/" | |
121 | -cp "$REPOROOT/mode.zip" "$CDROOT/CORE/" | |
122 | -cp "$REPOROOT/more.zip" "$CDROOT/CORE/" | |
123 | -cp "$REPOROOT/move.zip" "$CDROOT/CORE/" | |
124 | -cp "$REPOROOT/nansi.zip" "$CDROOT/CORE/" | |
125 | -cp "$REPOROOT/nlsfunc.zip" "$CDROOT/CORE/" | |
126 | -cp "$REPOROOT/print.zip" "$CDROOT/CORE/" | |
127 | -cp "$REPOROOT/rdisk.zip" "$CDROOT/CORE/" | |
128 | -cp "$REPOROOT/recover.zip" "$CDROOT/CORE/" | |
129 | -cp "$REPOROOT/replace.zip" "$CDROOT/CORE/" | |
130 | -cp "$REPOROOT/share.zip" "$CDROOT/CORE/" | |
131 | -cp "$REPOROOT/shsucdx.zip" "$CDROOT/CORE/" | |
132 | -cp "$REPOROOT/sort.zip" "$CDROOT/CORE/" | |
133 | -cp "$REPOROOT/swsubst.zip" "$CDROOT/CORE/" | |
134 | -cp "$REPOROOT/tree.zip" "$CDROOT/CORE/" | |
135 | -cp "$REPOROOT/undelete.zip" "$CDROOT/CORE/" | |
136 | -cp "$REPOROOT/xcopy.zip" "$CDROOT/CORE/" | |
137 | - | |
138 | 84 | # build the repo (also builds the listing.txt file) |
139 | 85 | dorepo |
140 | 86 | |
87 | +# add CORE packages to CDROOT + create the list of packages on floppy | |
88 | +for pkg in "${COREPKGS[@]}" ; do | |
89 | + cp "$REPOROOT/$pkg.zip" "$CDROOT/" | |
90 | + echo "$pkg" >> "$FLOPROOT/install.lst" | |
91 | +done | |
92 | + | |
93 | +# prepare the content of the boot (install) floppy | |
94 | +cp "install/install.com" "$FLOPROOT/" | |
95 | +cp "install/nls/"install.?? "$FLOPROOT/" | |
96 | +cp -r "$CUSTFILES/floppy/"* "$FLOPROOT/" | |
97 | + | |
98 | +# build the boot floppy image | |
99 | +export MTOOLS_NO_VFAT=1 | |
100 | +truncate -s 1474560 "$CDROOT/boot.img" | |
101 | +mformat -f 1440 -v SVARDOS -B "$CUSTFILES/floppy.mbr" -i "$CDROOT/boot.img" | |
102 | +mcopy -sQm -i "$CDROOT/boot.img" "$FLOPROOT/"* ::/ | |
103 | + | |
141 | 104 | # delete previous (if any) *.iso and *.md5 files |
142 | 105 | echo "cleaning up old versions..." |
143 | 106 | rm -f "$PUBDIR/svardos.iso" "$PUBDIR/svardos.iso.md5" |
@@ -145,16 +108,14 @@ | ||
145 | 108 | CDISO="$PUBDIR/svardos.iso" |
146 | 109 | |
147 | 110 | $GENISOIMAGE -input-charset cp437 -b boot.img -iso-level 1 -f -V SVARDOS -o "$CDISO" "$CDROOT" |
148 | -if [ $? -ne 0 ] ; then exit 1 ; fi | |
149 | 111 | |
150 | -# cleanup CDROOT | |
151 | -rm -rf "$CDROOT" | |
112 | +# cleanup temporary things | |
113 | +rm -rf "$CDROOT" "$FLOPROOT" | |
152 | 114 | |
153 | 115 | # compute the MD5 of the ISO file, taking care to include only the filename in it |
154 | 116 | echo "computing md5 sums..." |
155 | 117 | cd `dirname "$CDISO"` |
156 | 118 | md5sum `basename "$CDISO"` > "$CDISO.md5" |
157 | -if [ $? -ne 0 ] ; then exit 1 ; fi | |
158 | 119 | |
159 | 120 | cd "$origdir" |
160 | 121 |