head	1.156;
access;
symbols
	RELENG_8_4:1.156.0.2
	RELENG_9_1_0_RELEASE:1.150.2.1.4.2
	RELENG_9_1:1.150.2.1.0.4
	RELENG_9_1_BP:1.150.2.1
	RELENG_8_3_0_RELEASE:1.148.2.1.8.1
	RELENG_8_3:1.148.2.1.0.8
	RELENG_8_3_BP:1.148.2.1
	RELENG_9_0_0_RELEASE:1.150.2.1.2.1
	RELENG_9_0:1.150.2.1.0.2
	RELENG_9_0_BP:1.150.2.1
	RELENG_9:1.150.0.2
	RELENG_9_BP:1.150
	RELENG_7_4_0_RELEASE:1.147.14.1
	RELENG_8_2_0_RELEASE:1.148.2.1.6.1
	RELENG_7_4:1.147.0.14
	RELENG_7_4_BP:1.147
	RELENG_8_2:1.148.2.1.0.6
	RELENG_8_2_BP:1.148.2.1
	RELENG_8_1_0_RELEASE:1.148.2.1.4.1
	RELENG_8_1:1.148.2.1.0.4
	RELENG_8_1_BP:1.148.2.1
	RELENG_7_3_0_RELEASE:1.147.12.1
	RELENG_7_3:1.147.0.12
	RELENG_7_3_BP:1.147
	RELENG_8_0_0_RELEASE:1.148.2.1.2.1
	RELENG_8_0:1.148.2.1.0.2
	RELENG_8_0_BP:1.148.2.1
	RELENG_8:1.148.0.2
	RELENG_8_BP:1.148
	RELENG_7_2_0_RELEASE:1.147.10.1
	RELENG_7_2:1.147.0.10
	RELENG_7_2_BP:1.147
	RELENG_7_1_0_RELEASE:1.147.8.1
	RELENG_6_4_0_RELEASE:1.147.2.1.4.1
	RELENG_7_1:1.147.0.8
	RELENG_7_1_BP:1.147
	RELENG_6_4:1.147.2.1.0.4
	RELENG_6_4_BP:1.147.2.1
	RELENG_7_0_0_RELEASE:1.147
	RELENG_6_3_0_RELEASE:1.147.2.1
	RELENG_7_0:1.147.0.6
	RELENG_7_0_BP:1.147
	RELENG_6_3:1.147.2.1.0.2
	RELENG_6_3_BP:1.147.2.1
	RELENG_7:1.147.0.4
	RELENG_7_BP:1.147
	RELENG_6:1.147.0.2
	old_RELENG_5_5_0_RELEASE:1.131.4.1
	old_RELENG_5_5:1.131.4.1.0.4
	old_RELENG_5_5_BP:1.131.4.1
	old_RELENG_6_1_0_RELEASE:1.134.2.3
	old_RELENG_6_1:1.134.2.3.0.2
	old_RELENG_6_1_BP:1.134.2.3
	old_RELENG_6_0_0_RELEASE:1.134.2.1
	old_RELENG_6_0:1.134.2.1.0.2
	old_RELENG_6_0_BP:1.134.2.1
	old_RELENG_6:1.134.0.2
	old_RELENG_6_BP:1.134
	old_RELENG_5_4_0_RELEASE:1.131.4.1
	old_RELENG_5_4:1.131.4.1.0.2
	old_RELENG_5_4_BP:1.131.4.1
	old_RELENG_5_3_0_RELEASE:1.131
	old_RELENG_5_3:1.131.0.6
	old_RELENG_5_3_BP:1.131
	old_RELENG_5:1.131.0.4
	old_RELENG_5_BP:1.131
	old_RELENG_5_2_1_RELEASE:1.131
	old_RELENG_5_2_0_RELEASE:1.131
	old_RELENG_5_2:1.131.0.2
	old_RELENG_5_2_BP:1.131
	old_RELENG_5_1_0_RELEASE:1.128
	old_RELENG_5_1:1.128.0.2
	old_RELENG_5_1_BP:1.128
	old_RELENG_5_0_0_RELEASE:1.127
	old_RELENG_5_0:1.127.0.2
	old_RELENG_5_0_BP:1.127
	old_help:1.121
	old_BEFORE_XF4:1.121
	old_old_RELENG_4_2_0_RELEASE:1.92.2.9
	old_old_RELENG_4_1_1_RELEASE:1.92.2.8
	old_old_PRE_SMPNG:1.99
	old_old_RELENG_4_1_0_RELEASE:1.92.2.6
	old_old_RELENG_3_5_0_RELEASE:1.80.2.8
	old_old_RELENG_4_0_0_RELEASE:1.92
	old_old_RELENG_4:1.92.0.2
	old_old_RELENG_4_BP:1.92
	old_old_RELENG_3_4_0_RELEASE:1.80.2.6
	old_old_RELENG_3_3_0_RELEASE:1.80.2.6
	old_old_RELENG_3_2_PAO:1.80.2.2.0.2
	old_old_RELENG_3_2_PAO_BP:1.80.2.2
	old_old_RELENG_3_2_0_RELEASE:1.80.2.2
	old_old_RELENG_3_1_0_RELEASE:1.80
	old_old_RELENG_3:1.80.0.2
	old_old_RELENG_3_BP:1.80
	old_old_RELENG_2_2_8_RELEASE:1.48.2.23
	old_old_RELENG_3_0_0_RELEASE:1.77
	old_old_RELENG_2_2_7_RELEASE:1.48.2.21
	old_old_RELENG_2_2_6_RELEASE:1.48.2.20
	old_old_RELENG_2_2_5_RELEASE:1.48.2.16
	old_old_RELENG_2_2_2_RELEASE:1.48.2.10
	old_old_RELENG_2_2_1_RELEASE:1.48.2.7
	old_old_RELENG_2_2_0_RELEASE:1.48.2.6
	old_old_RELENG_2_1_7_RELEASE:1.22.2.21
	old_old_RELENG_2_1_6_1_RELEASE:1.22.2.20
	old_old_RELENG_2_1_6_RELEASE:1.22.2.20
	old_old_RELENG_2_2:1.48.0.2
	old_old_RELENG_2_2_BP:1.48
	old_old_RELENG_2_1_5_RELEASE:1.22.2.18
	old_old_RELENG_2_1_0_RELEASE:1.22.2.11
	old_old_RELENG_2_1_0:1.22.0.2
	old_old_RELENG_2_1_0_BP:1.22
	old_old_RELENG_2_0_5_RELEASE:1.21.2.4
	old_old_RELENG_2_0_5:1.21.0.2
	old_old_RELENG_2_0_5_BP:1.21
	old_old_RELENG_2_0_5_ALPHA:1.21
	old_old_sysinstall:1.1.1.1;
locks; strict;
comment	@# @;


1.156
date	2012.12.30.18.03.59;	author svnexp;	state dead;
branches
	1.156.2.1;
next	1.155;

1.155
date	2012.11.17.01.54.58;	author svnexp;	state Exp;
branches;
next	1.154;

1.154
date	2011.11.25.07.10.59;	author fjoe;	state Exp;
branches;
next	1.153;

1.153
date	2011.11.24.18.37.16;	author fjoe;	state Exp;
branches;
next	1.152;

1.152
date	2011.11.24.10.08.22;	author fjoe;	state Exp;
branches;
next	1.151;

1.151
date	2011.11.24.08.56.24;	author fjoe;	state Exp;
branches;
next	1.150;

1.150
date	2011.01.12.14.55.02;	author nwhitehorn;	state Exp;
branches
	1.150.2.1;
next	1.149;

1.149
date	2010.08.23.22.24.11;	author imp;	state Exp;
branches;
next	1.148;

1.148
date	2008.05.03.02.42.57;	author delphij;	state Exp;
branches
	1.148.2.1;
next	1.147;

1.147
date	2006.08.09.11.25.10;	author netchild;	state Exp;
branches
	1.147.2.1
	1.147.4.1
	1.147.8.1
	1.147.10.1
	1.147.12.1
	1.147.14.1;
next	1.146;

1.146
date	2006.08.09.09.12.01;	author netchild;	state Exp;
branches;
next	1.145;

1.145
date	2006.08.09.08.25.21;	author delphij;	state Exp;
branches;
next	1.144;

1.144
date	2006.08.08.13.45.46;	author delphij;	state Exp;
branches;
next	1.143;

1.143
date	2006.08.07.23.35.48;	author netchild;	state Exp;
branches;
next	1.142;

1.142
date	2006.08.07.23.20.22;	author netchild;	state Exp;
branches;
next	1.141;

1.141
date	2006.03.11.19.00.05;	author sam;	state Exp;
branches;
next	1.140;

1.140
date	2006.03.10.12.18.41;	author nyan;	state Exp;
branches;
next	1.139;

1.139
date	2006.03.08.18.02.31;	author sam;	state Exp;
branches;
next	1.138;

1.138
date	2006.02.28.21.49.32;	author jhb;	state Exp;
branches;
next	1.137;

1.137
date	2006.02.28.20.29.43;	author jhb;	state Exp;
branches;
next	1.136;

1.136
date	2005.12.15.01.04.50;	author iedowse;	state Exp;
branches;
next	1.135;

1.135
date	2005.09.27.13.10.23;	author nyan;	state Exp;
branches;
next	1.134;

1.134
date	2005.03.19.02.28.02;	author murray;	state Exp;
branches
	1.134.2.1;
next	1.133;

1.133
date	2004.12.21.15.16.36;	author ru;	state Exp;
branches;
next	1.132;

1.132
date	2004.11.11.18.49.24;	author jhb;	state Exp;
branches;
next	1.131;

1.131
date	2003.11.20.20.43.06;	author jhb;	state Exp;
branches
	1.131.4.1;
next	1.130;

1.130
date	2003.11.02.08.58.57;	author marcel;	state Exp;
branches;
next	1.129;

1.129
date	2003.08.19.23.23.26;	author obrien;	state Exp;
branches;
next	1.128;

1.128
date	2003.04.04.17.49.19;	author obrien;	state Exp;
branches;
next	1.127;

1.127
date	2002.10.20.11.16.41;	author matusita;	state Exp;
branches;
next	1.126;

1.126
date	2002.04.30.22.40.05;	author obrien;	state Exp;
branches;
next	1.125;

1.125
date	2002.04.02.20.42.50;	author obrien;	state Exp;
branches;
next	1.124;

1.124
date	2002.03.29.23.03.17;	author murray;	state Exp;
branches;
next	1.123;

1.123
date	2002.03.28.10.02.00;	author ru;	state Exp;
branches;
next	1.122;

1.122
date	2002.03.28.08.23.33;	author ru;	state Exp;
branches;
next	1.121;

1.121
date	2002.03.15.11.27.47;	author ru;	state Exp;
branches;
next	1.120;

1.120
date	2002.03.15.11.21.57;	author ru;	state Exp;
branches;
next	1.119;

1.119
date	2001.12.10.08.37.51;	author roam;	state Exp;
branches;
next	1.118;

1.118
date	2001.12.01.13.13.27;	author matusita;	state Exp;
branches;
next	1.117;

1.117
date	2001.09.05.07.12.19;	author murray;	state Exp;
branches;
next	1.116;

1.116
date	2001.07.20.06.20.31;	author obrien;	state Exp;
branches;
next	1.115;

1.115
date	2001.07.20.04.23.12;	author obrien;	state Exp;
branches;
next	1.114;

1.114
date	2001.07.17.04.09.50;	author ache;	state Exp;
branches;
next	1.113;

1.113
date	2001.06.17.03.13.48;	author nyan;	state Exp;
branches;
next	1.112;

1.112
date	2001.06.11.02.15.31;	author ache;	state Exp;
branches;
next	1.111;

1.111
date	2001.05.15.22.54.15;	author imp;	state Exp;
branches;
next	1.110;

1.110
date	2001.05.12.09.19.36;	author sobomax;	state Exp;
branches;
next	1.109;

1.109
date	2001.05.10.15.57.16;	author sobomax;	state Exp;
branches;
next	1.108;

1.108
date	2001.03.26.14.42.02;	author ru;	state Exp;
branches;
next	1.107;

1.107
date	2001.03.20.18.17.18;	author ru;	state Exp;
branches;
next	1.106;

1.106
date	2001.01.19.09.24.00;	author peter;	state Exp;
branches;
next	1.105;

1.105
date	2001.01.17.03.32.00;	author jhb;	state Exp;
branches;
next	1.104;

1.104
date	2001.01.11.20.53.36;	author obrien;	state Exp;
branches;
next	1.103;

1.103
date	2000.11.06.09.28.54;	author hosokawa;	state Exp;
branches;
next	1.102;

1.102
date	2000.10.31.07.39.07;	author hosokawa;	state Exp;
branches;
next	1.101;

1.101
date	2000.09.16.03.56.25;	author ache;	state Exp;
branches;
next	1.100;

1.100
date	2000.09.07.16.05.51;	author jkh;	state Exp;
branches;
next	1.99;

1.99
date	2000.08.12.14.20.31;	author nyan;	state Exp;
branches;
next	1.98;

1.98
date	2000.07.21.21.32.13;	author jkh;	state Exp;
branches;
next	1.97;

1.97
date	2000.07.21.20.45.56;	author jkh;	state Exp;
branches;
next	1.96;

1.96
date	2000.07.12.18.08.27;	author jhb;	state Exp;
branches;
next	1.95;

1.95
date	2000.06.05.13.17.22;	author nyan;	state Exp;
branches;
next	1.94;

1.94
date	2000.05.12.03.01.17;	author jhb;	state Exp;
branches;
next	1.93;

1.93
date	2000.03.24.22.24.05;	author jhb;	state Exp;
branches;
next	1.92;

1.92
date	2000.02.11.09.12.17;	author jkh;	state Exp;
branches
	1.92.2.1;
next	1.91;

1.91
date	2000.01.18.15.50.19;	author obrien;	state Exp;
branches;
next	1.90;

1.90
date	2000.01.14.02.17.56;	author hosokawa;	state Exp;
branches;
next	1.89;

1.89
date	2000.01.04.04.50.04;	author jkh;	state Exp;
branches;
next	1.88;

1.88
date	99.09.02.00.51.09;	author jkh;	state Exp;
branches;
next	1.87;

1.87
date	99.09.01.04.29.21;	author jkh;	state Exp;
branches;
next	1.86;

1.86
date	99.07.19.10.06.16;	author jkh;	state Exp;
branches;
next	1.85;

1.85
date	99.07.06.09.15.57;	author hosokawa;	state Exp;
branches;
next	1.84;

1.84
date	99.06.17.19.04.51;	author markm;	state Exp;
branches;
next	1.83;

1.83
date	99.06.04.10.01.49;	author ru;	state Exp;
branches;
next	1.82;

1.82
date	99.04.24.01.53.53;	author jkh;	state Exp;
branches;
next	1.81;

1.81
date	99.02.04.13.47.54;	author jkh;	state Exp;
branches;
next	1.80;

1.80
date	99.01.20.12.31.42;	author jkh;	state Exp;
branches
	1.80.2.1;
next	1.79;

1.79
date	99.01.20.11.56.39;	author jkh;	state Exp;
branches;
next	1.78;

1.78
date	99.01.08.00.14.20;	author jkh;	state Exp;
branches;
next	1.77;

1.77
date	98.10.14.11.23.47;	author jkh;	state Exp;
branches;
next	1.76;

1.76
date	98.10.13.09.47.54;	author jkh;	state Exp;
branches;
next	1.75;

1.75
date	98.10.13.09.46.40;	author jkh;	state Exp;
branches;
next	1.74;

1.74
date	98.10.13.09.45.58;	author jkh;	state Exp;
branches;
next	1.73;

1.73
date	98.10.05.22.17.41;	author jkh;	state Exp;
branches;
next	1.72;

1.72
date	98.09.30.21.51.15;	author jkh;	state Exp;
branches;
next	1.71;

1.71
date	98.09.30.20.54.34;	author jkh;	state Exp;
branches;
next	1.70;

1.70
date	98.09.16.09.25.19;	author jkh;	state Exp;
branches;
next	1.69;

1.69
date	98.09.08.11.44.37;	author jkh;	state Exp;
branches;
next	1.68;

1.68
date	98.04.01.15.19.23;	author jkh;	state Exp;
branches;
next	1.67;

1.67
date	98.03.09.15.00.39;	author jkh;	state Exp;
branches;
next	1.66;

1.66
date	98.03.07.08.59.18;	author jkh;	state Exp;
branches;
next	1.65;

1.65
date	98.01.27.14.01.15;	author yokota;	state Exp;
branches;
next	1.64;

1.64
date	97.09.17.16.18.54;	author pst;	state Exp;
branches;
next	1.63;

1.63
date	97.09.16.18.57.07;	author jkh;	state Exp;
branches;
next	1.62;

1.62
date	97.08.26.14.13.50;	author bde;	state Exp;
branches;
next	1.61;

1.61
date	97.08.11.13.08.16;	author jkh;	state Exp;
branches;
next	1.60;

1.60
date	97.07.31.11.08.34;	author jkh;	state Exp;
branches;
next	1.59;

1.59
date	97.07.16.05.22.39;	author jkh;	state Exp;
branches;
next	1.58;

1.58
date	97.07.04.04.46.29;	author jkh;	state Exp;
branches;
next	1.57;

1.57
date	97.05.22.00.17.06;	author jkh;	state Exp;
branches;
next	1.56;

1.56
date	97.04.20.16.46.24;	author jkh;	state Exp;
branches;
next	1.55;

1.55
date	97.03.19.10.09.13;	author jkh;	state Exp;
branches;
next	1.54;

1.54
date	97.03.09.22.25.37;	author jkh;	state Exp;
branches;
next	1.53;

1.53
date	97.01.17.10.57.26;	author jkh;	state Exp;
branches;
next	1.52;

1.52
date	96.12.11.09.34.52;	author jkh;	state Exp;
branches;
next	1.51;

1.51
date	96.12.09.06.02.26;	author jkh;	state Exp;
branches;
next	1.50;

1.50
date	96.11.09.20.50.23;	author jkh;	state Exp;
branches;
next	1.49;

1.49
date	96.11.09.16.46.54;	author joerg;	state Exp;
branches;
next	1.48;

1.48
date	96.10.12.20.23.06;	author erich;	state Exp;
branches
	1.48.2.1;
next	1.47;

1.47
date	96.10.09.09.53.23;	author jkh;	state Exp;
branches;
next	1.46;

1.46
date	96.10.06.16.31.12;	author jkh;	state Exp;
branches;
next	1.45;

1.45
date	96.10.06.03.20.12;	author jkh;	state Exp;
branches;
next	1.44;

1.44
date	96.10.05.10.43.41;	author jkh;	state Exp;
branches;
next	1.43;

1.43
date	96.10.05.06.04.03;	author jkh;	state Exp;
branches;
next	1.42;

1.42
date	96.10.04.13.33.40;	author jkh;	state Exp;
branches;
next	1.41;

1.41
date	96.10.03.06.01.29;	author jkh;	state Exp;
branches;
next	1.40;

1.40
date	96.09.15.23.55.21;	author jkh;	state Exp;
branches;
next	1.39;

1.39
date	96.09.08.01.39.22;	author jkh;	state Exp;
branches;
next	1.38;

1.38
date	96.07.11.18.37.46;	author jkh;	state Exp;
branches;
next	1.37;

1.37
date	96.05.24.15.35.36;	author bde;	state Exp;
branches;
next	1.36;

1.36
date	96.05.24.15.33.25;	author bde;	state Exp;
branches;
next	1.35;

1.35
date	96.05.23.16.34.23;	author jkh;	state Exp;
branches;
next	1.34;

1.34
date	96.05.16.11.47.25;	author jkh;	state Exp;
branches;
next	1.33;

1.33
date	96.05.01.09.31.48;	author jkh;	state Exp;
branches;
next	1.32;

1.32
date	96.04.28.03.26.40;	author jkh;	state Exp;
branches;
next	1.31;

1.31
date	96.04.28.01.07.18;	author jkh;	state Exp;
branches;
next	1.30;

1.30
date	96.04.23.01.29.07;	author jkh;	state Exp;
branches;
next	1.29;

1.29
date	96.04.13.13.31.18;	author jkh;	state Exp;
branches;
next	1.28;

1.28
date	96.04.07.03.52.14;	author jkh;	state Exp;
branches;
next	1.27;

1.27
date	96.03.19.14.30.08;	author bde;	state Exp;
branches;
next	1.26;

1.26
date	96.03.17.23.08.37;	author joerg;	state Exp;
branches;
next	1.25;

1.25
date	96.02.25.20.41.07;	author bde;	state Exp;
branches;
next	1.24;

1.24
date	95.12.07.10.33.29;	author peter;	state Exp;
branches;
next	1.23;

1.23
date	95.09.18.16.52.19;	author peter;	state Exp;
branches;
next	1.22;

1.22
date	95.06.11.19.29.39;	author rgrimes;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	95.05.29.01.43.14;	author jkh;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	95.05.27.10.47.28;	author jkh;	state Exp;
branches;
next	1.19;

1.19
date	95.05.25.18.49.58;	author jkh;	state Exp;
branches;
next	1.18;

1.18
date	95.05.24.11.19.09;	author gpalmer;	state Exp;
branches;
next	1.17;

1.17
date	95.05.23.02.40.49;	author jkh;	state Exp;
branches;
next	1.16;

1.16
date	95.05.20.10.32.58;	author jkh;	state Exp;
branches;
next	1.15;

1.15
date	95.05.19.16.58.51;	author jkh;	state Exp;
branches;
next	1.14;

1.14
date	95.05.18.15.46.18;	author jkh;	state Exp;
branches;
next	1.13;

1.13
date	95.05.18.15.29.43;	author jkh;	state Exp;
branches;
next	1.12;

1.12
date	95.05.17.14.39.33;	author jkh;	state Exp;
branches;
next	1.11;

1.11
date	95.05.16.11.37.06;	author jkh;	state Exp;
branches;
next	1.10;

1.10
date	95.05.16.02.52.54;	author jkh;	state Exp;
branches;
next	1.9;

1.9
date	95.05.10.07.44.53;	author jkh;	state Exp;
branches;
next	1.8;

1.8
date	95.05.08.06.06.24;	author jkh;	state Exp;
branches;
next	1.7;

1.7
date	95.05.07.05.58.53;	author jkh;	state Exp;
branches;
next	1.6;

1.6
date	95.05.05.23.47.37;	author jkh;	state Exp;
branches;
next	1.5;

1.5
date	95.05.04.23.36.15;	author jkh;	state Exp;
branches;
next	1.4;

1.4
date	95.05.04.19.48.08;	author jkh;	state Exp;
branches;
next	1.3;

1.3
date	95.05.01.21.56.17;	author jkh;	state Exp;
branches;
next	1.2;

1.2
date	95.04.27.18.03.50;	author jkh;	state Exp;
branches;
next	1.1;

1.1
date	95.04.27.12.50.35;	author jkh;	state Exp;
branches
	1.1.1.1;
next	;

1.156.2.1
date	2012.12.30.18.03.59;	author svnexp;	state dead;
branches;
next	1.156.2.2;

1.156.2.2
date	2013.03.28.13.06.25;	author svnexp;	state Exp;
branches;
next	;

1.150.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.150.2.1.2.1
	1.150.2.1.4.1;
next	1.150.2.2;

1.150.2.2
date	2012.11.17.11.37.47;	author svnexp;	state Exp;
branches;
next	;

1.150.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.150.2.1.2.2;

1.150.2.1.2.2
date	2012.11.17.08.37.44;	author svnexp;	state Exp;
branches;
next	;

1.150.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.150.2.1.4.2;

1.150.2.1.4.2
date	2012.11.17.08.48.36;	author svnexp;	state Exp;
branches;
next	;

1.148.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.148.2.1.2.1
	1.148.2.1.4.1
	1.148.2.1.6.1
	1.148.2.1.8.1;
next	1.148.2.2;

1.148.2.2
date	2012.11.17.10.37.26;	author svnexp;	state Exp;
branches;
next	;

1.148.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.148.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.148.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.148.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.148.2.1.8.2;

1.148.2.1.8.2
date	2012.11.17.08.25.58;	author svnexp;	state Exp;
branches;
next	;

1.147.2.1
date	2007.09.10.14.25.01;	author obrien;	state Exp;
branches
	1.147.2.1.4.1;
next	1.147.2.2;

1.147.2.2
date	2012.11.17.07.46.41;	author svnexp;	state Exp;
branches;
next	;

1.147.2.1.4.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.147.4.1
date	2012.11.17.08.09.05;	author svnexp;	state Exp;
branches;
next	;

1.147.8.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.147.10.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.147.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.147.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.147.14.2;

1.147.14.2
date	2012.11.17.08.17.51;	author svnexp;	state Exp;
branches;
next	;

1.134.2.1
date	2005.10.07.15.56.30;	author nyan;	state Exp;
branches;
next	1.134.2.2;

1.134.2.2
date	2006.03.07.16.06.40;	author jhb;	state Exp;
branches;
next	1.134.2.3;

1.134.2.3
date	2006.03.11.18.52.47;	author sam;	state Exp;
branches;
next	;

1.131.4.1
date	2005.01.07.20.16.20;	author jhb;	state Exp;
branches;
next	;

1.92.2.1
date	2000.06.08.23.07.28;	author jhb;	state Exp;
branches;
next	1.92.2.2;

1.92.2.2
date	2000.07.04.12.33.56;	author nyan;	state Exp;
branches;
next	1.92.2.3;

1.92.2.3
date	2000.07.17.21.25.37;	author jhb;	state Exp;
branches;
next	1.92.2.4;

1.92.2.4
date	2000.07.21.20.43.48;	author jkh;	state Exp;
branches;
next	1.92.2.5;

1.92.2.5
date	2000.07.22.08.45.55;	author jkh;	state Exp;
branches;
next	1.92.2.6;

1.92.2.6
date	2000.07.25.07.45.14;	author jkh;	state Exp;
branches;
next	1.92.2.7;

1.92.2.7
date	2000.09.14.12.10.46;	author nyan;	state Exp;
branches;
next	1.92.2.8;

1.92.2.8
date	2000.09.24.06.55.54;	author jkh;	state Exp;
branches;
next	1.92.2.9;

1.92.2.9
date	2000.11.06.23.02.52;	author jkh;	state Exp;
branches;
next	;

1.80.2.1
date	99.03.10.02.51.25;	author jkh;	state Exp;
branches;
next	1.80.2.2;

1.80.2.2
date	99.04.24.02.02.28;	author jkh;	state Exp;
branches;
next	1.80.2.3;

1.80.2.3
date	99.07.28.10.44.06;	author rnordier;	state Exp;
branches;
next	1.80.2.4;

1.80.2.4
date	99.08.13.16.00.25;	author kuriyama;	state Exp;
branches;
next	1.80.2.5;

1.80.2.5
date	99.08.17.13.14.19;	author kuriyama;	state Exp;
branches;
next	1.80.2.6;

1.80.2.6
date	99.09.02.00.55.20;	author jkh;	state Exp;
branches;
next	1.80.2.7;

1.80.2.7
date	2000.01.05.20.34.57;	author jkh;	state Exp;
branches;
next	1.80.2.8;

1.80.2.8
date	2000.01.18.15.52.29;	author obrien;	state Exp;
branches;
next	;

1.48.2.1
date	96.11.09.16.49.07;	author joerg;	state Exp;
branches;
next	1.48.2.2;

1.48.2.2
date	96.11.09.21.16.08;	author jkh;	state Exp;
branches;
next	1.48.2.3;

1.48.2.3
date	96.12.09.06.41.39;	author jkh;	state Exp;
branches;
next	1.48.2.4;

1.48.2.4
date	96.12.12.11.18.08;	author jkh;	state Exp;
branches;
next	1.48.2.5;

1.48.2.5
date	97.01.17.10.59.20;	author jkh;	state Exp;
branches;
next	1.48.2.6;

1.48.2.6
date	97.03.09.22.37.45;	author jkh;	state Exp;
branches;
next	1.48.2.7;

1.48.2.7
date	97.03.21.04.49.51;	author jkh;	state Exp;
branches;
next	1.48.2.8;

1.48.2.8
date	97.04.12.16.11.04;	author jkh;	state Exp;
branches;
next	1.48.2.9;

1.48.2.9
date	97.04.23.08.16.45;	author jkh;	state Exp;
branches;
next	1.48.2.10;

1.48.2.10
date	97.05.16.07.46.58;	author jkh;	state Exp;
branches;
next	1.48.2.11;

1.48.2.11
date	97.05.22.04.10.05;	author jkh;	state Exp;
branches;
next	1.48.2.12;

1.48.2.12
date	97.07.04.04.45.42;	author jkh;	state Exp;
branches;
next	1.48.2.13;

1.48.2.13
date	97.07.16.05.23.20;	author jkh;	state Exp;
branches;
next	1.48.2.14;

1.48.2.14
date	97.07.31.11.11.31;	author jkh;	state Exp;
branches;
next	1.48.2.15;

1.48.2.15
date	97.08.11.13.15.18;	author jkh;	state Exp;
branches;
next	1.48.2.16;

1.48.2.16
date	97.09.16.18.58.51;	author jkh;	state Exp;
branches;
next	1.48.2.17;

1.48.2.17
date	98.01.30.11.02.24;	author yokota;	state Exp;
branches;
next	1.48.2.18;

1.48.2.18
date	98.02.19.02.21.49;	author jkh;	state Exp;
branches;
next	1.48.2.19;

1.48.2.19
date	98.03.07.09.09.16;	author jkh;	state Exp;
branches;
next	1.48.2.20;

1.48.2.20
date	98.03.09.15.03.50;	author jkh;	state Exp;
branches;
next	1.48.2.21;

1.48.2.21
date	98.04.01.15.18.24;	author jkh;	state Exp;
branches;
next	1.48.2.22;

1.48.2.22
date	98.09.08.11.44.50;	author jkh;	state Exp;
branches;
next	1.48.2.23;

1.48.2.23
date	98.10.28.10.59.44;	author jkh;	state Exp;
branches;
next	;

1.22.2.1
date	95.09.18.17.00.13;	author peter;	state Exp;
branches;
next	1.22.2.2;

1.22.2.2
date	95.10.03.23.36.34;	author jkh;	state Exp;
branches;
next	1.22.2.3;

1.22.2.3
date	95.10.04.07.54.36;	author jkh;	state Exp;
branches;
next	1.22.2.4;

1.22.2.4
date	95.10.07.11.55.12;	author jkh;	state Exp;
branches;
next	1.22.2.5;

1.22.2.5
date	95.10.15.12.40.53;	author jkh;	state Exp;
branches;
next	1.22.2.6;

1.22.2.6
date	95.10.19.15.54.49;	author jkh;	state Exp;
branches;
next	1.22.2.7;

1.22.2.7
date	95.10.20.07.02.28;	author jkh;	state Exp;
branches;
next	1.22.2.8;

1.22.2.8
date	95.10.20.15.40.38;	author jkh;	state Exp;
branches;
next	1.22.2.9;

1.22.2.9
date	95.10.22.20.14.41;	author jkh;	state Exp;
branches;
next	1.22.2.10;

1.22.2.10
date	95.11.03.12.02.20;	author jkh;	state Exp;
branches;
next	1.22.2.11;

1.22.2.11
date	95.11.09.02.31.49;	author jkh;	state Exp;
branches;
next	1.22.2.12;

1.22.2.12
date	96.03.17.23.17.19;	author joerg;	state Exp;
branches;
next	1.22.2.13;

1.22.2.13
date	96.05.04.11.17.35;	author jkh;	state Exp;
branches;
next	1.22.2.14;

1.22.2.14
date	96.05.09.13.33.35;	author jkh;	state Exp;
branches;
next	1.22.2.15;

1.22.2.15
date	96.05.16.12.16.49;	author jkh;	state Exp;
branches;
next	1.22.2.16;

1.22.2.16
date	96.05.24.06.08.09;	author jkh;	state Exp;
branches;
next	1.22.2.17;

1.22.2.17
date	96.05.27.14.11.46;	author jkh;	state Exp;
branches;
next	1.22.2.18;

1.22.2.18
date	96.07.11.20.06.49;	author jkh;	state Exp;
branches;
next	1.22.2.19;

1.22.2.19
date	96.10.15.17.04.03;	author jkh;	state Exp;
branches;
next	1.22.2.20;

1.22.2.20
date	96.11.09.21.03.57;	author jkh;	state Exp;
branches;
next	1.22.2.21;

1.22.2.21
date	97.02.07.04.25.14;	author jkh;	state Exp;
branches;
next	1.22.2.22;

1.22.2.22
date	97.03.11.09.29.10;	author jkh;	state Exp;
branches;
next	1.22.2.23;

1.22.2.23
date	97.03.21.05.04.19;	author jkh;	state Exp;
branches;
next	1.22.2.24;

1.22.2.24
date	97.04.20.16.41.58;	author jkh;	state Exp;
branches;
next	;

1.21.2.1
date	95.06.01.22.45.13;	author jkh;	state Exp;
branches;
next	1.21.2.2;

1.21.2.2
date	95.06.04.22.55.23;	author jkh;	state Exp;
branches;
next	1.21.2.3;

1.21.2.3
date	95.06.05.02.25.21;	author jkh;	state Exp;
branches;
next	1.21.2.4;

1.21.2.4
date	95.06.10.09.14.46;	author jkh;	state Exp;
branches;
next	;

1.1.1.1
date	95.04.27.12.50.35;	author jkh;	state Exp;
branches;
next	;


desc
@@


1.156
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/244859
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@# $FreeBSD: head/usr.sbin/sade/Makefile 227962 2011-11-25 07:10:59Z fjoe $

.if ${MACHINE_CPUARCH} != "ia64"
_wizard=	wizard.c
.endif

PROG=	sade
MAN=	sade.8
SRCS=	command.c devices.c \
	disks.c dmenu.c \
	globals.c install.c \
	label.c main.c menus.c misc.c \
	msg.c system.c termcap.c \
	variable.c ${_wizard}
WARNS?=	3

# command.c

.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
CFLAGS+= -I${.CURDIR}/../../contrib/dialog -I.

DPADD=	${LIBDIALOG} ${LIBNCURSESW} ${LIBM} ${LIBUTIL} ${LIBDISK}
LDADD=	-ldialog -lncursesw -lm -lutil -ldisk

.include <bsd.prog.mk>
@


1.156.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:25 +0000
@
text
@d1 27
@


1.156.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 27
# $FreeBSD: releng/8.4/usr.sbin/sade/Makefile 178737 2008-05-03 02:42:57Z delphij $

.if ${MACHINE_ARCH} != "ia64"
_wizard=	wizard.c
.endif

PROG=	sade
MAN=	sade.8
SRCS=	command.c config.c devices.c \
	disks.c dispatch.c dmenu.c \
	globals.c install.c \
	label.c main.c menus.c misc.c \
	msg.c system.c termcap.c \
	variable.c ${_wizard}
WARNS?=	3

# command.c

.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.

DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK}
LDADD=	-ldialog -lncurses -lutil -ldisk

.include <bsd.prog.mk>
@


1.155
log
@Switching exporter and resync
@
text
@@


1.154
log
@SVN rev 227962 on 2011-11-25 07:10:59Z by fjoe

Remove DEBUG_FLAGS.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.153
log
@SVN rev 227944 on 2011-11-24 18:37:16Z by fjoe

Port to new libdialog.
@
text
@a22 1
DEBUG_FLAGS= -O0 -g
@


1.152
log
@SVN rev 227929 on 2011-11-24 10:08:22Z by fjoe

Remove unused code.
@
text
@d22 2
a23 1
CFLAGS+= -I${.CURDIR}/../../gnu/lib/libodialog -I.
d25 2
a26 2
DPADD=	${LIBODIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK}
LDADD=	-lodialog -lncurses -lutil -ldisk
@


1.151
log
@SVN rev 227928 on 2011-11-24 08:56:24Z by fjoe

Remove unused code.
@
text
@d10 1
a10 1
	disks.c dispatch.c dmenu.c \
@


1.150
log
@SVN rev 217309 on 2011-01-12 14:55:02Z by nwhitehorn

Update dialog to version 20100428. This changes the license under which
dialog is distributed from GPLv2 to LGPLv2 and introduces a number of new
features and a new and better libdialog API. The existing libdialog will
be kept temporarily as libodialog for compatibility purposes until sade,
sysinstall and tzsetup have been either updated or replaced.

__FreeBSD_version is now 900030.

Discussed on:	-current
Approved by:	core
Obtained from:	http://invisible-island.net/dialog
@
text
@d9 1
a9 1
SRCS=	command.c config.c devices.c \
@


1.150.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.150.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/usr.sbin/sade/Makefile 217309 2011-01-12 14:55:02Z nwhitehorn $
@


1.150.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.150.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/usr.sbin/sade/Makefile 217309 2011-01-12 14:55:02Z nwhitehorn $
@


1.150.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.150.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/usr.sbin/sade/Makefile 217309 2011-01-12 14:55:02Z nwhitehorn $
@


1.149
log
@SVN rev 211725 on 2010-08-23 22:24:11Z by imp

MFtbemd:

Prefer MACHNE_CPUARCH to MACHINE_ARCH in most contexts where you want
to test of all the CPUs of a given family conform.
@
text
@d22 1
a22 1
CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
d24 2
a25 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK}
LDADD=	-ldialog -lncurses -lutil -ldisk
@


1.148
log
@sade(8) does not need FTP I/O.
@
text
@d3 1
a3 1
.if ${MACHINE_ARCH} != "ia64"
@


1.148.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.148.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/usr.sbin/sade/Makefile 178737 2008-05-03 02:42:57Z delphij $
@


1.148.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.148.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/usr.sbin/sade/Makefile 178737 2008-05-03 02:42:57Z delphij $
@


1.148.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.148.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.148.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.147
log
@Remove the keymap stuff too, it is not needed in sade.
@
text
@d24 2
a25 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD=	-ldialog -lncurses -lutil -ldisk -lftpio
@


1.147.4.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/usr.sbin/sade/Makefile 161120 2006-08-09 11:25:10Z netchild $
@


1.147.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.147.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/usr.sbin/sade/Makefile 161120 2006-08-09 11:25:10Z netchild $
@


1.147.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.147.10.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.147.8.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.147.2.1
log
@MFC: 'sade' - the SysAdmins Disk Editor
@
text
@@


1.147.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/usr.sbin/sade/Makefile 172115 2007-09-10 14:25:05Z obrien $
@


1.147.2.1.4.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.146
log
@Get rid of the rtermcap stuff (embedding termcaps into the program). This
is needed in sysinstall on boot, but not in sade on a fully working system.

After this change I noticed no change in behavior on a vty when TERM is not
set.
@
text
@d11 1
a11 1
	globals.c install.c keymap.c \
d14 1
a14 1
	variable.c ${_wizard} keymap.h
a26 31
CLEANFILES=	keymap.tmp keymap.h

.if ${MACHINE} == "pc98"
KEYMAPS= jp.pc98 jp.pc98.iso
.else
KEYMAPS= be.iso bg.bds.ctrlcaps bg.phonetic.ctrlcaps br275.iso \
	ce.iso2 cs.latin2.qwertz danish.iso el.iso07 \
	estonian.cp850 estonian.iso estonian.iso15 finnish.iso fr.iso \
	german.iso gr.elot.acc gr.us101.acc  hr.iso hu.iso2.101keys \
	it.iso icelandic.iso jp.106 norwegian.iso pl_PL.ISO8859-2 \
	pt.iso ru.koi8-r si.iso sk.iso2 spanish.iso swedish.iso \
	swissfrench.iso \
	swissgerman.iso ua.koi8-u ua.koi8-u.shift.alt uk.iso us.dvorak \
	us.iso us.pc-ctrl us.unix
.endif

keymap.h:
	rm -f keymap.tmp
	for map in ${KEYMAPS} ; do \
		KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \
			kbdcontrol -L $$map | \
			sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \
	done
	echo "static struct keymapInfo keymapInfos[] = {" >> keymap.tmp
	for map in ${KEYMAPS} ; do \
		echo -n '	{ "'$$map'", ' >> keymap.tmp ; \
		echo "&keymap_$$map }," | tr '[-.]' '_' >> keymap.tmp ; \
	done
	( echo "	{ NULL, NULL }"; echo "};" ; echo "" ) >> keymap.tmp
	mv keymap.tmp keymap.h

@


1.145
log
@Bump WARNS level to 3.

Tested with:	make universe
@
text
@d12 1
a12 1
	label.c main.c makedevs.c menus.c misc.c \
d27 1
a27 46
CLEANFILES=	makedevs.c rtermcap
CLEANFILES+=	keymap.tmp keymap.h

.if exists(${.CURDIR}/../../share/termcap/termcap.src)
RTERMCAP=	TERMCAP=${.CURDIR}/../../share/termcap/termcap.src ./rtermcap
.else
RTERMCAP=	./rtermcap
.endif

makedevs.c:	Makefile rtermcap
	echo '#include <sys/types.h>' > makedevs.c
	${RTERMCAP} ansi | \
		file2c 'const char termcap_ansi[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25w | \
		file2c 'const char termcap_cons25w[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25 | \
		file2c 'const char termcap_cons25[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25-m | \
		file2c 'const char termcap_cons25_m[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25r | \
		file2c 'const char termcap_cons25r[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25r-m | \
		file2c 'const char termcap_cons25r_m[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25l1 | \
		file2c 'const char termcap_cons25l1[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} cons25l1-m | \
		file2c 'const char termcap_cons25l1_m[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} vt100 | \
		file2c 'const char termcap_vt100[] = {' ',0};' \
		>> makedevs.c
	${RTERMCAP} xterm | \
		file2c 'const char termcap_xterm[] = {' ',0};' \
		>> makedevs.c

build-tools:	rtermcap

rtermcap:	rtermcap.c
	${CC} -o ${.TARGET} ${.ALLSRC} -ltermcap
@


1.144
log
@Make sade(8) WARNS=3 clean.
@
text
@d15 1
@


1.143
log
@Say welcome to 'sade', the SysAdmins Disk Editor. It's the fdisk and disklabel part
of sysinstall. So sysinstall may retire now, we have the important non-install part
of it covered.

ATM it doesn't understand GEOM stuff (like mirror, stripe, raid, ...), but patches
to change this and to clean it up internally are more than welcome.

Submitted by:	mami@@nyitolap.hu
@
text
@a17 1
CFLAGS+= -DUSE_GZIP=1
@


1.142
log
@Forced commit to note repo copy from sysinstall.

Repo copy by:	markm
@
text
@d7 10
a16 9
PROG=	sysinstall
MAN=	sysinstall.8
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
	ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
	label.c main.c makedevs.c media.c menus.c misc.c modules.c \
	mouse.c msg.c network.c nfs.c options.c package.c \
	system.c tape.c tcpip.c termcap.c ttys.c ufs.c user.c \
	variable.c ${_wizard} keymap.h countries.h
a26 31
#
# When distributions have both UP and SMP kernels sysinstall
# will probe for the number of cpus on the target machine and
# automatically select which is appropriate.  This can be overridden
# through the menus or both kernels can be installed (with the
# most "appropriate" one setup as /boot/kernel).  For now this
# is done for i386 and amd64; for other systems support must be
# added to identify the cpu count if acpi and MPTable probing
# is insufficient.
#
# The unmber of cpus probed is passed through the environment in
# VAR_NCPUS ("ncpus") to scripts.
#
# Note that WITH_SMP is a compile time option that enables the
# builtin menus for the SMP kernel configuration.  If this kernel
# is not built (see release/Makefile) then this should not be
# enabled as sysinstall may try to select an SMP kernel config
# where none is available.  This option should not be needed--we
# should probe for an SMP kernel in the distribution but doing
# that is painful because of media changes and the structure of
# sysinstall so for now it's a priori.
#
.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64"
SRCS+=	acpi.c biosmptable.c
.if exists(${.CURDIR}/../../sys/${MACHINE}/conf/SMP)
CFLAGS+=-DWITH_SMP	
.endif
DPADD+=	${LIBDEVINFO}
LDADD+=	-ldevinfo
.endif

d28 1
a28 1
CLEANFILES+=	keymap.tmp keymap.h countries.tmp countries.h
a102 21
countries.h: ${.CURDIR}/../../share/misc/iso3166
	rm -f countries.tmp
	awk 'BEGIN { \
	    FS = "\t"; \
	    num = 1; \
	    print "DMenu MenuCountry = {"; \
	    print "    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,"; \
	    print "    \"Country Selection\","; \
	    print "    \"Please choose a country, region, or group.\\n\""; \
	    print "    \"Select an item using [SPACE] or [ENTER].\","; \
	    printf "    NULL,\n    NULL,\n    { "; \
	} \
	/^[[:space:]]*#/ {next;} \
	{if (num > 1) {printf "      ";} \
	    print "{ \"" num "\", \"" $$4 "\"" \
	    ", dmenuVarCheck, dmenuSetCountryVariable" \
	    ", NULL, VAR_COUNTRY \"=" tolower($$1) "\" },"; \
	    ++num;} \
	END {print "      { NULL } }\n};\n";}' < ${.ALLSRC} > countries.tmp
	mv countries.tmp ${.TARGET}

@


1.141
log
@use the same test as release/Makefile to select WITH_SMP

Reviewed by:	ru
@
text
@@


1.140
log
@Disable an SMP detection on pc98.
@
text
@d50 3
a52 2
# NB: HEAD has SMP in GENERIC so only one kernel
#CFLAGS+=-DWITH_SMP	
@


1.139
log
@Revamp base system packaging of kernels to enable up/smp selection
at runtime and to support distributing additional kernels:
o remove kernel from the base tarball
o add new kernel tarballs
o build + package both SMP and GENERIC kernels when an <arch>/conf/SMP
  config file is present
o add sysinstall support for multiple kernels
o update sysinstall to probe for the number of cpus on a system
  and auto-select smp/up kernel accordingly
o add a post-kernels install hook to fixup /boot/kernel
o add -ldevinfo to boot crunch for sysinstall's cpu probing logic

Notes:
1. On HEAD this code is not currently used because GENERIC kernels
   include SMP.  This work is mainly intended for RELENG_6 where the
   GENERIC kernel is UP.  If HEAD changes to match then just enable
   WITH_SMP in sysinstall/Makefile.
2. The cpu probing support is done with acpi and MPTable; this means
   some systems will require work for auto-detection to work.
3. The handling of /boot/kernel may need to be revisited; for now
   we rename one kernel at the last moment (SMP if installed, otherwise
   GENERIC).  There are other, possibly better, approaches.

Lots of help from ru, emaste, scottl, and jhb.
@
text
@d48 1
a48 1
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
@


1.138
log
@Fix numerous warnings.  Aside from menu items in system.c and menu.c
this now compiles on i386 with WARNS?= 3.  Most of the fixes included
adding missing 'static' keywords to internal functions, using fully-defined
terminators in statically defined arrays of structs, and various
signed vs unsigned mismatches.  Also G/C'd unused configSecurity()
function.
@
text
@d26 30
@


1.137
log
@- Autogenerate a menu containing a list of countries and keymaps supported
  by syscons.
- If we are running as init, popup the country menu before the main menu.
  If a non-default country is chosen, then a second menu is brought up
  to let the user choose a keymap.  By default the default keymap for
  the country that was selected is highlighted.  If the user chooses the
  default country, then the default keymap is just assumed and the user
  is not presented with the keymap menu.  Currently the default country
  is set to "United States" except for PC98 which assumes "Japan".

PR:		bin/93853
Submitted by:	Seth Kingsley sethk at magnesium dot net
MFC after:	3 days
@
text
@d99 1
a99 1
	( echo "	{ 0 }"; echo "};" ; echo "" ) >> keymap.tmp
@


1.136
log
@Remove usbd(8) and all references to it. It is no longer necessary
since devd(8) now provides the same functionality.

Submitted by:	Anish Mistry
@
text
@d15 1
a15 1
	variable.c ${_wizard} keymap.h
d27 1
a27 1
CLEANFILES+=	keymap.tmp keymap.h
d102 21
@


1.135
log
@Switch from OLDCARD to NEWCARD on pc98.
@
text
@d14 1
a14 1
	system.c tape.c tcpip.c termcap.c ttys.c ufs.c usb.c user.c \
@


1.134
log
@Add Central European and Slovak keymaps to sysinstall.

PR:		misc/78701
MFC after:	1 week
@
text
@a16 4
.if ${MACHINE} == "pc98"
SRCS+=  pccard.c
.endif

@


1.134.2.1
log
@MFC: Switch from OLDCARD to NEWCARD on pc98.

Approved by:	re (scottl)
@
text
@d17 4
@


1.134.2.2
log
@MFC: Autogenerate a menu containing a list of countries supported by
syscons and pop it up during installs.  In addition, use the specified
country as a hint for the keymap to use and if the non-default country is
chosen during the install startup, pop up the keymap menu before entering
the main sysinstall menu.

Approved by:	re (scottl)
@
text
@d15 1
a15 1
	variable.c ${_wizard} keymap.h countries.h
d27 1
a27 1
CLEANFILES+=	keymap.tmp keymap.h countries.tmp countries.h
a101 21
countries.h: ${.CURDIR}/../../share/misc/iso3166
	rm -f countries.tmp
	awk 'BEGIN { \
	    FS = "\t"; \
	    num = 1; \
	    print "DMenu MenuCountry = {"; \
	    print "    DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,"; \
	    print "    \"Country Selection\","; \
	    print "    \"Please choose a country, region, or group.\\n\""; \
	    print "    \"Select an item using [SPACE] or [ENTER].\","; \
	    printf "    NULL,\n    NULL,\n    { "; \
	} \
	/^[[:space:]]*#/ {next;} \
	{if (num > 1) {printf "      ";} \
	    print "{ \"" num "\", \"" $$4 "\"" \
	    ", dmenuVarCheck, dmenuSetCountryVariable" \
	    ", NULL, VAR_COUNTRY \"=" tolower($$1) "\" },"; \
	    ++num;} \
	END {print "      { NULL } }\n};\n";}' < ${.ALLSRC} > countries.tmp
	mv countries.tmp ${.TARGET}

@


1.134.2.3
log
@MFC sysinstall and make release mods to auto-select up/smp kernel

Reviewed by:	ru
Approved by:	re (scottl)
@
text
@a25 31
#
# When distributions have both UP and SMP kernels sysinstall
# will probe for the number of cpus on the target machine and
# automatically select which is appropriate.  This can be overridden
# through the menus or both kernels can be installed (with the
# most "appropriate" one setup as /boot/kernel).  For now this
# is done for i386 and amd64; for other systems support must be
# added to identify the cpu count if acpi and MPTable probing
# is insufficient.
#
# The unmber of cpus probed is passed through the environment in
# VAR_NCPUS ("ncpus") to scripts.
#
# Note that WITH_SMP is a compile time option that enables the
# builtin menus for the SMP kernel configuration.  If this kernel
# is not built (see release/Makefile) then this should not be
# enabled as sysinstall may try to select an SMP kernel config
# where none is available.  This option should not be needed--we
# should probe for an SMP kernel in the distribution but doing
# that is painful because of media changes and the structure of
# sysinstall so for now it's a priori.
#
.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64"
SRCS+=	acpi.c biosmptable.c
.if exists(${.CURDIR}/../../sys/${MACHINE}/conf/SMP)
CFLAGS+=-DWITH_SMP	
.endif
DPADD+=	${LIBDEVINFO}
LDADD+=	-ldevinfo
.endif

@


1.133
log
@Use the source of the termcap database when available.
@
text
@d81 2
a82 2
	cs.latin2.qwertz danish.iso el.iso07 estonian.cp850 estonian.iso \
	estonian.iso15 finnish.iso fr.iso \
d85 2
a86 1
	pt.iso ru.koi8-r si.iso spanish.iso swedish.iso swissfrench.iso \
@


1.132
log
@Add Estonian keyboards.

PR:		bin/73232
Reported by:	Mart Tnso tm at hwg dot edu dot ee
Submitted by:	Olafur Osvaldsson oli at isnic dot is
MFC after:	1 week
@
text
@d33 6
d41 1
a41 1
	./rtermcap ansi | \
d44 1
a44 1
	./rtermcap cons25w | \
d47 1
a47 1
	./rtermcap cons25 | \
d50 1
a50 1
	./rtermcap cons25-m | \
d53 1
a53 1
	./rtermcap cons25r | \
d56 1
a56 1
	./rtermcap cons25r-m | \
d59 1
a59 1
	./rtermcap cons25l1 | \
d62 1
a62 1
	./rtermcap cons25l1-m | \
d65 1
a65 1
	./rtermcap vt100 | \
d68 1
a68 1
	./rtermcap xterm | \
@


1.131
log
@Add Greek keymaps to sysinstall.

PR:		bin/59078
Submitted by:	Panagiotis Astithas <past@@noc.ntua.gr>
Approved by:	re (rwatson)
@
text
@d75 2
a76 1
	cs.latin2.qwertz danish.iso el.iso07 finnish.iso fr.iso \
@


1.131.4.1
log
@MFC: Add Estonian keyboards.
@
text
@d75 1
a75 2
	cs.latin2.qwertz danish.iso el.iso07 estonian.cp850 estonian.iso \
	estonian.iso15 finnish.iso fr.iso \
@


1.130
log
@o  Add PART_EFI so that we can use it instead of PART_FAT on ia64
   to better deal with the fact that we need an EFI partition and
   that we need to have a mountpoint for it.
o  When creating a new partition, add EFI to the list of types
   the user can select from. This makes it easy to create an EFI.
o  Do not include wizard.c on ia64.
o  The user cannot create a partition on ia64 that's a multiple of
   the cylinder size. We don't have a notion of cyclinders.
@
text
@d75 6
a80 5
	cs.latin2.qwertz danish.iso finnish.iso fr.iso \
	german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \
	norwegian.iso pl_PL.ISO8859-2 pt.iso ru.koi8-r si.iso \
	spanish.iso swedish.iso swissfrench.iso swissgerman.iso ua.koi8-u \
	ua.koi8-u.shift.alt uk.iso us.dvorak us.iso us.pc-ctrl us.unix
@


1.129
log
@Remove the vestiges of the old pre-"X_AS_PKG" way we used to handled the
installing XFree86 (version 3.3.6 and before).

Reviewed by:	jhb
@
text
@d3 4
d15 1
a15 1
	variable.c wizard.c keymap.h
@


1.128
log
@style.Makefile(5)
@
text
@d17 1
a17 1
CFLAGS+= -DX_AS_PKG -DUSE_GZIP=1
@


1.127
log
@Since NEWCARD is the default for i386, undef PCCARD_ARCH.
pccard.c is no longer needed for i386 also.

OKed by: imp, nyan
@
text
@a16 1
CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I.
d21 1
@


1.126
log
@Add the ability to use Bzip'ed packages.
Also add the ability to use Bzip'ed distributions -- but this is exclusive
of being able to use Gzip'ed distributions.

Sponsored by:	FreeBSD Mall, Inc.
@
text
@d13 1
a13 1
.if ${MACHINE_ARCH} == "i386"
@


1.125
log
@Switch to using XFree86 version 4.  We do this thru installing the package,
so know we have proper PKG registration and dependency information.

This is a WIP for 5.0 DP #1, so it is still rough around the edges and
does not GC the old XFree86 3.3.6 handling stuff that should be GC'ed.
Sponsored by:	FreeBSD Mall, Inc.
@
text
@d18 1
a18 1
CFLAGS+= -DX_AS_PKG
@


1.124
log
@Only build and link the pccard module on architectures that support it (and
that have room for pccardd on mfsroot.flp).
@
text
@d18 1
@


1.123
log
@Tidy up CLEANFILES.
@
text
@d9 1
a9 1
	mouse.c msg.c network.c nfs.c options.c package.c pccard.c \
d12 4
@


1.122
log
@Teach sysinstall(8) how to read boot managers out of /boot
instead of hardcoding them into the binary.  This replaces
the work-around in usr.sbin/sysinstall/Makefile,v 1.121.

Suggested by:	jhb
MFC in:		1 week
@
text
@d21 1
a21 1
CLEANFILES=	makedevs.c rtermcap rtermcap.tmp dumpnlist
@


1.121
log
@Embed boot images built as part of buildworld rather than the
installed ones under /boot (which we may not even have in the
case of a cross build).

This introduced chicken and egg problem - we need boot images
early in the "depend" stage but they have not yet been built.
Work around this by excluding the generated makeboot.c source
from the "depend" list; it's okay because we hardcode all its
dependencies explicitly.  We actually lose the dependency bit
on <sys/types.h> but it's probably okay too as the only thing
we use is the u_char datatype and this is unlikely to change.
After all, it's normal for sloppy cleaning to cause problems.

beast.FreeBSD.org running 5.0-CURRENT alpha has been able to
cross build i386 world with this patch.

Prodded by:	gallatin
@
text
@a56 40
.if ${MACHINE_ARCH} == i386
# XXX boot images aren't yet ready when "make depend" is run
.if !make(depend)
SRCS+=	makeboot.c
.endif
CLEANFILES+= makeboot.c
.if exists(${.OBJDIR}/../../sys/boot/${MACHINE}/boot0/boot0)
BOOT0=	${.OBJDIR}/../../sys/boot/${MACHINE}/boot0/boot0
.else
BOOT0=	/boot/boot0
.endif
makeboot.c: ${BOOT0}
.if ${MACHINE} == "i386"
.if exists(${.OBJDIR}/../../sys/boot/i386/mbr/mbr)
MBR=	${.OBJDIR}/../../sys/boot/i386/mbr/mbr
.else
MBR=	/boot/mbr
.endif
makeboot.c: ${MBR}
.elif ${MACHINE} == "pc98"
.if exists(${.OBJDIR}/../../sys/boot/pc98/boot0.5/boot0.5)
BOOT05=	${.OBJDIR}/../../sys/boot/pc98/boot0.5/boot0.5
.else
BOOT05=	/boot/boot0.5
.endif
makeboot.c: ${BOOT05}
.endif
makeboot.c: Makefile
	echo '#include <sys/types.h>' > makeboot.c
	file2c 'u_char boot0[] = {' '};' < ${BOOT0} >> makeboot.c
	echo "size_t boot0_size = sizeof(boot0);" >> makeboot.c
.if ${MACHINE} == i386
	file2c 'u_char mbr[] = {' '};' < ${MBR} >> makeboot.c
	echo "size_t mbr_size = sizeof(mbr);" >> makeboot.c
.elif ${MACHINE} == "pc98"
	file2c 'u_char boot05[] = {' '};' < ${BOOT05} >> makeboot.c
	echo "size_t boot05_size = sizeof(boot05);" >> makeboot.c
.endif
.endif

@


1.120
log
@Don't use temporary file to generate makedevs.c -- it's okay
to write to makedevs.c directly as it's not protected by the
.PRECIOUS attribute.
@
text
@d56 13
d70 25
a94 10
	file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.c
	echo "size_t boot0_size = sizeof(boot0);" >> makedevs.c
	file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.c
	echo "size_t mbr_size = sizeof(mbr);" >> makedevs.c
.endif
.if ${MACHINE} == "pc98"
	file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.c
	echo "size_t boot0_size = sizeof(boot0);" >> makedevs.c
	file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.c
	echo "size_t boot05_size = sizeof(boot05);" >> makedevs.c
@


1.119
log
@Add the Bulgarian BDS and Phonetic keymaps.

Reviewed by:	jhb
Approved by:	jhb, silence on -qa
MFC after:	1 week
@
text
@d25 1
a25 2
	rm -f makedevs.tmp
	echo '#include <sys/types.h>' > makedevs.tmp
d28 1
a28 1
		>> makedevs.tmp
d31 1
a31 1
		>> makedevs.tmp
d34 1
a34 1
		>> makedevs.tmp
d37 1
a37 1
		>> makedevs.tmp
d40 1
a40 1
		>> makedevs.tmp
d43 1
a43 1
		>> makedevs.tmp
d46 1
a46 1
		>> makedevs.tmp
d49 1
a49 1
		>> makedevs.tmp
d52 1
a52 1
		>> makedevs.tmp
d55 1
a55 1
		>> makedevs.tmp
d57 4
a60 4
	file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp
	echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp
	file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp
	echo "size_t mbr_size = sizeof(mbr);" >> makedevs.tmp
d63 4
a66 4
	file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp
	echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp
	file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.tmp
	echo "size_t boot05_size = sizeof(boot05);" >> makedevs.tmp
a67 1
	mv makedevs.tmp makedevs.c
@


1.118
log
@Remove kget() feature, which is removed from 5-current kernel.

Since userconfig feature is implemented by tweaking variables (hint.*)
with loader(8), we can put back an equivalent feature.  Maybe the first
step for this is to commit yokota-san's patch (add userconfig command
for loader).

Approved by:	jkh
@
text
@d79 2
a80 1
KEYMAPS= be.iso br275.iso cs.latin2.qwertz danish.iso finnish.iso fr.iso \
@


1.117
log
@Add Czech keyboard definition to sysinstall.

PR:		bin/17430
Submitted by:	Rudolf Cejka <cejkar@@dcse.fee.vutbr.cz>
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.116 2001/07/20 06:20:31 obrien Exp $
d5 1
a5 1
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
@


1.116
log
@Perform a major cleanup of the usr.sbin Makefiles.
These are not perfectly in agreement with each other style-wise, but they
are orders of orders of magnitude more consistent style-wise than before.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.115 2001/07/20 04:23:12 obrien Exp $
d79 1
a79 1
KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \
@


1.115
log
@Remove GCC'isms in CFLAGS.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.114 2001/07/17 04:09:50 ache Exp $
a4 4

CLEANFILES+=	makedevs.c rtermcap rtermcap.tmp dumpnlist
CLEANFILES+=	keymap.tmp keymap.h

d21 3
a74 1

@


1.114
log
@Add ability to configure console terminal type in /etc/ttys

Reviewed by:	audit, jkh's silence
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.113 2001/06/17 03:13:48 nyan Exp $
d17 1
a17 1
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I.
@


1.113
log
@Supported to select a keymap for PC-98x1.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.112 2001/06/11 02:15:31 ache Exp $
d14 2
a15 2
	system.c tape.c tcpip.c termcap.c ufs.c usb.c user.c variable.c \
	wizard.c keymap.h
@


1.112
log
@ISO_* -> ISO*
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.111 2001/05/15 22:54:15 imp Exp $
d78 3
d86 1
@


1.111
log
@Save one fork on a buildworld.  env FOO=foo bar -> FOO=foo bar.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.110 2001/05/12 09:19:36 sobomax Exp $
d80 1
a80 1
	norwegian.iso pl_PL.ISO_8859-2 pt.iso ru.koi8-r si.iso \
@


1.110
log
@Take keyboard map files from ${.CURDIR}/../../share/syscons/keymaps, not from
/usr/share/syscons/keymaps. This should prevent word breakage when new keymaps
have been added.

Prompted by:	Matthew D. Fuller <fullermd@@over-yonder.net>
@
text
@d1 1
a1 1
# $FreeBSD$
d87 1
a87 1
		env KEYMAP_PATH=${.CURDIR}/../../share/syscons/keymaps \
@


1.109
log
@Add support for Ukrainian console.

Submitted by:	Olexander Kunytsa <kunia@@istc.kiev.ua>
MFC after:	2 weeks
@
text
@d87 2
a88 1
		kbdcontrol -L $$map | \
@


1.108
log
@- Backout botched attempt to introduce MANSECT feature.
- MAN[1-9] -> MAN.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.107 2001/03/20 18:17:18 ru Exp $
d81 2
a82 2
	spanish.iso swedish.iso swissfrench.iso swissgerman.iso uk.iso \
	us.dvorak us.iso us.pc-ctrl us.unix
@


1.107
log
@Set the default manual section for usr.sbin/ to 8.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.106 2001/01/19 09:24:00 peter Exp $
d4 1
@


1.106
log
@Create a build-tools target for sysinstall and rtermcap.  This is still
not right because rtermcap would be reading the *host* termcap, not
from the termcap in the src tree.  Besides, /usr/sbin/sysinstall
(not the crunched one in /stand) should use the runtime termcap
not the precompiled set.
@
text
@d1 1
a1 1
# $FreeBSD: src/usr.sbin/sysinstall/Makefile,v 1.105 2001/01/17 03:32:00 jhb Exp $
a3 1
MAN8=	sysinstall.8
@


1.105
log
@- We live in /usr/sbin now, so don't set special veriables to build a
  static version that installs in /stand.  Also, don't use an extra
  before-install target to create /stand.
- Add missing $FreeBSD$.
- Fix dependencies to handle keymap.h. (*)

Submitted by:	obrien (*)
@
text
@d1 1
a1 1
# $FreeBSD$
d71 2
@


1.104
log
@Add the us.pc-ctrl and us.unix keymaps.
@
text
@d1 2
a5 3
BINDIR=/stand
NOSHARED=YES

a8 2
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum

d17 1
a17 1
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
d25 1
a25 1
makedevs.c:	Makefile rtermcap keymap.h
d72 2
a73 2
rtermcap:	${.CURDIR}/rtermcap.c
	${CC} -o rtermcap ${.CURDIR}/rtermcap.c -ltermcap
a94 5

beforeinstall:
	@@if [ ! -d ${BINDIR}/ ]; then \
		mkdir -p ${BINDIR}; \
	fi
@


1.103
log
@release/sysinstall/lndir.c has not been used, but statically linked
to sysinstall for long time.  Remove it.
@
text
@d83 1
a83 1
	us.dvorak us.iso
@


1.102
log
@Moved driver modules for some PCI NICs and PCCARD-only NICs to mfsroot.flp.
http://people.freebsd.org/~hosokawa/driver-floppy/ for details.

Reviewed by:	current@@FreeBSD.org
@
text
@d15 1
a15 1
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c modules.c \
@


1.101
log
@Remove unneded -lmytinfo
@
text
@d15 2
a16 2
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
	msg.c network.c nfs.c options.c package.c pccard.c \
@


1.100
log
@MFS: sync with -stable by removing the now-vestigal X_AS_PKG stuff.
@
text
@d25 2
a26 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
@


1.99
log
@- Added support for installing boot0 and boot0.5 for PC-98.
- Cosmetic changes.
@
text
@a23 3
.if ${MACHINE_ARCH} != "i386" || defined(X_AS_PKG)
CFLAGS+= -DX_AS_PKG
.endif
@


1.98
log
@If ${BINDIR} is not present, create it before installing to it.
@
text
@d70 6
@


1.97
log
@Add a terminal entry for xterm; a lot of people are using xterms
in the serial-installation of FreeBSD.
@
text
@a81 1

d95 5
@


1.96
log
@- Support MBR boot loaders that are larger than one sector size.
- Axe the 1024 cylinder checks as they are no longer relevant.
@
text
@d61 3
@


1.95
log
@- Remove obsolete PC-card boot.flp hack. It was for making both PC-card
  boot.flp and plain boot.flp.
- Clean up crunchgen related routine.

- Add PC-98 support.
  TODO:
    o Documentation
    o Fix some messages for PC-98
    o Decrease the size of fixit.flp to 1.2MB
    o I18N (See: http://www.jp.FreeBSD.org/BootAsia/index.html)

No response from jkh
@
text
@d63 1
d65 1
@


1.94
log
@Add support for USB to sysinstall.  This includes running usbd and
setting 'usbd_enable' in rc.conf during nwe installs if USB is detected.
Also, since usbd already handles USB mice automatically, note that the
mouse setup section in sysinstall only applies to non-USB mice.
@
text
@d21 3
d37 3
d61 1
a61 1
.if ${MACHINE_ARCH} != "alpha"
@


1.93
log
@Update sysinstall to use struct uc_device instead of struct isa_device
for generating /boot/kernel.conf.  Since this structure is shared, move
its definition out to a header file, just as struct isa_device was defined
in a header file.  This fixes the sysinstall breakage in -current.
@
text
@d17 2
a18 2
	system.c tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
	keymap.h
@


1.92
log
@Allow X_AS_PKG option to be more selectable.
@
text
@a20 1
CFLAGS+= -I${.CURDIR}/../../sys
@


1.92.2.1
log
@MFC: USB support during installation and enabling of USB in the
GENERIC kernel.
@
text
@d17 2
a18 2
	system.c tape.c tcpip.c termcap.c ufs.c usb.c user.c variable.c \
	wizard.c keymap.h
@


1.92.2.2
log
@MFC: Added PC-98 support.
@
text
@a21 3
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
a34 3
	./rtermcap cons25w | \
		file2c 'const char termcap_cons25w[] = {' ',0};' \
		>> makedevs.tmp
d56 1
a56 1
.if ${MACHINE} == "i386"
@


1.92.2.3
log
@MFC: Teach sysinstall to support MBR boot loaders of multiple sectors.
     Remove all the 1024 cylinder checks as they no longer apply.
@
text
@a63 1
	echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp
a64 1
	echo "size_t mbr_size = sizeof(mbr);" >> makedevs.tmp
@


1.92.2.4
log
@MFC: add an xterm terminal type entry for people using such terminals.

Promised to:	mjacob
@
text
@a61 3
	./rtermcap xterm | \
		file2c 'const char termcap_xterm[] = {' ',0};' \
		>> makedevs.tmp
@


1.92.2.5
log
@MFC: add beforeinstall target which ensures ${BINDIR} exists.
@
text
@d83 1
a96 5

beforeinstall:
	@@if [ ! -d ${BINDIR}/ ]; then \
		mkdir -p ${BINDIR}; \
	fi
@


1.92.2.6
log
@MFC: tcpip screen clear, nuke X_AS_PACKAGE
@
text
@d25 3
@


1.92.2.7
log
@MFC: Added boot selector supports for PC-98.
@
text
@a67 6
.if ${MACHINE} == "pc98"
	file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp
	echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp
	file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.tmp
	echo "size_t boot05_size = sizeof(boot05);" >> makedevs.tmp
.endif
@


1.92.2.8
log
@MFC: Add security profiles (nobody's squawked about it) and Lithuania.
@
text
@d21 1
d26 2
a27 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD=	-ldialog -lncurses -lutil -ldisk -lftpio
@


1.92.2.9
log
@MFC: removed defunct lndir
@
text
@d15 1
a15 1
	label.c main.c makedevs.c media.c menus.c misc.c mouse.c \
@


1.91
log
@* add SVR4 and OSF/1 enabling in the Start Up config menu
* deals with X11 install when all we have is the Port (such as on the Alpha)

Ok'ed by:	JKH
@
text
@d22 1
a22 1
.if ${MACHINE_ARCH} != "i386"
@


1.90
log
@Eliminate PC-card installation floppy and add PC-card support for
generic installation floppy.
@
text
@d22 3
@


1.89
log
@Add support for FTP installation via HTTP proxies.

Submitted by:	Philipp Mergenthaler <un1i@@rz.uni-karlsruhe.de>
PR:		11316
@
text
@d8 1
a8 1
CLEANFILES+=	keymap.tmp keymap.h pccard_conf.h
d18 1
a18 1
	keymap.h pccard_conf.h
a22 2
PCCARD?= NO

a24 7

pccard_conf.h:
.if ${PCCARD} == "YES"
	echo "#define PCCARD 1" > pccard_conf.h
.else
	echo "#undef PCCARD" > pccard_conf.h
.endif
@


1.88
log
@Oh crud, did I ever screw the pooch!  Rather than sync this with -stable,
I backed-out the changes in -current and didn't touch stable at all (I
thought I had my patch order reversed, not what actually happened).
AIEEE!  I can't even blame the crack for this one since I broke my
crack pipe a few weeks ago.  I think sleep deprivation gets the blame
for this one.

Medal for noticing this one goes to:	Jim Bloom <bloom@@acm.org>
@
text
@d14 1
a14 1
	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
@


1.87
log
@MFC:  Catch 3.2-stable sysinstall up to 4.0-current level functionality,
bringing in DHCP support.  The only thing I left out were Poul-Henning's
newfs changes since I'm not sure if he's brought the rest of that support
into -stable yet.  If it turns out that this is the case, I'll MFC those
changes too.
@
text
@d12 1
a12 1
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
a21 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS
@


1.86
log
@Another batch of fixes for dhcp support in sysinstall, now dragging
in some code from C. Stone to parse the lease information.  This is still
a WIP and this commit is largely intended to allow others to sync up; the
dhclient code still only works when doing dhcp configuration post-install
and requires a bit more work on the boot floppy before it will truly
work in the minimal bootstrapping role.
@
text
@d12 1
a12 1
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
d22 1
@


1.85
log
@Use #include <pccard_conf.h> instead of -DPCCARD.
Now we don't have to make clean before make boot.flp's.
@
text
@d12 1
a12 1
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
d16 1
a16 1
	msg.c network.c nfs.c options.c package.c pccard_conf.h pccard.c \
d18 1
a18 1
	keymap.h
a21 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS
d28 1
a28 4
cleanconfig:
	rm -f pccard_conf.h
	
pccard_conf.h: cleanconfig
@


1.84
log
@Add bits of PAO that are non-controversial.

Submitted by: Tatsumi HOSOKAWA
@
text
@d8 1
a8 1
CLEANFILES+=	keymap.tmp keymap.h
d16 2
a17 2
	msg.c network.c nfs.c options.c package.c pccard.c system.c \
	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
d26 7
d34 3
a36 1
CFLAGS+= -DPCCARD
a37 3

DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
@


1.83
log
@Switch to proper mbr.
OK'ed by:	jkh,rnordier
@
text
@d16 1
a16 1
	msg.c network.c nfs.c options.c package.c system.c \
d24 6
a89 1

@


1.82
log
@Remove the registration stuff; we're redoing this and the emailed
registrations have a high failure rate for various reasons.
@
text
@d56 1
@


1.81
log
@Add a lot of additional keymaps to the appropriate menu.

Submitted by:	Kazutaka YOKOTA <yokota@@zodiac.mech.utsunomiya-u.ac.jp>
@
text
@d16 1
a16 1
	msg.c network.c nfs.c options.c package.c register.c system.c \
@


1.80
log
@Replace old SAVE_USERCONFIG code with a customized version of Andrzej's
kget code.  Also collapse a redundant case in cdrom code.
@
text
@d63 5
a67 3
KEYMAPS= be.iso br275.iso danish.iso fr.iso german.iso it.iso \
	icelandic.iso jp.106 norwegian.iso ru.koi8-r si.iso spanish.iso \
	swedish.iso swissgerman.iso uk.iso us.dvorak us.iso
@


1.80.2.1
log
@MFC: dependent package marking.
@
text
@d63 3
a65 5
KEYMAPS= be.iso br275.iso danish.iso finnish.iso fr.iso \
	german.iso hr.iso hu.iso2.101keys it.iso icelandic.iso jp.106 \
	norwegian.iso pl_PL.ISO_8859-2 pt.iso ru.koi8-r si.iso \
	spanish.iso swedish.iso swissfrench.iso swissgerman.iso uk.iso \
	us.dvorak us.iso
@


1.80.2.2
log
@MFC: remove outdated registration code.
@
text
@d16 1
a16 1
	msg.c network.c nfs.c options.c package.c system.c \
@


1.80.2.3
log
@MFC: Use /boot/mbr.
@
text
@a55 1
	file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp
@


1.80.2.4
log
@MFC: Add bits of PAO that are non-controversial.

Reviewed and tested by:	hosokawa, nyan, kuriyama
@
text
@d8 1
a8 1
CLEANFILES+=	keymap.tmp keymap.h pccard_conf.h
d16 2
a17 2
	msg.c network.c nfs.c options.c package.c pccard_conf.h pccard.c \
	system.c tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
a23 2
PCCARD?= NO

a26 10
cleanconfig:
	rm -f pccard_conf.h
	
pccard_conf.h: cleanconfig
.if ${PCCARD} == "YES"
	echo "#define PCCARD 1" > pccard_conf.h
.else
	echo "#undef PCCARD" > pccard_conf.h
.endif

d84 1
@


1.80.2.5
log
@MFC: Make release makes PC-card boot.flp automatically.
     Exclude CHECKSUM.MD5 itself from CHECKSUM.MD5 in PC-card floppy
       directory.
     Added a short README to PC-card boot.flp directory.

Reviewed and tested by:	hosokawa, nyan, kuriyama
Approved by:		jkh
@
text
@d16 1
a16 1
	msg.c network.c nfs.c options.c package.c pccard.c \
d18 1
a18 1
	keymap.h pccard_conf.h
d29 4
a32 1
pccard_conf.h:
@


1.80.2.6
log
@NOW merge this over.  Ahem.
@
text
@d12 1
a12 1
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c dhcp.c kget.c \
d22 1
@


1.80.2.7
log
@MFC: various late improvements.
@
text
@d14 1
a14 1
	ftp.c globals.c http.c index.c install.c installUpgrade.c keymap.c \
@


1.80.2.8
log
@MFC: SVR4 and OSF/1 enabling in configuator, and X11 install using the
     Port.
@
text
@a21 3
.if ${MACHINE_ARCH} != "i386"
CFLAGS+= -DX_AS_PKG
.endif
@


1.79
log
@Remove obsolete dset code.  It's an ELF/3-stage boot world now and there
are cleaner ways of doing this that don't involve stomping on kernel
binaries directly.
@
text
@d12 1
a12 1
SRCS=	anonFTP.c cdrom.c command.c config.c devices.c \
@


1.78
log
@Adapt sysinstall more fully to the alpha (deal with proper boot signatures,
don't present label editor, etc).

Submitted by:	dfr
@
text
@a17 1
	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
d22 1
a22 4
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS # -DSAVE_USERCONFIG -DDO_SCSI
.if ${MACHINE_ARCH} == "i386"
CFLAGS+= -DSAVE_USERCONFIG
.endif
@


1.77
log
@Use properties code.
@
text
@d23 4
a26 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG # -DDO_SCSI
@


1.76
log
@properly conditionalize for alpha.
@
text
@d12 1
a12 1
SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
@


1.75
log
@correct typo.
@
text
@d55 1
d57 1
@


1.74
log
@switch to proper boot0
@
text
@d55 1
a55 1
	file2c 'u_char mbr[] = {' '};' < /boot/boot0 >> makedevs.tmp
@


1.73
log
@Add back keymap.h.  Guess this is the easiest way to get it built.
@
text
@d55 1
@


1.72
log
@remove keymap.h reference from incorrect location.
@
text
@d18 2
a19 1
	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c
@


1.71
log
@Finally conditionalize the SCSI frobbing code properly.  This
should return kernel config saving (under the current a.out system)
to its former functionality.
@
text
@d18 1
a18 2
	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
	keymap.h
@


1.70
log
@Make SCSI stuff truly optional.
Noticed by:	jhay
@
text
@d23 1
a23 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
@


1.69
log
@Whoops, update the makefile too while I'm at it.
@
text
@d19 1
a19 1
	uc_scsi.c keymap.h
@


1.68
log
@MF22: NOSHARED=YES
@
text
@d13 1
a13 1
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
@


1.67
log
@Remove deprecated XIG support - that project never
happened.
@
text
@d3 1
d5 1
@


1.66
log
@Add a mouse configuration menu.
Submitted by:	Kazutaka YOKOTA <yokota@@zodiac.mech.utsunomiya-u.ac.jp>
@
text
@a21 1
#CFLAGS+= -DUSE_XIG_ENVIRONMENT
@


1.65
log
@Update the keymap menu.
@
text
@d13 1
a13 1
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
@


1.64
log
@variable_load.c is dead
@
text
@d60 3
a62 3
KEYMAPS= be.iso br275.iso danish.iso fr.iso german.iso it.iso jp.106 \
	norwegian.iso ru.koi8-r spanish.iso swedish.iso \
	swissgerman.iso uk.iso us.dvorak us.iso
d68 2
a69 1
		kbdcontrol -L $$map >> keymap.tmp ; \
@


1.63
log
@Much better dispatch code and scripting support.
Submitted by:	pst
@
text
@d17 1
a17 1
	uc_scsi.c keymap.h variable_load.c
@


1.62
log
@-I/sys -> ${.CURDIR}/../../sys.  This should finish replacing /sys by
a relative path.
@
text
@a23 4
.if defined(LOAD_CONFIG_FILE)
CFLAGS+=	-DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
.endif

@


1.61
log
@Make some changes to the way the label editor reads script variables
so you don't need to re-enter it for each and every filesystem. Heads up!
This change is incompatible with the previous scripting format,
so those folks (all 2 of you) using config files should take a look
at the changes to the sample install.cfg file for the diskLabelEditor's
new calling syntax.

Finally write a man page for this thing, documenting all of the above
and more.  I can't drive a stake through this thing's heart without
properly documenting it first, so please consider this step #1 in that
process (to be honest, sysinstall will also live on for some time in
the 2.2. branch since it's unlikely that the new install tools will ever
make it over there - they're strictly 3.0 material).
@
text
@d19 2
a20 1
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
@


1.60
log
@Make serial console based installs actually work by:

1. Detecting the split /dev/ttyv0 / /dev/console case, e.g. you've
   booted with the -h flag and you have a VGA card also.

2. Adding an extra "menu" for selecting terminal type and adding ANSI
   to the list of compiled-in terms.

3. Opening the proper file descriptors before disowning ourselves.
Requested by:	pst
@
text
@d2 1
a2 1
NOMAN=	yes
@


1.59
log
@Eliminate Samba configuration.  Sorry, but this was another one of
those ideas that, like the Apache server setup, was well-intentioned
but doomed to fail in the face of change.  That and the fact that it
shouldn't be part of the installation tool, it should be part of the
post-installation setup tool (which we need to write).  Combining the
two utilities into one utility was my first conceptual mistake.

Apologies also to Coranth Gryphon, who worked hard on the Apache
and Samba server setup code.  These features were quite useful
for awhile, if that's any consolation, I just simply had the wrong
ideas about where to put them. :-(
@
text
@d33 3
@


1.58
log
@YAMF22
@
text
@d14 1
a14 1
	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
@


1.57
log
@Actually, rethink last commit and simply remove the apache configuration
entirely, as promised earlier (it's outdated now and doesn't really belong
in sysinstall).
@
text
@d3 1
@


1.56
log
@Sync with 2.2 and clean up some tortured english that was added.
@
text
@d9 1
a9 1
SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
@


1.55
log
@Some of my pending merge changes, Paul Traina's more flexible config
file loading code.
Submitted by:	pst
@
text
@d20 1
@


1.54
log
@Add a registration screen so we can finally start counting our little user
puppies.
@
text
@d16 1
a16 1
	uc_scsi.c keymap.h
@


1.53
log
@Pass LOAD_CONFIG_FILE variable through, if set (makes Paul Traina's life
easier).  Only run install.cfg if running as init.  It's something of
a security hole otherwise. :)
@
text
@d10 4
a13 4
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c ftp.c \
	globals.c index.c install.c installUpgrade.c \
	keymap.c label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
	msg.c network.c nfs.c options.c package.c samba.c system.c \
@


1.52
log
@Do a few things I've been threatening to do for a long time:

1. Don't use the MSDOSFS code for accessing FreeBSD distribution data.
   Use Robert Nordier's stand-alone DOS I/O library for the purpose.
   It this works as well as Robert says it does, it should drastically reduce
   (or even eliminate) our "I can't install from my DOS partition!" calls.

2. As a result of the above, go to stdio file descriptors for all
   media types.

3. Taking advantage of #2, start using libftpio for FTP transfers instead
   of maintaining our own parallel version of the FTP transfer code.
   Yay!  I ripped something out for a change!

#1 Submitted-By: Robert Nordier <rnordier@@iafrica.com>
@
text
@d21 3
a23 1
#CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
@


1.51
log
@Add Joerg's user management screen for David Nugent's pw(8) program, something
which will also need to be brought in before this screen will work.

Add some commentary about how the slip startup code is bogus.

Steal Joerg's loop for more properly closing all files and graft it into
the EHS startup.  My loop was functional but more bogus.
@
text
@d10 2
a11 2
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
	ftp_strat.c globals.c index.c install.c installUpgrade.c \
d16 1
a16 1
	uc_scsi.c
d23 2
a24 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk
@


1.50
log
@Disgusting kludge to make depend rule work again in the fact of
Joerg's keymap.[ch] changes.  If there's a better way, I'd like to know.
@
text
@d14 1
a14 1
	tape.c tcpip.c termcap.c ufs.c variable.c wizard.c \
a24 1

@


1.49
log
@Sysinstall now offers the installation of a keymap early in the game!
Not all mappings are supported, most languages come only with one
encoding since this should be sufficient to get up & running in using
sysinstall, and we are already pretty tight on space.  (My previous
commit has already bumped the boot MFS size by another 50 KB for
this.)

This feature requires the `kbdcontrol -L' i've just committed.  Plain
text keymaps and the entire scanner are overkill for sysinstall.

Also updated the list of available keymaps while i was at it.

Reviewed by:	jkh
@
text
@d3 3
a5 1
CLEANFILES+=	makedevs.c rtermcap dumpnlist
d27 1
a27 1
makedevs.c:	Makefile rtermcap
d56 1
a60 1
CLEANFILES+=	rtermcap rtermcap.tmp makedevs.c
d62 1
a62 2
keymap.o:	keymap.c keymap.h
keymap.h:	Makefile
a74 7
CLEANFILES+=	keymap.tmp keymap.h


testftp:       ftp.c
	cc -o testftp -I../libdisk -DSTANDALONE_FTP ftp.c

CLEANFILES+=	testftp
@


1.48
log
@Get the pysical address for id_maddr when opening an -incore kernel.
This fixes the kernel panic when propagating userconfig changes to
arbitrary kernels.

Remove obsoleted `#include <tcl.h>' added a few <stdio.h> where
necessary.

Fix getting scsi bus information from an -incore kernel.

Turned on SAVE_USERCONFIG by default.
@
text
@d10 1
a10 1
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
d54 23
d79 2
@


1.48.2.1
log
@Merge from HEAD: enable the installation of a keymap early in the game.
@
text
@d10 1
a10 1
	keymap.c label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
a53 23
KEYMAPS= be.iso br275.iso danish.iso fr.iso german.iso it.iso jp.106 \
	norwegian.iso ru.koi8-r spanish.iso swedish.iso \
	swissgerman.iso uk.iso us.dvorak us.iso

CLEANFILES+=	rtermcap rtermcap.tmp makedevs.c

keymap.o:	keymap.c keymap.h
keymap.h:	Makefile
	rm -f keymap.tmp
	for map in ${KEYMAPS} ; do \
		kbdcontrol -L $$map >> keymap.tmp ; \
	done
	echo "static struct keymapInfo keymapInfos[] = {" >> keymap.tmp
	for map in ${KEYMAPS} ; do \
		echo -n '	{ "'$$map'", ' >> keymap.tmp ; \
		echo "&keymap_$$map }," | tr '[-.]' '_' >> keymap.tmp ; \
	done
	( echo "	{ 0 }"; echo "};" ; echo "" ) >> keymap.tmp
	mv keymap.tmp keymap.h

CLEANFILES+=	keymap.tmp keymap.h


a55 2

CLEANFILES+=	testftp
@


1.48.2.2
log
@Merge
@
text
@d3 1
a3 3

CLEANFILES+=	makedevs.c rtermcap rtermcap.tmp dumpnlist
CLEANFILES+=	keymap.tmp keymap.h
d25 1
a25 1
makedevs.c:	Makefile rtermcap keymap.h
a53 1

d58 1
d60 2
a61 1
keymap.h:
d74 7
@


1.48.2.3
log
@Merge with HEAD.
@
text
@d14 1
a14 1
	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
d25 1
@


1.48.2.4
log
@YAMFC, now that I'm happy with sysinstall again.  It should now be safe
to build releases in both 2.2 and 3.0-current.
@
text
@d10 2
a11 2
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c ftp.c \
	globals.c index.c install.c installUpgrade.c \
d16 1
a16 1
	uc_scsi.c keymap.h
d23 2
a24 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
@


1.48.2.5
log
@Merge:
  1.53      +3 -1      src/release/sysinstall/Makefile
  1.36      +1 -2      src/release/sysinstall/main.c
@
text
@d21 1
a21 3
.if defined(LOAD_CONFIG_FILE)
CFLAGS+=	-DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
.endif
@


1.48.2.6
log
@Merge changes from -current for registration screen
(also forgot to mention - fixed a window leak in all clients
of the Layout* code).
@
text
@d10 4
a13 4
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
@


1.48.2.7
log
@Add Iceland to mirror sites.

Add Paul Traina's script loading code.
@
text
@d16 1
a16 1
	uc_scsi.c keymap.h variable_load.c
@


1.48.2.8
log
@XiG now distributes CDE 1.1 with a full X11R6.1 environment; make
more sweeping changes to the USE_XIG_ENVIRONMENT variable handling
to deal with this.
@
text
@a19 1
#CFLAGS+= -DUSE_XIG_ENVIRONMENT
@


1.48.2.9
log
@Turn off userconfig saving for now; something has changed in kernel-land
(since this code certainly hasn't for awhile) which breaks it.
@
text
@d19 1
a19 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS # -DSAVE_USERCONFIG
@


1.48.2.10
log
@Fix cretinous typo and re-enable userconfig saving.
@
text
@d19 1
a19 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
@


1.48.2.11
log
@Merge apache removal changes from -current.
@
text
@d9 1
a9 1
SRCS=	anonFTP.c attr.c cdrom.c command.c config.c devices.c \
@


1.48.2.12
log
@Add BINDIR so that people can install this into /stand.

Is it bogus to replace a crunched binary with a single sysinstall
executable?  Yes.  Is it less bogus than not providing a reasonable
install target so you can tell users where to go and type "make all install"
in order to update sysinstall?  No.  Hence this commit, with reservations.
@
text
@a2 1
BINDIR=/stand
@


1.48.2.13
log
@YAMFC - nuke Samba setup.
@
text
@d14 1
a14 1
	msg.c network.c nfs.c options.c package.c register.c system.c \
@


1.48.2.14
log
@YAMFC - serial console support.
@
text
@a32 3
	./rtermcap ansi | \
		file2c 'const char termcap_ansi[] = {' ',0};' \
		>> makedevs.tmp
@


1.48.2.15
log
@YAMFC
@
text
@d2 1
a2 1
MAN8=	sysinstall.8
@


1.48.2.16
log
@MFC: new dispatch code from Paul Traina
@
text
@d17 1
a17 1
	uc_scsi.c keymap.h
d22 4
@


1.48.2.17
log
@YAMFC: update the keymap menu and built-in keymaps.
@
text
@d59 3
a61 3
KEYMAPS= be.iso br275.iso danish.iso fr.iso german.iso it.iso \
	icelandic.iso jp.106 norwegian.iso ru.koi8-r si.iso spanish.iso \
	swedish.iso swissgerman.iso uk.iso us.dvorak us.iso
d67 1
a67 2
		kbdcontrol -L $$map | \
			sed -e '/^static accentmap_t/,$$d' >> keymap.tmp ; \
@


1.48.2.18
log
@MFC: changes to support crypto/kerberos dists and dispense with
the aged eBones stuff.  Doc fixes also as necessary.
@
text
@d19 1
a19 2
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
CFLAGS+= -I${.CURDIR}/../../sys
@


1.48.2.19
log
@MFC: mouse menu.
@
text
@d13 1
a13 1
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
@


1.48.2.20
log
@MFC: elminate dead XIG #ifdefs.
@
text
@d22 1
@


1.48.2.21
log
@Set NOSHARED - if we do a make install from here, we want the
version in /stand to be static.
@
text
@a2 1

a3 1
NOSHARED=YES
@


1.48.2.22
log
@MFC: go back to using MSDOSFS.
@
text
@d13 1
a13 1
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
@


1.48.2.23
log
@MFC: Lots of bug/doc fixes from 3.0's release cycle.
@
text
@d23 1
a23 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG	# -DDO_SCSI
@


1.47
log
@DTRT if ESC is hit in a Yes/No dialog.
Noticed-by: jfieber
@
text
@d17 1
a17 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS #-DSAVE_USERCONFIG
@


1.46
log
@Sigh.  There are still some weird boundry cases (argh!).  Turn
off SAVE_USERCONFIG again until Eric comes back from his trip.
@
text
@d17 1
a17 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS # -DSAVE_USERCONFIG
@


1.45
log
@Turn SAVE_USERCONFIG on again - I found the bug.
@
text
@d17 1
a17 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG
@


1.44
log
@Multiple changes stacked as one commit since they all depend on one another.

First, change sysinstall and the Makefile rules to not build the kernel
nlist directly into sysinstall now.  Instead, spit it out as an ascii
file in /stand and parse it from sysinstall later.  This solves the chicken-n-
egg problem of building sysinstall into the fsimage before BOOTMFS is built
and can have its symbols extracted.  Now we generate the symbol file in
release.8.

Second, add Poul-Henning's USERCONFIG_BOOT changes.  These have two
effects:

	1. Userconfig is always entered, rather than only after a -c
	   (don't scream yet, it's not as bad as it sounds).

	2. Userconfig reads a message string which can optionally be
	   written just past the boot blocks.  This string "preloads"
	   the userconfig input buffer and is parsed as user input.
	   If the first command is not "USERCONFIG", userconfig will
	   treat this as an implied "quit" (which is why you don't need
	   to scream - you never even know you went through userconfig
	   and back out again if you don't specifically ask for it),
	   otherwise it will read and execute the following commands
	   until a "quit" is seen or the end is reached, in which case
	   the normal userconfig command prompt will then be presented.

  How to create your own startup sequences, using any boot.flp image
from the next snap forward (not yet, but soon):

	% dd of=/dev/rfd0 seek=1 bs=512 count=1 conv=sync <<WAKKA_WAKKA_DOO
USERCONFIG
irq ed0 10
iomem ed0 0xcc000
disable ed1
quit
WAKKA_WAKKA_DOO


Third, add an intro screen to UserConfig so that users aren't just thrown
into this strange screen if userconfig is auto-launched.  The default
boot.flp startup sequence is now, in fact, this:

	USERCONFIG
	intro
	visual

(Since visual never returns, we don't need a following "quit").

Submitted-By: phk & jkh
@
text
@d17 1
a17 1
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS
@


1.43
log
@Add stuff to CLEANFILES.
@
text
@d3 1
a3 1
CLEANFILES+=	makedevs.c rtermcap dumpnlist kern-nlist.h
d25 1
a25 1
makedevs.c:	Makefile rtermcap dumpnlist
a49 5
.if defined(KERNEL_NAME)
	dumpnlist ${KERNEL_NAME} > kern-nlist.h
.else
	dumpnlist /kernel > kern-nlist.h
.endif
@


1.42
log
@Syncronize my tree so Eric can access the latest code.
@
text
@d3 1
a3 1
CLEANFILES+=	makedevs.c rtermcap
@


1.41
log
@First cut at a "copy userconfig changes from installation kernel to installed
kernel" mechanism.  This is just the foundation - more work follows
and will be committed over the next few hours.
Submitted-by: "Eric L. Hernes" <erich@@lodgenet.com> & jkh
@
text
@d13 2
a14 1
	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c uc_scsi.c
d16 2
a17 1
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I/sys -DUC_PRIVATE
d24 2
a25 1
makedevs.c:	Makefile rtermcap
d50 5
@


1.40
log
@Remove some bogosities I introduced with the init file hack (not serious,
just bogus).  Also turn off by default - whoops!
@
text
@d12 2
a13 1
	tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
d15 1
a15 1
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
@


1.39
log
@Various minor improvements.
@
text
@d16 1
a16 1
CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
@


1.38
log
@Make the menu height calculation actually work.
Make a menu more self-explanatory at user request.
@
text
@d16 2
@


1.37
log
@Fixed oops in previous change.
@
text
@d3 1
a3 2
CLEANFILES=	makedevs.c rtermcap
DEBUG_FLAGS+=	-g3
d16 2
a17 2
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD=  -ldialog -lncurses -lmytinfo -lutil -ldisk
@


1.36
log
@Fixed SRCS so that `make depend' works.
@
text
@d9 1
a9 1
	disks.c dispatch.o dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
@


1.35
log
@Have both distribution and package extraction screens display the
transfer speed in KB/sec while fetching stuff; this gives you a better
idea if your link has crashed or is behaving oddly.
@
text
@d9 1
a9 1
	disks.c dispatch dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
@


1.34
log
@Fix some long-standing malloc bugs in the package handling code (freeing garbage
in one place, leaking memory in another).

Add a facility to invoke subsystems directly by naming them on
sysinstall's command-line when running post-install.  A replacement
for pkg_manage might, for example, be `/stand/sysinstall configPackages'

Fix bogon where upgrade shell was entered with tty modes spammed.

Fix bug with release name checking in ftp_strat.  Turned a bunch of
bogus exit()s into proper calls to systemShutdown().
@
text
@d4 1
a4 1
#DEBUG_FLAGS+=	-g3
@


1.33
log
@Fix the last known bogon with the packages menu.  It's SNAP time!
@
text
@d8 2
a9 2
SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c \
	devices.c disks.c dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
@


1.32
log
@Fix an ancient index list bug.
Make FTP re-initializion work.
Fix fix fix.
@
text
@d4 1
a4 1
DEBUG_FLAGS+=	-g3
@


1.31
log
@Move some of functions around in order to make this stuff easier
to work on.
@
text
@d10 4
a13 5
	ftp_strat.c globals.c index.c install.c installFinal.c \
	installUpgrade.c label.c lndir.c main.c makedevs.c media.c \
	menus.c misc.c msg.c network.c nfs.c options.c \
	package.c samba.c system.c tape.c tcpip.c termcap.c ufs.c \
	variable.c wizard.c
@


1.30
log
@Bring this into sync.

I still have a _very very annoying_ display bug which occurs when a menu
item causes a submenu to be displayed - the screen repaints for the original
menu (which is restored upon return from the submenu) are off by about 4
characters.  I've tried restoring the screen, the cursor position, you name
it - same deal.  Grrrr!  This commit is my first step in trying to get someone
else to help me look into this one since I'm just tearing my hair out at this
point!
@
text
@d13 2
a14 1
	package.c system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
@


1.29
log
@1. Update all the copyrights to delete useless clauses 3 and 4.
2. Change more of the menu code over to new system.
3. Streamline label editor.
@
text
@d18 1
a18 1
LDADD=  /usr/src/gnu/lib/libdialog/obj/libdialog.a -lncurses -lmytinfo -lutil -ldisk
@


1.28
log
@Major surgery.

1. Use new dialog menu hacks (no strings, just arrays of dialogMenuItem structs)
   so that I can create composite menus with radio/checkbox/... items in them,
   removing some long-standing UI bogons in various menus.  This work isn't
   finished yet, but will be done in two phases.  This is phase one.

2. Remove all the script installation stuff.  I never got time to document it,
   it was arcane and it just complicated much of the code.  There are better
   ways of doing this if I want to do auto-driven installations later.

3. Remove much dead code and otherwise attempt to remove as much historical
   grot as possible so that this code is easier to hack on.  This is also
   a two-stage process, phase one of which is now complete.
@
text
@d4 1
d18 1
a18 1
LDADD=  -ldialog -lncurses -lmytinfo -lutil -ldisk
@


1.27
log
@sysinstall/Makefile:
Fixed DPADD again.

mk/bsd.README
Don't list the LIBXXX identifiers here.  Describe them better.

mk/bsd.prog.mk
Updated the list of LIBXXX identifiers.
- recently added library libdisk.a wasn't mentioned (required for sysinstall)
- old objects kz*.o weren't mentioned
- old libraries libc_pic.a, libcom_err.a, libf2c.a, libg++.a, libgcc_pic.a,
  libgmp.a, libipx.a, libkeycap.a, libss.a and libxpg4.a weren't mentioned
- old libraries libgnumalloc.a and libftp.a no longer exist
- old library libmp.a was said to not exist
- deprecated links libfl.a and libln.a weren't mentioned
@
text
@d7 1
a7 1
SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
d10 2
a11 2
	installPreconfig.c installUpgrade.c label.c lndir.c main.c \
	makedevs.c media.c menus.c misc.c msg.c network.c nfs.c options.c \
@


1.26
log
@libdisk is now installed as a standard library.
@
text
@d16 1
a16 1
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
@


1.25
log
@Depend on libdisk.a.
@
text
@d14 1
a14 1
CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
d17 1
a17 8
LDADD=  -ldialog -lncurses -lmytinfo -lutil
.if exists(${.CURDIR}/../libdisk/obj)
DPADD+= ${.CURDIR}/../libdisk/obj/libdisk.a
LDADD+= -L${.CURDIR}/../libdisk/obj -ldisk
.else
DPADD+= ${.CURDIR}/../libdisk/libdisk.a
LDADD+= -L${.CURDIR}/../libdisk -ldisk
.endif
@


1.24
log
@Update the -current sources from the 2.1 branch.

Approved (in spirit) by: jkh
@
text
@d16 1
d19 1
d22 1
a24 2

DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL}
@


1.23
log
@This mega-commit brings in Jordan's latest sysinstall version..
This looks like it was developed offline, and is being spammed over the
top of the existing.  "That's fine by me!  I dont really care how you do
it, just get it in there..." said Jordan in a conversation a short while
ago...
@
text
@d7 6
a12 4
SRCS=	attr.c cdrom.c command.c config.c decode.c devices.c disks.c dist.c \
	dmenu.c dos.c floppy.c ftp.c ftp_strat.c globals.c install.c label.c \
	main.c makedevs.c media.c menus.c misc.c msg.c network.c nfs.c system.c tape.c \
	tcpip.c termcap.c ufs.c variable.c wizard.c
d14 1
a14 3

CFLAGS+=	-Wall -I${.CURDIR}/../libdisk \
		-I${.CURDIR}/../../gnu/lib/libdialog
a57 1

@


1.22
log
@Merge RELENG_2_0_5 into HEAD
@
text
@d8 1
a8 1
	dmenu.c dos.c floppy.c ftp.c ftp_strat.c globals.c install.c label.c lang.c \
a24 6
.if exists(${.CURDIR}/../../share/syscons/scrnmaps/obj)
MKSCRNMAP=${.CURDIR}/../../share/syscons/scrnmaps/obj/koi8-r2cp866.mk
.else
MKSCRNMAP=${.CURDIR}/../../share/syscons/scrnmaps/koi8-r2cp866.mk
.endif

a48 16
	uudecode < ${.CURDIR}/../../share/syscons/fonts/iso-8x16.fnt \
		&& file2c 'const u_char font_iso_8x16[] = {' '};' \
		< iso-8x16 >> makedevs.tmp
	rm iso-8x16
	uudecode < ${.CURDIR}/../../share/syscons/fonts/cp850-8x16.fnt \
		&& file2c 'const u_char font_cp850_8x16[] = {' '};' \
		< cp850-8x16 >> makedevs.tmp
	rm cp850-8x16
	uudecode < ${.CURDIR}/../../share/syscons/fonts/cp866-8x16.fnt \
		&& file2c 'const u_char font_cp866_8x16[] = {' '};' \
		< cp866-8x16 >> makedevs.tmp
	rm cp866-8x16
	${MKSCRNMAP} koi8-r2cp866 \
		&& file2c 'const u_char koi8_r2cp866[] = {' '};' \
		< koi8-r2cp866 >> makedevs.tmp
	rm koi8-r2cp866
@


1.22.2.1
log
@Part 2 of the mega-commit.  This syncs the 2.1 and 2.2 trees.  I will move
RELENG_2_1_0 tags to effect the reorg of the directories and files below
the help directory.  (which is why I did it via the HEAD.. cvs cannot add
files to a branch in this version)
@
text
@d8 1
a8 1
	dmenu.c dos.c floppy.c ftp.c ftp_strat.c globals.c install.c label.c \
d25 6
d55 16
@


1.22.2.2
log
@o Completely re-wrote options screen.  Previous one too confusing.
o Allow user to specify blocksize to cpio for tape extract.
o Allow user to chose cpio extraction verbosity level (-V or -v).
o Hopefully stomp the fstab sorting bug once and for all.
o Create termcap file for fixit operation.
o Create spwd.db file for fixit operation.
o Upgrade to XFree86 3.1.2 (and add a few new collections for same).
@
text
@d9 2
a10 2
	main.c makedevs.c media.c menus.c misc.c msg.c network.c nfs.c options.c \
	system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
@


1.22.2.3
log
@Make the release name to load a configurable parameter.
Don't gratuitously shutdown network after NFS or FTP install.
Centralize release version string to one location included by everyone.
Bring in new options screen.
@
text
@d13 2
a14 1
CFLAGS+=	-Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
@


1.22.2.4
log
@Whole mass of changes from first code review.  Eliminate some
long-standing bogons, try to make things more fault tolerant
in general, bring in the first version of my new package installation
menu.
@
text
@d8 1
a8 1
	dmenu.c dos.c floppy.c ftp.c ftp_strat.c globals.c index.c install.c label.c \
@


1.22.2.5
log
@Sync.  Split into more rational package support functions and clients
of those functions.
@
text
@d10 1
a10 1
	package.c system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
@


1.22.2.6
log
@Sync with today's sources:

o Implement the 2.0.5->2.1 upgrade procedure (gah).
o Bring in Coranth's support for configuration of anon ftp and Samba
  plus some changes of my own.
o More attempts to actually write the documentation in english.
o Update docs to contain more 2.1-centric information.
@
text
@d8 4
a11 4
	dmenu.c dos.c floppy.c ftp.c ftp_strat.c globals.c index.c install.c \
	installFinal.c installUpgrade.c label.c main.c makedevs.c media.c \
	menus.c misc.c msg.c network.c nfs.c options.c package.c system.c \
	tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
@


1.22.2.7
log
@Too many bugs fixed to mention.  This code just seems to BREED them.
Many interfaces were also simplified or generally cleaned up in an
attempt to curb this problem.
@
text
@d8 1
a8 1
	dmenu.c doc.c dos.c floppy.c ftp.c ftp_strat.c globals.c index.c install.c \
@


1.22.2.8
log
@Split the preconfiguration code off into its own location.
Make it possible to preconfigure TCP setup.
@
text
@d9 3
a11 3
	installFinal.c installPreconfig.c installUpgrade.c label.c main.c \
	makedevs.c media.c menus.c misc.c msg.c network.c nfs.c options.c package.c \
	system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
@


1.22.2.9
log
@1. Add Coranth Gryphon's Apache WWW server setup screen.
2. Fix an infinite recursion bug in FTP retry.  Tricky, this FTP install!
3. Add messaging routines for scripts.
4. Fix yet more bogons.  I think I'm fixing them faster than they're growing,
   but it's hard to say.  I'm really glad we're throwing this code away for
   2.2!
@
text
@d7 5
a11 6
SRCS=	apache.c attr.c cdrom.c command.c config.c decode.c devices.c \
	disks.c dist.c dmenu.c doc.c dos.c floppy.c ftp.c ftp_strat.c \
	globals.c index.c install.c installFinal.c installPreconfig.c \
	installUpgrade.c label.c main.c makedevs.c media.c menus.c \
	misc.c msg.c network.c nfs.c options.c package.c system.c \
	tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
d13 1
a13 1
CFLAGS+= -Wall -I${.CURDIR}/../libdisk -I${.CURDIR}/../../gnu/lib/libdialog
d57 1
@


1.22.2.10
log
@Lots-o-cleanup(tm):

1. Fix the bogon I introduced that made some root filesystems fail to be
   made with `unable to make filesystem on sd1s1a' or some such error
   message.

2. Latest installment in the never-ending chapter on making FTP do the right
   thing on a cruel internet.

3. Make `express install' a truly express install and split off what it used
   to do into a `novice install' that's even more geared to the novice
   by asking questions in order, rather than forcing them through the menu
   interface.

4. Make anonymous FTP setup truly DTRT.

5. Build lndir directly into sysinstall and make the novice install offer
   to set up the ports tree.  Also make the ports setup truly explanatory
   about what it's doing, and always link the ports destination to /usr/ports
   if necessary so that bsd.port.mk doesn't need to be tweaked.
@
text
@d10 1
a10 1
	installUpgrade.c label.c lndir.c main.c makedevs.c media.c menus.c \
@


1.22.2.11
log
@o Now that Coranth has made the anonymous FTP configuration not use adduser,
  bring it back.
o Simplify the vsystem() call by ripping out a good deal of the extraneous grot.
@
text
@d7 6
a12 6
SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c decode.c \
	devices.c disks.c dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
	ftp_strat.c globals.c index.c install.c installFinal.c \
	installPreconfig.c installUpgrade.c label.c lndir.c main.c \
	makedevs.c media.c menus.c misc.c msg.c network.c nfs.c options.c \
	package.c system.c tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
@


1.22.2.12
log
@libdisk is now standard.
@
text
@d14 1
a14 1
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
d16 6
a21 1
LDADD=  -ldialog -lncurses -lmytinfo -lutil -ldisk
@


1.22.2.13
log
@Update from HEAD
@
text
@a3 1
DEBUG_FLAGS+=	-g3
d7 1
a7 1
SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c \
d9 4
a12 4
	ftp_strat.c globals.c index.c install.c installUpgrade.c \
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
	msg.c network.c nfs.c options.c package.c samba.c system.c \
	tape.c tcpip.c termcap.c ufs.c variable.c wizard.c
a15 1
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
d17 2
@


1.22.2.14
log
@1. Merge latest sysinstall changes.
2. Nuke libdisk from here in preparation for a move to /usr/src/lib, as in
   -current.
3. Remove explicit references to libdisk in Makefile (which will probably
   be merged outright from the HEAD later, but this will do for now).
@
text
@d4 1
a4 1
#DEBUG_FLAGS+=	-g3
@


1.22.2.15
log
@Merge from HEAD.
@
text
@d8 2
a9 2
SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
	disks.c dispatch dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
@


1.22.2.16
log
@Sync from HEAD
@
text
@d4 1
a4 1
DEBUG_FLAGS+=	-g3
@


1.22.2.17
log
@Fix an evil bogon in the Makefile.
@
text
@d9 1
a9 1
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c ftp.c \
@


1.22.2.18
log
@Merge.
@
text
@d3 2
a4 1
CLEANFILES+=	makedevs.c rtermcap
d17 2
a18 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk
@


1.22.2.19
log
@Mondo-merge of new 2.2 installation technology.
@
text
@d3 1
a3 1
CLEANFILES+=	makedevs.c rtermcap dumpnlist
d12 1
a12 3
	tape.c tcpip.c termcap.c ufs.c variable.c wizard.c \
	uc_eisa.c uc_isa.c uc_kmem.c uc_list.c uc_main.c uc_pci.c \
	uc_scsi.c
d14 1
a14 4
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys
CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG

#CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
a17 1

@


1.22.2.20
log
@Merge Makefile fix, an old disks.c fix which somehow didn't get in
and kill the mysterious extra copy of keymap.c appended to itself.
@
text
@d3 1
a3 3

CLEANFILES+=	makedevs.c rtermcap rtermcap.tmp dumpnlist
CLEANFILES+=	keymap.tmp keymap.h
d10 1
a10 1
	keymap.c label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
d25 1
a25 1
makedevs.c:	Makefile rtermcap keymap.h
d54 2
a55 19

KEYMAPS= be.iso br275.iso danish.iso fr.iso german.iso it.iso jp.106 \
	norwegian.iso ru.koi8-r spanish.iso swedish.iso \
	swissgerman.iso uk.iso us.dvorak us.iso


keymap.h:
	rm -f keymap.tmp
	for map in ${KEYMAPS} ; do \
		kbdcontrol -L $$map >> keymap.tmp ; \
	done
	echo "static struct keymapInfo keymapInfos[] = {" >> keymap.tmp
	for map in ${KEYMAPS} ; do \
		echo -n '	{ "'$$map'", ' >> keymap.tmp ; \
		echo "&keymap_$$map }," | tr '[-.]' '_' >> keymap.tmp ; \
	done
	( echo "	{ 0 }"; echo "};" ; echo "" ) >> keymap.tmp
	mv keymap.tmp keymap.h

@


1.22.2.21
log
@It's easier to go forwards than backwards with this, and the RELENG_2_1_0
sysinstall was already broken (I think there's a PR for this somewhere).
This will require some additional changes elsewhere, like bringing in pw.
@
text
@d10 2
a11 2
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c ftp.c \
	globals.c index.c install.c installUpgrade.c \
d14 1
a14 1
	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
d16 1
a16 1
	uc_scsi.c keymap.h
d21 4
a24 3
.if defined(LOAD_CONFIG_FILE)
CFLAGS+=	-DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\"
.endif
a25 2
DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
@


1.22.2.22
log
@Merge all my sysinstall changes over to the 2.1 branch.

I just have this feeling... :)
@
text
@d10 4
a13 4
	disks.c dispatch.c dist.c dmenu.c doc.c dos.c dosio.c floppy.c \
	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
	label.c lndir.c main.c makedevs.c media.c menus.c misc.c \
	msg.c network.c nfs.c options.c package.c register.c samba.c system.c \
@


1.22.2.23
log
@Update from 2.2 branch.  Paul Traina's config changes and Iceland
mirror site.
@
text
@d16 1
a16 1
	uc_scsi.c keymap.h variable_load.c
@


1.22.2.24
log
@Merge changes from 2.2 (not really necessary, but it helps me keep
track of all this).
@
text
@a19 1
#CFLAGS+= -DUSE_XIG_ENVIRONMENT
@


1.21
log
@Make the emergency holographic shell (on VTY4) actually work with job
control and signals and such.  Thanks, Gary!

Clean up some miscellaneous bogons for Poul.
@
text
@d7 1
a7 1
SRCS=	attr.c cdrom.c command.c config.c crc.c decode.c devices.c disks.c dist.c \
d13 1
a13 1
CFLAGS+=	-Wall -g -I${.CURDIR}/../libdisk \
a24 6
.if exists(${.CURDIR}/../../sys/i386/boot/biosboot/obj)
BOOTS=${.CURDIR}/../../sys/i386/boot/biosboot/obj
.else
BOOTS=${.CURDIR}/../../sys/i386/boot/biosboot
.endif

d31 1
a31 1
makedevs.c:	dev2c.sh Makefile rtermcap
a32 1
	mkdir -p dev
a33 8
	cp ${.CURDIR}/../../etc/etc.i386/MAKEDEV dev
	( cd dev; sh ./MAKEDEV all )
	sh ${.CURDIR}/dev2c.sh dev > makedevs.tmp
	rm -rf dev
	uudecode < ${.CURDIR}/bteasy17.uu
	file2c 'const unsigned char boot0[] = {' '};' \
		< bteasy17 >> makedevs.tmp
	rm -rf bteasy17
@


1.21.2.1
log
@Remove -g.
@
text
@d13 1
a13 1
CFLAGS+=	-Wall -I${.CURDIR}/../libdisk \
@


1.21.2.2
log
@Don't make all the devs; we no longer need them.
@
text
@d37 1
a37 1
makedevs.c:	Makefile rtermcap
d39 1
d41 4
@


1.21.2.3
log
@Poul's byte-saving patches.
Submitted by:	phk
@
text
@d25 6
d40 4
@


1.21.2.4
log
@Remove the now-unnecessary crc checking code (for now).
@
text
@d7 1
a7 1
SRCS=	attr.c cdrom.c command.c config.c decode.c devices.c disks.c dist.c \
@


1.20
log
@Commit parts of reorg that were diffs.  Substantially re-engineer the
extraction and mediaGetFTP() handshaking to solve some unexpected complexities.
@
text
@d16 1
a16 1
LDADD=  -ldialog -lncurses -lmytinfo
d23 1
a23 1
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}
@


1.19
log
@Add CRC checking to sysinstall.
Submitted by:	gpalmer
@
text
@d7 5
a11 9
SRCS=	globals.c	main.c		dmenu.c			\
	menus.c		misc.c		msg.c			\
	system.c	install.c	termcap.c		\
	media.c		variable.c	devices.c		\
	dist.c		lang.c		wizard.c		\
	disks.c		command.c	decode.c		\
	label.c		tcpip.c		media_strategy.c	\
	makedevs.c	ftp.c		config.c		\
	crc.c
@


1.18
log
@Makefile:
  Add testftp: target
ftp.c:
  add more debugging output and fix a few more problems
media_strategy:
  make the ftp system actually do something resembling common sense.
  it now works after a fashion, although it soon falls over for some
  reason.
@
text
@d5 1
a5 1
.PATH: ${.CURDIR}/../disklabel
d14 2
a15 1
	makedevs.c	ftp.c		config.c
@


1.17
log
@1. Bring in the first cut of Poul's ftp routines.  We still don't
   use them yet, but it's close (we're working on the last wrinkles
   in the CD install for now).
2. Complete the CDROM installation strategy code.
3. Simplify the distribtuion loading code.
4. General error message cleanup.
5. Write the /etc/fstab file now and split those routines into config.c
6. Clean up the menus a little more.
@
text
@d94 3
@


1.16
log
@1. Fix a pathological bug I introduced in msgInfo().  Right idea, wrong
   implementation.

2. Totally rework device registration.  It's about half the size and
   more powerful now.

3. Add DOS discovery.

4. Start filling in some of the strategy routines.

5. Another clean-up pass over the menus.

6. Make wizard code use Disk typedef.

If I can get the first strategy routine finished tonite, we should have a working
install (from ftp, at least) this weekend.
@
text
@d7 8
a14 8
SRCS=	globals.c	main.c			dmenu.c			\
	menus.c		misc.c			msg.c			\
	system.c	install.c		termcap.c		\
	media.c		variable.c		devices.c		\
	dist.c		lang.c			wizard.c		\
	disks.c		command.c		decode.c		\
	label.c		tcpip.c			media_strategy.c	\
	makedevs.c
@


1.15
log
@1. Incorporate Nickolay's ammended patches for Russian screenmap support
   as per Andrey's letter.  Make a few modifications for correctness.

2. Add Language menu back to first menu - it was too buried in the
   Options menu.

3. Add size information to all distributions.

4. Add a compat20 distribution (we need to make one of these!!  Any takers?  Please?)

Submitted by:	Nickolay N. Dudorov <nnd@@gw.itfs.nsk.su> & jkh
@
text
@d7 8
a14 6
SRCS=	globals.c	main.c		dmenu.c		menus.c	\
	misc.c		msg.c		system.c	install.c \
	termcap.c	makedevs.c	media.c		variable.c \
	devices.c	dist.c		lang.c		wizard.c \
	disks.c		command.c	decode.c	label.c \
	tcpip.c		media_strategy.c
@


1.14
log
@Whoops!  I forgot how uudecode works..  Make it really work here.
@
text
@d32 6
d79 8
a86 4
	uudecode < ${.CURDIR}/../../share/syscons/fonts/koi8-r-8x16.fnt \
		&& file2c 'const u_char font_koi8_r_8x16[] = {' '};' \
		< koi8-r-8x16 >> makedevs.tmp
	rm koi8-r-8x16
@


1.13
log
@1. Use 8x16 fonts.
2. Don't use russian screenmap - apparently not necessary with right font.
3. Dequote bogusly quoted font name in english language setting.
4. Use setterm() and hack around an undesirable side-effect (cbreak is unset).
5. be smarter about setting OnVTY, and use it in cases where it makes sense.
Submitted by:	Nickolay N. Dudorov <nnd@@gw.itfs.nsk.su>
@
text
@d65 12
a76 9
	cat ${.CURDIR}/../../share/syscons/fonts/iso-8x16.fnt | \
		uudecode | file2c 'const u_char font_iso_8x16[] = {' '};' \
		>> makedevs.tmp
	cat ${.CURDIR}/../../share/syscons/fonts/cp850-8x16.fnt | \
		uudecode | file2c 'const u_char font_cp850_8x16[] = {' '};' \
		>> makedevs.tmp
	cat ${.CURDIR}/../../share/syscons/fonts/koi8-r-8x16.fnt | \
		uudecode | file2c 'const u_char font_koi8_r_8x16[] = {' '};' \
		>> makedevs.tmp
@


1.12
log
@Commit my latest so that Gary can sync up - this version should also
be the grounds for our first round of testing in the release I'm rolling.
It doesn't load the distributions yet, but it should do everything else.
@
text
@d65 2
a66 2
	file2c 'const u_char font_iso_8x14[] = {' '};' \
		< ${.CURDIR}/../../share/syscons/fonts/iso-8x14.fnt \
d68 2
a69 2
	file2c 'const u_char font_cp850_8x14[] = {' '};' \
		< ${.CURDIR}/../../share/syscons/fonts/cp850-8x14.fnt \
d71 2
a72 5
	file2c 'const u_char font_koi8_r_8x14[] = {' '};' \
		< ${.CURDIR}/../../share/syscons/fonts/koi8-r-8x14.fnt \
		>> makedevs.tmp
	file2c 'const u_char koi8_r2cp866[] = {' '};' \
		< ${.CURDIR}/../../share/syscons/scrnmaps/koi8-r2cp866 \
@


1.11
log
@This will now compile and even scribble helpfully on your disks.
It remains to be seen how successfully.  The distribution loading code
is still not here yet, but the partition/newfs/mount/cpio-extract cycle
is as complete as it's ever going to get, modulo possible bug fixes.
The TCP/IP setup screen is also sort of here, albeit in a highly-changing
state due to the fact that per-interface information isn't being kept
right now but is being added (thanks, Gary!).
@
text
@d12 1
a12 1
	tcpip.c
a32 5
#	mkdir -p dev
#	cp ${.CURDIR}/../../etc/etc.i386/MAKEDEV dev
#	( cd dev; sh ./MAKEDEV all )
#	sh ${.CURDIR}/dev2c.sh dev > makedevs.tmp
#	rm -rf dev
d34 1
d36 4
@


1.10
log
@This does _not yet compile_; I'm simply bringing in my changes from
this weekend in order to more easily sync with my CVS tree at home.
Another commit relative to these changes will follow shortly.
@
text
@d14 2
a15 1
CFLAGS += -Wall -g -I${.CURDIR}/../libdisk
@


1.9
log
@Fold in all my recent changes.
Do another clean-up pass over this, making the generic menu handler much
more powerful (now handles multiple dispatch).  A few more menus fleshed
out and the beginnings of the distribution handler committed.  Should
be transfering full distributions over in the next commit.
@
text
@d11 2
a12 1
	disks.c		command.c	decode.c
@


1.8
log
@Ok, we should now create all filesystems, mount them and extract the
cpio floppy at this point.
@
text
@d11 1
a11 1
	disks.c		command.c
@


1.7
log
@Make this compile again.  Poul and I need to sync up again.
@
text
@d11 1
a11 1
	disks.c
@


1.6
log
@All the editors are finished.  Now if I can just get a problem with libdisk
fixed, we should be able to fully set up the user's disk.  Still to come
with next commit:  filesystem setup, distribution extraction, final
configuration.
@
text
@a41 4
	file2c 'const unsigned char boot1[] = {' '};' \
		< ${BOOTS}/boot1 >> makedevs.tmp
	file2c 'const unsigned char boot2[] = {' '};' \
		< ${BOOTS}/boot2 >> makedevs.tmp
@


1.5
log
@Everything but the partition editor is done.  This commit is for MBR testing.
@
text
@d7 1
a7 1
SRCS =	globals.c	main.c		dmenu.c		menus.c	\
d15 6
a20 1
LDADD =  -ldialog -lncurses -lmytinfo -L${.CURDIR}/../libdisk -ldisk
d22 1
a22 1
DPADD = ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO}
d37 1
d58 3
d66 12
@


1.4
log
@This will now write MBR entries - should be enough for testing.
@
text
@d10 2
a11 1
	devices.c	dist.c		lang.c
@


1.3
log
@Commit my latest changes before having a nap.  Still not close to done,
nor is it in sync with my working sources, but it leaves me less CVS hassles
to bring in the new files at this time.  Still no documentation to translate
quite yet, but soon.  This stuff is actually very close now.
@
text
@d10 1
a10 1
	devices.c
d30 1
d44 9
@


1.2
log
@Latest raft of changes.

Added another couple of menu item types.

Reshuffled the menus and added a few more.  Sure wish I could figure out
how to initialize a menu with _one_ initializer rather than two! :(
@
text
@d9 6
a14 1
	termcap.c	makedevs.c	media.c
a15 2
CFLAGS += -Wall -g -static
LDADD =  -ldialog -lncurses -lmytinfo
@


1.1
log
@Initial revision
@
text
@d9 1
a9 1
	termcap.c	makedevs.c
d22 5
a26 5
	mkdir -p dev
	cp ${.CURDIR}/../../etc/etc.i386/MAKEDEV dev
	( cd dev; sh ./MAKEDEV all )
	sh ${.CURDIR}/dev2c.sh dev > makedevs.tmp
	rm -rf dev
@


1.1.1.1
log
@Here is my first "framework" commit of the new sysinstall.  There is a LOT
more to come in the next 24 hours, this is just the first stable result of
8 hours of hacking so far.  The specification format for menus is pretty
much hammered out and the beginnings (very humble) of the doc hierarchy
are present for an example.  It should be quite easy to add a lot more
menus quickly to this since I did go somewhat out of my way to make the
framework easy to work with.  This is NOT the glorious semi-graphical
sysinstall (or whatever its name will be) that the install-geeks are working
on, this is simply the "son of sysinstall" I've been promising to write in
the interim for 2.0.5 and 2.1R (super install doesn't come until 2.2R).
@
text
@@
