GD-Graph fuer Maniac eingebaut

Kernel laedt ab jetzt keine Module mehr ungefragt. Nash aktualisiert um richtige Ramdisks zu erstellen (noch unstable). pppsetup.cgi vom Maniac eingefuegt. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@450 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-28 11:43:25 +02:00 · 2007-03-18 21:34:35 +00:00
parent c78a77ebeb
commit 330345c282
21 changed files with 2932 additions and 2227 deletions
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16.42-ipfire
-# Fri Mar 16 12:03:27 2007
+# Sun Mar 18 16:54:28 2007
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -66,7 +66,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_OBSOLETE_MODPARM=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
+# CONFIG_KMOD is not set

 #
 # Block layer
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -67,7 +67,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_OBSOLETE_MODPARM=y
 CONFIG_MODVERSIONS=y
 # CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
+# CONFIG_KMOD is not set
 CONFIG_STOP_MACHINE=y

 #
--- a/config/rootfiles/common/GD-Graph
+++ b/config/rootfiles/common/GD-Graph
@@ -0,0 +1,27 @@
+#usr/lib/perl5/site_perl/5.8.8/GD
+#usr/lib/perl5/site_perl/5.8.8/GD/Graph
+usr/lib/perl5/site_perl/5.8.8/GD/Graph.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/Data.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/Error.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/FAQ.pod
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/area.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/axestype.pm
+#usr/lib/perl5/site_perl/5.8.8/GD/Graph/axestype.pm.orig
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/bars.pm
+#usr/lib/perl5/site_perl/5.8.8/GD/Graph/bars.pm.orig
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/colour.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/hbars.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/lines.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/linespoints.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/mixed.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/pie.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/points.pm
+usr/lib/perl5/site_perl/5.8.8/GD/Graph/utils.pm
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/GD/Graph
+#usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/GD/Graph/.packlist
+#usr/share/man/man3/GD::Graph.3
+#usr/share/man/man3/GD::Graph::Data.3
+#usr/share/man/man3/GD::Graph::Error.3
+#usr/share/man/man3/GD::Graph::FAQ.3
+#usr/share/man/man3/GD::Graph::colour.3
+#usr/share/man/man3/GD::Graph::hbars.3
--- a/config/rootfiles/common/modutils
+++ b/config/rootfiles/common/modutils
@@ -1,8 +1,8 @@
 bin/lsmod
 sbin/depmod
-#sbin/generate-modprobe.conf
+sbin/generate-modprobe.conf
 sbin/insmod
-#sbin/insmod.static
+sbin/insmod.static
 sbin/modinfo
 sbin/modprobe
 sbin/rmmod
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -10,6 +10,7 @@
 * Digest-HMAC-1.01
 * Digest-SHA1-2.10
 * GD-2.35
+* GDGraph-1.4308
 * Geo-IP-PurePerl-1.17
 * HTML-Parser-3.45
 * HTML-Tagset-3.04
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -457,11 +457,10 @@ $checked{'DNS'}{'Manual'} = '';
 $checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'";

 &Header::openpage($Lang::tr{'ppp setup'}, 1, '');
-
 &Header::openbigbox('100%', 'left', '', $errormessage);

 if ($errormessage) {
-	&Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+	&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
 	print "<CLASS name='base'>$errormessage\n";
 	print "&nbsp;</CLASS>\n";
 	&Header::closebox();
@@ -472,13 +471,13 @@ if ($errormessage) {
 ### Box for selecting profile
 ###
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
-&Header::openbox('100%', 'left', $Lang::tr{'profiles'});
+&Header::openbox('100%', 'center', $Lang::tr{'profile'});
 print <<END
-<table width='100%'>
+<table width='95%' cellspacing='0'>
 <tr>
-	<td align='right'>$Lang::tr{'profile'}:</td>
-	<td>
-	<select name='PROFILE'>
+	<td align='left'>$Lang::tr{'profile'}</td>
+	<td align='left'>
+	<select name='PROFILE' style="width: 165px">
 END
 ;
 for ($c = 1; $c <= $maxprofiles; $c++)
@@ -487,21 +486,25 @@ for ($c = 1; $c <= $maxprofiles; $c++)
 }
 print <<END
 	</select></td>
-	<td><input type='submit' name='ACTION' value='$Lang::tr{'select'}' /></td>
-	<td><input type='submit' name='ACTION' value='$Lang::tr{'delete'}' /></td>
-	<td width='30%'><input type='submit' name='ACTION' value='$Lang::tr{'restore'}' /></td>
+	<td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'select'}' /></td>
+	<td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'delete'}' /></td>
+	<td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'restore'}' /></td>
 </tr>
 </table>
+<br></br>
+<hr></hr>
 END
 ;
+
 &Header::closebox();
-&Header::openbox('100%', 'left', $Lang::tr{'connection'}.':');
+&Header::openbox('100%', 'center', $Lang::tr{'connection'});
+
 print <<END
-<table width='100%'>
+<table width='95%' cellspacing='0'>
 <tr>
-	<td align='right'>$Lang::tr{'interface'}:</td>
-	<td>
-	<select name='TYPE'>
+	<td width='25%'>$Lang::tr{'interface'}:</td>
+	<td width='25%'>
+	<select name='TYPE' style="width: 165px">
 	<option value='modem' $selected{'TYPE'}{'modem'}>$Lang::tr{'modem'}</option>
 	<option value='serial' $selected{'TYPE'}{'serial'}>$Lang::tr{'serial'}</option>
 END
@@ -529,32 +532,29 @@ END
 }
 	print <<END
 	<option value='fritzdsl' $selected{'TYPE'}{'fritzdsl'}>Fritz!DSL</option>
-	<option value='pulsardsl' $selected{'TYPE'}{'pulsardsl'}>Pulsar ADSL</option>
-	<option value='bewanadsl' $selected{'TYPE'}{'bewanadsl'}>Bewan ADSL PCI st/USB st</option>
-	<option value='conexantpciadsl' $selected{'TYPE'}{'conexantpciadsl'}>Conexant PCI ADSL</option>
 	</select></td>
-	<td width='50%'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+	<td colspan='2' width='50%'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}'></td>
 	</tr>
 	<tr>
-	<td align='right'>USB:</td>
+	<td colspan='2' width='50%'>USB:</td>
 END
 ;
 if (-f "/proc/bus/usb/devices") {
 	my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`;
 	if ($usb eq '') {
-		print "\t<td>$Lang::tr{'not running'}</td></tr>\n";
+		print "\t<td colspan='2' width='50%'>$Lang::tr{'not running'}</td></tr>\n";
 	} else {
-		print "\t<td>$usb</td></tr>\n";
+		print "\t<td colspan='2' width='50%'>$usb</td></tr>\n";
 	}
 }

 if ($pppsettings{'TYPE'}) {
-	print "</table><table width='100%'>";
+	print "<tr><td colspan='4' width='100%'><br></br></td></tr>";
 	if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/) {
 		print <<END
 <tr>
-	<td align='right'>$Lang::tr{'interface'}:</td>
-	<td><select name='COMPORT'>
+	<td colspan='3' width='75%'>$Lang::tr{'interface'}:</td>
+	<td width='25%'><select name='COMPORT' style="width: 165px">
 END
 ;
 		if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
@@ -576,13 +576,15 @@ END
 		<option value='isdn1' $selected{'COMPORT'}{'isdn1'}>$Lang::tr{'isdn1'}</option>
 		<option value='isdn2' $selected{'COMPORT'}{'isdn2'}>$Lang::tr{'isdn2'}</option>
 	</select></td>
+ </tr>
 END
 ;
 		}
 		if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
 			print <<END
-	<td align='right'>$Lang::tr{'computer to modem rate'}</td>
-	<td><select name='DTERATE'>
+  <tr>
+   <td colspan='3' width='75%'>$Lang::tr{'computer to modem rate'}</td>
+	 <td width='25%'><select name='DTERATE' style="width: 165px">
 		<option value='9600' $selected{'DTERATE'}{'9600'}>9600</option>
 		<option value='19200' $selected{'DTERATE'}{'19200'}>19200</option>
 		<option value='38400' $selected{'DTERATE'}{'38400'}>38400</option>
@@ -594,30 +596,28 @@ END
 </tr>
 END
 ;
-		} else {
-			print "<td colspan='2'>&nbsp;</td></tr>\n";
 		} 
 		if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/ ) {
-			print "<tr><td align='right'>$Lang::tr{'number'}</td>\n";
-			print "<td><input type='text' name='TELEPHONE' value='$pppsettings{'TELEPHONE'}' /></td>\n";
+			print "<tr><td colspan='3' width='75%'>$Lang::tr{'number'}</td>\n";
+			print "<td width='25%'><input type='text' name='TELEPHONE' value='$pppsettings{'TELEPHONE'}'></td><tr>\n";
 			if ($pppsettings{'TYPE'} eq 'modem' ) {
-				print "<td align='right'>$Lang::tr{'modem speaker on'}</td>\n";
-				print "<td><input type='checkbox' name='SPEAKER' $checked{'SPEAKER'}{'on'} /></td></tr>\n";
-			} else {
-				print "<td colspan='2'>&nbsp;</td></tr>\n";
+				print "<tr><td colspan='3' width='75%'>$Lang::tr{'modem speaker on'}</td>\n";
+				print "<td width='25%'><input type='checkbox' name='SPEAKER' $checked{'SPEAKER'}{'on'} /></td></tr>\n";
 			} 
 		}
 	}
 	if ($pppsettings{'TYPE'} eq 'modem') {
 		print <<END
 <tr>
-	<td align='right'>$Lang::tr{'dialing mode'}</td>
-	<td><select name='DIALMODE'>
+	<td colspan='3' width='75%'>$Lang::tr{'dialing mode'}</td>
+	<td width='25%'><select name='DIALMODE' style="width: 165px">
 		<option value='T' $selected{'DIALMODE'}{'T'}>$Lang::tr{'tone'}</option>
 		<option value='P' $selected{'DIALMODE'}{'P'}>$Lang::tr{'pulse'}</option>
 	</select></td>
-	<td align='right'>$Lang::tr{'send cr'}</td>
-	<td><input type='checkbox' name='SENDCR' $checked{'SENDCR'}{'on'} /></td>
+</tr>
+<tr>
+  <td colspan='3' width='75%'>$Lang::tr{'send cr'}</td>
+	<td width='50%'><input type='checkbox' name='SENDCR' $checked{'SENDCR'}{'on'} /></td>
 </tr>
 END
 ; 
@@ -625,41 +625,46 @@ END

 print <<END
 <tr>
-	<td align='right'>$Lang::tr{'idle timeout'}</td>
-	<td><input type='text' size='5' name='TIMEOUT' value='$pppsettings{'TIMEOUT'}' /></td>
-	<td colspan='2'>&nbsp;</td>
+	<td colspan='3' width='75%'>$Lang::tr{'idle timeout'}</td>
+	<td width='25%'><input type='text' name='TIMEOUT' value='$pppsettings{'TIMEOUT'}' /></td>
 </tr>
 END
 ;
 	if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) {
 		$pppsettings{'AUTOCONNECT'} = 'on';
-		print "<tr><td align='right'>$Lang::tr{'connect on ipfire restart'}</td>\n";
-		print "<td><input type='checkbox' disabled='disabled' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'} /></td>\n";
+		print "<tr><td colspan='3' width='75%'>$Lang::tr{'connect on ipfire restart'}</td>\n";
+		print "<td width='25%'><input type='checkbox' disabled='disabled' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'}></td>\n";
 	} else {
-		print "<tr><td align='right'>$Lang::tr{'connect on ipfire restart'}</td>\n";
-		print "<td><input type='checkbox' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'} /></td>\n";
+		print "<tr><td colspan='3' width='75%'>$Lang::tr{'connect on ipfire restart'}</td>\n";
+		print "<td width='25%'><input type='checkbox' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'}></td>\n";
 	}
 print <<END
-	<td align='right'>$Lang::tr{'connection debugging'}:</td>
-	<td><input type='checkbox' name='DEBUG' $checked{'DEBUG'}{'on'} /></td>
+ </tr>
+ <tr>
+  <td colspan='3' width='75%'>$Lang::tr{'connection debugging'}:</td>
+	<td width='25%'><input type='checkbox' name='DEBUG' $checked{'DEBUG'}{'on'} /></td>
+ </tr>
+ <tr>
+  <td colspan='4' width='100%'><br></br></td></tr>
+<tr>
+	<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'reconnection'}:</b></td>
 </tr>
 <tr>
-	<td colspan='5'><br /><hr /><b>$Lang::tr{'reconnection'}:</b></td>
+	<td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='manual' $checked{'RECONNECTION'}{'manual'}>$Lang::tr{'manual'}</td>
 </tr>
 <tr>
-	<td colspan='4'>
-		<input type='radio' name='RECONNECTION' value='manual' $checked{'RECONNECTION'}{'manual'} />$Lang::tr{'manual'}</td>
-</tr>
+	<td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='dialondemand' $checked{'RECONNECTION'}{'dialondemand'}>$Lang::tr{'dod'}</td>
+ </tr>
 END
 ;
 if ($pppsettings{'TYPE'} ne 'isdn') {
 print <<END
-<tr>
-	<td>
-		<input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'} />$Lang::tr{'persistent'}</td>
-	<td colspan='2' align='right'>$Lang::tr{'backupprofile'}:</td>
-	<td>
-	<select name='BACKUPPROFILE'>
+ <tr>
+	<td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
+ </tr>
+ <tr>
+  <td colspan='3' width='75%'>$Lang::tr{'backupprofile'}:</td>
+	<td width='25%'><select name='BACKUPPROFILE' style="width: 165px">
 END
 ;
 	for ($c = 1; $c <= $maxprofiles; $c++) {
@@ -672,34 +677,34 @@ END
 ;
 }
 print <<END
-<tr>
-	<td>
-		<input type='radio' name='RECONNECTION' value='dialondemand' $checked{'RECONNECTION'}{'dialondemand'} />$Lang::tr{'dod'}</td>
-	<td colspan='2' align='right'>$Lang::tr{'dod for dns'}</td>
-	<td><input type='checkbox' name='DIALONDEMANDDNS' $checked{'DIALONDEMANDDNS'}{'on'} /></td>
-
+ <tr>
+	<td colspan='3' width='75%'>$Lang::tr{'dod for dns'}</td>
+  <td width='25%'><input type='checkbox' name='DIALONDEMANDDNS' $checked{'DIALONDEMANDDNS'}{'on'} /></td>
 </tr>
 <tr>
-	<td align='right'>$Lang::tr{'holdoff'}:</td>
-	<td><input type='text' size='5' name='HOLDOFF' value='$pppsettings{'HOLDOFF'}' /></td>
-	<td align='right'>$Lang::tr{'maximum retries'}</td>
-	<td><input type='text' size='5' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
+	<td colspan='3' width='75%'>$Lang::tr{'holdoff'}:</td>
+	<td width='25%'><input type='text' name='HOLDOFF' value='$pppsettings{'HOLDOFF'}' /></td>
+</tr>
+<tr>
+	<td colspan='3' width='75%'>$Lang::tr{'maximum retries'}</td>
+	<td width='25%'><input type='text' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
 </tr>
 END
 ;

 if ($pppsettings{'TYPE'} eq 'isdn') {
 	print <<END
-</table>
-<table width='100%'>
+<tr><td colspan='4' width='100%'><br></br></td></tr>
 <tr>
-	<td colspan='5'><br /><hr /><b>$Lang::tr{'isdn settings'}</b></td>
+	<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'isdn settings'}</b></td>
 </tr>
 <tr>
-	<td align='right'>$Lang::tr{'use ibod'}</td>
-	<td><input type='checkbox' name='USEIBOD' $checked{'USEIBOD'}{'on'} /></td>
-	<td align='right'>$Lang::tr{'use dov'}</td>
-	<td><input type='checkbox' name='USEDOV' $checked{'USEDOV'}{'on'} /></td>
+	<td colspan='3' width='75%'>$Lang::tr{'use ibod'}</td>
+	<td width='25%'><input type='checkbox' name='USEIBOD' $checked{'USEIBOD'}{'on'} /></td>
+</tr>
+<tr>
+	<td colspan='3' width='75%'>$Lang::tr{'use dov'}</td>
+	<td width='25%'><input type='checkbox' name='USEDOV' $checked{'USEDOV'}{'on'} /></td>
 </tr>
 END
 ;
@@ -708,29 +713,24 @@ END
 if ($pppsettings{'TYPE'} eq 'pptp')
 {
 print <<END
-</table>
-
-<table width='100%'>
+<tr><td colspan='4' width='100%'><br></br></td></tr>
 <tr>
-	<td colspan='5'><br /><hr /><b>$Lang::tr{'pptp settings'}</b></td>
+	<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'pptp settings'}</b></td>
 </tr>
 <tr>
-	<td colspan='2' align='right'>$Lang::tr{'phonebook entry'}</td>
-	<td><input type='text' name='PHONEBOOK' value='$pppsettings{'PHONEBOOK'}' /></td>
+	<td width='25%'>$Lang::tr{'phonebook entry'}</td>
+	<td colspan='2' width='50%'></td>
+	<td width='25%'><input type='text' name='PHONEBOOK' value='$pppsettings{'PHONEBOOK'}' /></td>
 </tr>
 <tr>
-	<td><input type='radio' name='METHOD' value='STATIC' $checked{'METHOD'}{'STATIC'} />$Lang::tr{'static ip'}</td>
-	<td align='right'>$Lang::tr{'router ip'}</td>
-	<td><input type='text' name='ROUTERIP' value='$pppsettings{'ROUTERIP'}' /></td>
+	<td width='25%'><input type='radio' name='METHOD' value='STATIC' $checked{'METHOD'}{'STATIC'} />$Lang::tr{'static ip'}</td>
+	<td colspan='2' width='50%'>$Lang::tr{'router ip'}</td>
+	<td width='25%'><input type='text' name='ROUTERIP' value='$pppsettings{'ROUTERIP'}' /></td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td colspan='3'><hr /></td>
-</tr>
-<tr>
-	<td><input type='radio' name='METHOD' value='DHCP' $checked{'METHOD'}{'DHCP'} />$Lang::tr{'dhcp mode'}</td>
-	<td align='right'>$Lang::tr{'hostname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td><input type='text' name='DHCP_HOSTNAME' value='$pppsettings{'DHCP_HOSTNAME'}' /></td>
+	<td width='25%'><input type='radio' name='METHOD' value='DHCP' $checked{'METHOD'}{'DHCP'} />$Lang::tr{'dhcp mode'}</td>
+	<td colspan='2' width='50%'>$Lang::tr{'hostname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
+	<td width='25%'><input type='text' name='DHCP_HOSTNAME' value='$pppsettings{'DHCP_HOSTNAME'}' /></td>
 </tr>
 END
 ;
@@ -738,180 +738,59 @@ END
 if ($pppsettings{'TYPE'} eq 'pppoe')
 {
 print <<END
-</table>
-<table width='100%'>
+<tr><td colspan='4' width='100%'><br></br></td></tr>
 <tr>
-	<td colspan='5'><br /><hr /><b>$Lang::tr{'pppoe settings'}</b></td>
-</tr>
-END
-;
-}
-if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/)
-{
-
-print <<END
-</table>
-<table width='100%'>
-<tr>
-	<td colspan='5'><br /><hr /><b>$Lang::tr{'adsl settings'}:</b></td>
+	<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'pppoe settings'}</b></td>
 </tr>
 <tr>
-	<td nowrap='nowrap' align='right'>$Lang::tr{'vpi number'}</td>
-	<td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td>
-	<td align='right'>$Lang::tr{'vci number'}</td>
-	<td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
+	<td width='25%'><input type='radio' name='METHOD' value='PPPOE_PLUGIN' $checked{'METHOD'}{'PPPOE_PLUGIN'} />PPPoE plugin</td>
+	<td colspan='2' width='50%'>$Lang::tr{'service name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+	<td width='25%'><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td colspan='4'><hr /></td>
-</tr>
-END
-;
-}
-if ($pppsettings{'TYPE'} eq 'bewanadsl')
-{
-print <<END
-<tr>
-	<td align='right'>$Lang::tr{'modem'}:</td>
-	<td colspan='2' nowrap='nowrap'>
-		<input type='radio' name='MODEM' value='PCIST' $checked{'MODEM'}{'PCIST'} />Bewan ADSL PCI st</td>
-	<td colspan='2'><input type='radio' name='MODEM' value='USB' $checked{'MODEM'}{'USB'} />Bewan ADSL USB st</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td colspan='4'><hr /></td>
-</tr>
-END
-;
-}
-if ($pppsettings{'TYPE'} =~ /^(3cp4218usbadsl|bewanadsl)$/)
-{
-print <<END
-<tr>
-	<td align='right'>$Lang::tr{'modulation'}:</td>
-	<td><input type='radio' name='MODULATION' value='AUTO' $checked{'MODULATION'}{'AUTO'} />$Lang::tr{'automatic'}</td>
-	<td><input type='radio' name='MODULATION' value='ANSI' $checked{'MODULATION'}{'ANSI'} />ANSI T1.483</td>
-	<td><input type='radio' name='MODULATION' value='GDMT' $checked{'MODULATION'}{'GDMT'} />G.DMT</td>
-	<td><input type='radio' name='MODULATION' value='GLITE' $checked{'MODULATION'}{'GLITE'} />G.Lite</td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td colspan='4'><hr /></td>
+	<td width='25%'><input type='radio' name='METHOD' value='PPPOE' $checked{'METHOD'}{'PPPOE'} />$Lang::tr{'pppoe'}</td>
+	<td colspan='2' width='50%'>$Lang::tr{'concentrator name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+	<td width='25%'><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
 </tr>
 END
 ;
 }

-if ($pppsettings{'TYPE'} eq 'eagleusbadsl')
+if ($pppsettings{'TYPE'} eq 'fritzdsl')
 {
 print <<END
+<tr><td colspan='4' width='100%'><br></br></td></tr>
 <tr>
-	<td align='right'>$Lang::tr{'country'}:</td>
-	<td>
-	<select name='LINE'>
-	<option value='WO' $selected{'LINE'}{'WO'}>$Lang::tr{'other countries'}</option>
-	<option value='ES' $selected{'LINE'}{'ES'}>ESPANA</option>
-	<option value='ES03' $selected{'LINE'}{'ES03'}>ESPANA03</option>
-	<option value='FR' $selected{'LINE'}{'FR'}>FRANCE</option>
-	<option value='FR04' $selected{'LINE'}{'FR04'}>FRANCE04</option>
-	<option value='FR10' $selected{'LINE'}{'FR04'}>FRANCE10</option>
-	<option value='IT' $selected{'LINE'}{'IT'}>ITALIA</option>
-	</select></td>
+	<td colspan='4' width='100%' bgcolor='${Header::table1colour}'><b>$Lang::tr{'adsl settings'}:</b></td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td colspan='4'><hr /></td>
-</tr>
-END
-;
-}
-if ($pppsettings{'TYPE'} eq 'eciadsl')
-{
-print <<END
-<tr>
-	<td align='right'>$Lang::tr{'modem'}:</td>
-	<td colspan='5'>
-		<select name='MODEM'>
-END
-;
-		open (MODEMS, "/etc/eciadsl/modems.db") or die 'Unable to open modems database.';
-		while (my $line = <MODEMS>) {
-			$line =~ /^([\S\ ]+).*$/;
-			my $modem = $1;
-			$modem =~ s/^\s*(.*?)\s*$/$1/;
-			print "<option value='$modem'";
-			if ($pppsettings{'MODEM'} =~ /$modem/) { print " selected";}
-			print ">$modem</option>\n";
-		}
-		close (MODEMS);
-
-print <<END
-		</select>
-	</td>
+	<td colspan='2' width='50%'>$Lang::tr{'vpi number'}</td>
+	<td colspan='2' width='50%'><input type='text' name='VPI' value='$pppsettings{'VPI'}' /></td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td colspan='4'><hr /></td>
+	<td colspan='2' width='50%'>$Lang::tr{'vci number'}</td>
+	<td colspan='2' width='50%'><input type='text' name='VCI' value='$pppsettings{'VCI'}' /></td>
 </tr>
-END
-;
-}
-if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/)
-{
-print <<END
 <tr>
-	<td valign='top' align='right'>$Lang::tr{'protocol'}:</td>
-	<td nowrap='nowrap'>
-		<input type='radio' name='PROTOCOL' value='RFC2364' $checked{'PROTOCOL'}{'RFC2364'} />RFC2364 PPPoA</td>
-END
-;
-}
-if ($pppsettings{'TYPE'} eq 'alcatelusb')
-{
-	print "<td colspan=3>&nbsp;</td></tr>";
-}
-
-if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl|fritzdsl)$/)
-{
-print <<END
-	<td align='right'>$Lang::tr{'encapsulation'}:</td>
-	<td colspan='2' width='30%'>
-		<select name='ENCAP_RFC2364'>
+	<td colspan='2' width='50%'>$Lang::tr{'protocol'}:</td>
+	<td colspan='2' width='50%'><input type='radio' name='PROTOCOL' value='RFC2364' $checked{'PROTOCOL'}{'RFC2364'} />RFC2364 PPPoA</td>
+ </tr>
+ 	<td colspan='2' width='50%'></td>
+	<td colspan='2' width='50%'><input type='radio' name='PROTOCOL' value='RFC1483' $checked{'PROTOCOL'}{'RFC1483'} />RFC 1483 / 2684</td>
+ </tr>
+ <tr>		
+	<td colspan='2' width='50%'>$Lang::tr{'encapsulation'}:</td>
+	<td colspan='2' width='50%'>
+		<select name='ENCAP_RFC2364' style="width: 165px">
 		<option value='0' $selected{'ENCAP'}{'0'}>VCmux</option>
 		<option value='1' $selected{'ENCAP'}{'1'}>LLC</option>
 		</select>
 	</td>
 </tr>
-END
-;
-}
-if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/)
-{
-print <<END
 <tr>
-	<td>&nbsp;</td>
-	<td colspan='4'><hr /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td valign='top'>
-		<input type='radio' name='PROTOCOL' value='RFC1483' $checked{'PROTOCOL'}{'RFC1483'} />RFC 1483 / 2684</td>
-END
-;
-}
-if ($pppsettings{'TYPE'} eq 'alcatelusb')
-{
-	print "<td colspan='3'>&nbsp;</td></tr>";
-}
-
-if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl|fritzdsl)$/)
-{
-	if ($pppsettings{'TYPE'} ne 'fritzdsl')
-	{
-print <<END
-	<td align='right'>$Lang::tr{'encapsulation'}:</td>
-	<td colspan='2'>
-		<select name='ENCAP_RFC1483'>
+	<td colspan='2' width='50%'>$Lang::tr{'encapsulation'}:</td>
+	<td colspan='2' width='50%'>
+		<select name='ENCAP_RFC1483' style="width: 165px">
 		<option value='0' $selected{'ENCAP'}{'0'}>BRIDGED_ETH_LLC</option>
 		<option value='1' $selected{'ENCAP'}{'1'}>BRIDGED_ETH_VC</option>
 		<option value='2' $selected{'ENCAP'}{'2'}>ROUTED_IP_LLC</option>
@@ -919,138 +798,29 @@ print <<END
 		</select>
 	</td>
 </tr>
-<tr>
-	<td colspan='2'>&nbsp;</td>
-	<td colspan='3'><hr /></td>
-</tr>
 END
 ;
-	} else {
-print <<END
-	<td colspan='4'>PPPoE</td>
-</tr>
-END
-;
-	}
-}
-if ($pppsettings{'TYPE'} =~ /^(pppoe|alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl)$/)
-{
-print <<END
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td><input type='radio' name='METHOD' value='PPPOE_PLUGIN' $checked{'METHOD'}{'PPPOE_PLUGIN'} />PPPoE plugin</td>
-	<td align='right'>$Lang::tr{'service name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td><input type='radio' name='METHOD' value='PPPOE' $checked{'METHOD'}{'PPPOE'} />$Lang::tr{'pppoe'}</td>
-	<td align='right'>$Lang::tr{'concentrator name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
-</tr>
-
-END
-;
-}
-if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl)$/)
-{
-print <<END
-<tr>
-	<td colspan='2'>&nbsp;</td>
-	<td colspan='3'><hr /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td rowspan='4'><input type='radio' name='METHOD' value='STATIC' $checked{'METHOD'}{'STATIC'} />$Lang::tr{'static ip'}</td>
-	<td align='right'>$Lang::tr{'static ip'}:</td>
-	<td><input type='text' size='16' name='IP' value='$pppsettings{'IP'}' /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td align='right'>$Lang::tr{'gateway ip'}:</td>
-	<td><input type='text' size='16' name='GATEWAY' value='$pppsettings{'GATEWAY'}' /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td align='right'>$Lang::tr{'netmask'}:</td>
-	<td><input type='text' size='16' name='NETMASK' value='$pppsettings{'NETMASK'}' /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td align='right' nowrap='nowrap'>$Lang::tr{'broadcast'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td><input type='text' size='16' name='BROADCAST' value='$pppsettings{'BROADCAST'}' /></td>
-</tr>
-END
-;
-	if ($pppsettings{'TYPE'} =~ /^(eciadsl|eagleusbadsl)$/)
-	{
-print <<END
-<tr>
-	<td colspan='2'>&nbsp;</td>
-	<td colspan='3'><hr /></td>
-</tr>
-<tr>
-	<td>&nbsp;</td>
-	<td>&nbsp;</td>
-	<td><input type='radio' name='METHOD' value='DHCP' $checked{'METHOD'}{'DHCP'} />$Lang::tr{'dhcp mode'}</td>
-	<td align='right'>$Lang::tr{'hostname'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td><input type='text' name='DHCP_HOSTNAME' value='$pppsettings{'DHCP_HOSTNAME'}' /></td>
-</tr>
-END
-;
-	}
-}
-if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|eciadsl|fritzdsl)$/) {
-	print "<tr><td>&nbsp;</td><td colspan='4'><hr /></td></tr>";
-}
-if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk)$/) {
-	my $speedtouch = &Header::speedtouchversion;
-	if (($speedtouch >= 0) && ($speedtouch <=4)) {
-		my $modem;
-		if ($speedtouch ==4) { $modem='v4_b'; } else { $modem='v0123'; }
-		print "<tr><td align='right'>$Lang::tr{'firmware'}:</td>";
-		if (-e "${General::swroot}/alcatelusb/firmware.$modem.bin") {
-			print "<td>$Lang::tr{'present'}</td><td colspan='3'>&nbsp;</td></tr>\n";
-		} else {
-			print "<td>$Lang::tr{'not present'}</td><td colspan='3'>&nbsp;</td></tr>\n";
-		}
-	} else {
-		print "<tr><td colspan='5'>$Lang::tr{'unknown'} Rev $speedtouch</td></tr>";
-	}
-} elsif ($pppsettings{'TYPE'} eq 'eciadsl') {
-	print "<tr><td align='right'>$Lang::tr{'driver'}:</td>";
-	if (-e "${General::swroot}/eciadsl/synch.bin") {
-		print "<td>$Lang::tr{'present'}</td><td colspan='3'>&nbsp;</td></tr>\n";
-	} else {
-		print "<td>$Lang::tr{'not present'}</td><td colspan='3'>&nbsp;</td></tr>\n"; }
-} elsif ($pppsettings{'TYPE'} eq 'fritzdsl') {
-	print "<tr><td align='right'>$Lang::tr{'driver'}:</td>";
+	print "<tr><td colspan='2' width='50%'>$Lang::tr{'driver'}:</td>";
 	if (-e "/lib/modules/$kernel/misc/fcdslusb.o.gz") {
-		print "<td>$Lang::tr{'present'}</td><td colspan='3'>&nbsp;</td></tr>\n";
+		print "<td colspan='2' width='50%'>$Lang::tr{'present'}</td></tr>";
 	} else {
-		print "<td>$Lang::tr{'not present'}</td><td colspan='3'>&nbsp;</td></tr>\n"; }
+		print "<td colspan='2' width='50%'>$Lang::tr{'not present'}</td></tr>"; }
 }
+
 print <<END
-</table>
-<table width='100%'>
+<tr><td colspan='4' width='100%'><br></br></td></tr>
 <tr>
-	<td colspan='5'><br /><hr /><b>$Lang::tr{'authentication'}</b></td>
+	<td bgcolor='${Header::table1colour}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
 </tr>
 <tr>
-	<td align='right'>$Lang::tr{'username'}</td>
-	<td><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td>
-	<td align='right'>$Lang::tr{'password'}</td>
-	<td><input type='password' name='PASSWORD' value='$pppsettings{'PASSWORD'}' /></td>
+	<td width='25%'>$Lang::tr{'username'}</td>
+	<td width='25%'><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td>
+	<td width='25%'>$Lang::tr{'password'}</td>
+	<td width='25%'><input type='password' name='PASSWORD' value='$pppsettings{'PASSWORD'}' /></td>
 </tr>
 <tr>
-	<td align='right'>$Lang::tr{'method'}</td>
-	<td><select name='AUTH'>
+	<td width='25%'>$Lang::tr{'method'}</td>
+	<td width='25%'><select name='AUTH' style="width: 165px">
 		<option value='pap-or-chap' $selected{'AUTH'}{'pap-or-chap'}>$Lang::tr{'pap or chap'}</option>
 		<option value='pap' $selected{'AUTH'}{'pap'}>PAP</option>
 		<option value='chap' $selected{'AUTH'}{'chap'}>CHAP</option>
@@ -1066,39 +836,37 @@ END
 }
 print <<END
 	</select></td>
-	<td align='right'>$Lang::tr{'script name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td nowrap='nowrap'><input type='text' name='LOGINSCRIPT' value='$pppsettings{'LOGINSCRIPT'}' /></td>
+	<td width='25%'>$Lang::tr{'script name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
+	<td width='25%'><input type='text' name='LOGINSCRIPT' value='$pppsettings{'LOGINSCRIPT'}' /></td>
 </tr>
-</table>
-<table width='100%'>
+<tr><td colspan='4' width='100%'><br></br></td></tr>
 <tr>
-	<td colspan='5'><br /><hr /><b>DNS:</b></td>
+	<td bgcolor='${Header::table1colour}' colspan='4' width='100%'><b>DNS:</b></td>
 </tr>
 <tr>
-	<td colspan='5'><input type='radio' name='DNS' value='Automatic' $checked{'DNS'}{'Automatic'} />$Lang::tr{'automatic'}</td>
+	<td colspan='4' width='100%'><input type='radio' name='DNS' value='Automatic' $checked{'DNS'}{'Automatic'} />$Lang::tr{'automatic'}</td>
 </tr>
 <tr>
-	<td><input type='radio' name='DNS' value='Manual' $checked{'DNS'}{'Manual'} />$Lang::tr{'manual'}</td>
-	<td align='right'>$Lang::tr{'primary dns'}</td>
-	<td><input type='text' size='16' name='DNS1' value='$pppsettings{'DNS1'}' /></td>
-	<td align='right'>$Lang::tr{'secondary dns'}</td>
-	<td><input type='text' size='16' name='DNS2' value='$pppsettings{'DNS2'}' /></td>
+	<td colspan='4' width='100%'><input type='radio' name='DNS' value='Manual' $checked{'DNS'}{'Manual'} />$Lang::tr{'manual'}</td>
 </tr>
 <tr>
-	<td colspan='5'><br /><hr /></td>
+	<td width='25%'>$Lang::tr{'primary dns'}</td>
+	<td width='25%'><input type='text' name='DNS1' value='$pppsettings{'DNS1'}'></td>
+	<td width='25%'>$Lang::tr{'secondary dns'}</td>
+	<td width='25%'><input type='text' name='DNS2' value='$pppsettings{'DNS2'}'></td>
+</tr>
+<tr><td colspan='4' width='100%'><br></br><hr></hr><br></br></td></tr>
+<tr>
+	<td width='25%'>$Lang::tr{'profile name'}</td>
+	<td width='25%'><input type='text' name='PROFILENAME' value='$pppsettings{'PROFILENAME'}'>
+	<td colspan='2' width='50%'></td>
 </tr>
 <tr>
-	<td>&nbsp;</td>
-	<td align='right'>$Lang::tr{'profile name'}</td>
-	<td><input type='text' name='PROFILENAME' value='$pppsettings{'PROFILENAME'}' /></td>
-	<td><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
+  <td align='center' colspan='4' width='100%'><input type='submit' name='ACTION' value='$Lang::tr{'save'}'></td>
 </tr>
 <tr>
-	<td colspan='5'><br /><hr /></td>
-</tr>
-<tr>
-	<td align='right'>$Lang::tr{'legend'}:</td>
-	<td><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
+	<td colspan='2' width='50%'>$Lang::tr{'legend'}:</td>
+	<td colspan='2' width='50%'><img src='/blob.gif' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
 </tr>
 </table>
 END
--- a/lfs/GD-Graph
+++ b/lfs/GD-Graph
@@ -0,0 +1,79 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.4308
+
+THISAPP    = GDGraph-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = fcdd34d5e09ae917b5d264887734b3b1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && perl Makefile.PL
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -73,9 +73,9 @@ $(TARGET) :
 	depmod -a -F /boot/System.map-$(KVER)-ipfire-smp $(KVER)-ipfire-smp

 	cd / && tar -cvf /tmp/drivers.tar \
-		--exclude=lib/modules/$(KVER)-ipfire/kernel/{arch,fs} \
-		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,hwmon,ide} \
-		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{ieee1394,isdn,mmc,scsi,md,video} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/{arch,crypto} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{acpi,atm,bluetooth,block,char,cdrom,connector,cpufreq,hwmon,ide} \
+		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/{ieee1394,isdn,mmc,md,parport,video} \
 		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/net/{wan,ppp*,slip*,slhc*,tun*,wireless} \
 		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{atm,input,storage,host} \
 		--exclude=lib/modules/$(KVER)-ipfire/kernel/drivers/usb/{3cp4218.ko,acm.ko,amedyn.ko,cxacru.ko} \
@@ -87,10 +87,6 @@ $(TARGET) :
 	cd /install/initrd/ && tar -xvf /tmp/drivers.tar && rm -f /tmp/drivers.tar

 	# Extra modules
-	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/scsi
-	cp -af /lib/modules/$(KVER)-ipfire/kernel/drivers/scsi/*.ko \
-		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/scsi/
-
 	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage
 	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/*.ko \
 		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/storage/
@@ -107,10 +103,6 @@ $(TARGET) :
 	cp -f /lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core/*.ko \
 		/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/usb/core

-	# File system
-	-mkdir -p /install/initrd/lib/modules/$(KVER)-ipfire/kernel/fs
-	cp -rf /lib/modules/$(KVER)-ipfire/kernel/fs/* /install/initrd/lib/modules/$(KVER)-ipfire/kernel/fs
-
 	cp -f /lib/modules/$(KVER)-ipfire/modules.* /install/initrd/lib/modules/$(KVER)-ipfire

 	cp /opt/$(MACHINE)-uClibc/lib/libgcc_s.so.1 /install/initrd/lib/
--- a/make.sh
+++ b/make.sh
@@ -393,6 +393,7 @@ buildipfire() {
  ipfiremake ez-ipupdate
  ipfiremake fcron
  ipfiremake GD
+  ipfiremake GD-Graph
  ipfiremake gnupg
  ipfiremake hdparm
  ipfiremake ibod
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -128,7 +128,6 @@ int main(int argc, char *argv[])
 		}
 	}

-	// make some beeps before wiping the system :)
 	if (unattended) {
 	    runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
 	}
@@ -165,8 +164,7 @@ int main(int argc, char *argv[])
 		rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
 			50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
 			ctr[TR_CANCEL], NULL);
-	}
-	else {
+	} else {
 	    rc = 1;
 	    installtype = CDROM_INSTALL;
 	}
@@ -179,7 +177,6 @@ int main(int argc, char *argv[])

 	/* CDROM INSTALL */
 	if (installtype == CDROM_INSTALL) {
-
 		switch (mysystem("/bin/mountsource.sh")) {
 		    case 0:
 			installtype = CDROM_INSTALL;
@@ -215,7 +212,7 @@ int main(int argc, char *argv[])
 			goto EXIT;
 		}

-		/* Check for ipcop-<VERSION>.tbz2 */
+		/* Check for ipfire-<VERSION>.tbz2 */
 		if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
 			errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
 			goto EXIT;
@@ -527,30 +524,6 @@ int main(int argc, char *argv[])
 	mysystem("/bin/mount -t proc none /harddisk/proc");
 	mysystem("/bin/mount --bind /dev /harddisk/dev");

-
-	/* if we detected SCSI then fixup */
-	/* doesn't really work cause it sometimes creates a ramdisk on ide systems */
-/*	mysystem("/bin/probecntrl.sh");
-	if ((handle = fopen("/cntrldriver", "r")))
-	{
-		char *driver;
-			fgets(line, STRING_SIZE-1, handle);
-			fclose(handle);
-		line[strlen(line) - 1] = 0;
-		driver = strtok(line, ".");
-		fprintf(flog, "Detected SCSI driver %s\n",driver);
-		if (strlen(driver) > 1) {
-			fprintf(flog, "Fixing up ipfirerd.img\n");
-			mysystem("/sbin/chroot /harddisk /sbin/modprobe loop");
-			mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-			snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
-			runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-			snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
-			runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-			mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
-		}
-	} */
-
 	/* Build cache lang file */
 	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
 	if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_LANG_CACHE]))
@@ -559,6 +532,29 @@ int main(int argc, char *argv[])
 		goto EXIT;
 	}

+	/* Update /etc/fstab */
+	replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
+
+	/* if we detected SCSI/USB then fixup */
+	mysystem("/bin/probecntrl.sh");
+	if ((handle = fopen("/tmp/cntrldriver", "r")))
+	{
+		char *driver;
+		fgets(line, STRING_SIZE-1, handle);
+		fclose(handle);
+		line[strlen(line) - 1] = 0;
+		driver = strtok(line, ".");
+		if (strlen(driver) > 1) {
+			fprintf(flog, "Fixing up ipfirerd.img\n");
+			mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
+			snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd.img %s-ipfire", driver, KERNEL_VERSION);
+			runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+			snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd-smp.img %s-ipfire-smp", driver, KERNEL_VERSION);
+			runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+			mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
+		}
+	}
+
 	if (raid_disk)
 		sprintf(string, "root=%sp3", hdparams.devnode);
 	else
@@ -576,9 +572,6 @@ int main(int argc, char *argv[])
 		goto EXIT;
 	}

-	/* Update /etc/fstab */
-	replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
-
 	/* Install bootsplash */
 	mysystem("/bin/installbootsplash.sh");

--- a/src/install+setup/install/probecntrl.sh
+++ b/src/install+setup/install/probecntrl.sh
@@ -1,13 +1,19 @@
 #!/bin/sh

-echo "Probing for SCSI controllers"
-MODULE=`/bin/kudzu -qps  -t 30 -c SCSI | grep driver | cut -d ' ' -f 2 | sort | uniq`
+echo "Probing for storage controllers"
+for MODULE in $(hwinfo --usb --usb-ctrl --storage-ctrl | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do
+    if [ "${MODULE}" = "piix" ]; then
+        continue
+    fi
+    if grep -Eqe "^${MODULE} " /proc/modules; then
+        MODULES="${MODULES} --with=${MODULE}"
+        echo "Found: ${MODULE}"
+    fi
+done

-if [ "$MODULE" ]; then
-	echo $MODULE > /tmp/cntrldriver
-	echo "Your controller is: $MODULE"
+if [ -z "${MODULES}" ]; then
+	exit 1
+else
+	echo "${MODULES}" > /tmp/cntrldriver
 	exit 0
 fi
-
-echo "No SCSI controller found"
-exit 1
--- a/src/install+setup/install/unattended.c
+++ b/src/install+setup/install/unattended.c
@@ -15,7 +15,7 @@
 * along with IPFire; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 *
- * Copyright 2002: Mark Wormgoor <mark@wormgoor.com>
+ * Copyright 2007: Michael Tremer for www.ipfire.org
 * 
 */

--- a/src/install+setup/install/usb.c
+++ b/src/install+setup/install/usb.c
@@ -29,6 +29,7 @@ int initialize_usb() {
    mysystem("/sbin/modprobe sd_mod");
    mysystem("/sbin/modprobe sr_mod");
    mysystem("/sbin/modprobe usb-storage");
+    mysystem("/sbin/modprobe vfat");

    if (ehcihcd) {
    	mysystem("/sbin/rmmod ehci-hcd");
@@ -51,7 +52,7 @@ int initialize_usb() {
    	usbuhci = 1;

    mysystem("/sbin/modprobe usbhid");
-    mysystem("udevstart");
+    mysystem("/sbin/udevstart");
    return 0;
 }

--- a/src/nash/Makefile
+++ b/src/nash/Makefile
@@ -1,23 +1,18 @@
-CFLAGS=-Wall -DVERSION=\"$(VERSION)\" -g
+CFLAGS=-Wall -Werror -DVERSION=\"$(VERSION)\" -g  -D_FORTIFY_SOURCE=2
 VERSION=$(shell awk -F= '/^VERSION=/ { print $$2 }' mkinitrd)

 ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))

-#ifeq (i386, $(ARCH))
-#CC:=diet $(CC)
-#CFLAGS += -DUSE_DIET=1
-#else
 STATIC=-static
-#endif

 mandir=usr/share/man

-nash: nash.o mount_by_label.o
-	$(CC) $(STATIC) -g $(LDFLAGS) -o $@ nash.o mount_by_label.o
+nash: nash.o mount_by_label.o name_to_dev_t.o
+	$(CC) $(STATIC) -g $(LDFLAGS) -o $@ $^

 clean:
-	rm -f nash $(MINILIBC) nash.o mount_by_label.o
+	rm -f nash $(MINILIBC) *.o

 install:
 	mkdir -p $(BUILDROOT)/sbin
--- a/src/nash/mkinitrd
+++ b/src/nash/mkinitrd
@@ -1,7 +1,9 @@
-#!/bin/bash
+#!/bin/bash --norc

 # mkinitrd
 #
+# Copyright 2005 Red Hat, Inc.
+#
 # Written by Erik Troan <ewt@redhat.com>
 #
 # Contributors:
@@ -20,14 +22,17 @@
 #       Preston Brown <pbrown@redhat.com>
 #	Bill Nottingham <notting@redhat.com>
 #       Guillaume Cottenceau <gc@mandrakesoft.com>
+#	Peter Jones <pjones@redhat.com>

+umask 0022

 PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
 export PATH

-VERSION=3.5.14
+VERSION=4.2.11

 compress=1
+allowmissing=""
 target=""
 kernel=""
 force=""
@@ -36,18 +41,28 @@ MODULES=""
 img_vers=""
 builtins=""
 pivot=1
+squashfs=1
+initramfs=""
 modulefile=/etc/modules.conf
 rc=0

-IMAGESIZE=5120
+IMAGESIZE=8000
 PRESCSIMODS="scsi_mod sd_mod unknown"
 fstab="/etc/fstab"

+if [ -f /etc/udev/udev.conf ]; then
+    USE_UDEV="yes"
+    UDEV_TMPFS="yes"
+    UDEV_KEEP_DEV="yes"
+    . /etc/udev/udev.conf
+    [ -x /sbin/udev.static ] || USE_UDEV=
+fi
+
 usage () {
    echo "usage: `basename $0` [--version] [-v] [-f] [--preload <module>]" >&2
    echo "       [--omit-scsi-modules] [--omit-raid-modules] [--omit-lvm-modules]" >&2
    echo "       [--with=<module>] [--image-version] [--fstab=<fstab>] [--nocompress]" >&2
-    echo "       [--builtin=<module>] [--nopivot] <initrd-image> <kernel-version>" >&2
+    echo "       [--builtin=<module>] [--nopivot] [--nosquashfs] <initrd-image> <kernel-version>" >&2
    echo "" >&2
    echo "       (ex: `basename $0` /boot/initrd-2.2.5-15.img 2.2.5-15)" >&2
    exit 1
@@ -61,11 +76,11 @@ moduledep() {

    [ -n "$verbose" ] && echo -n "Looking for deps of module $1"
    deps=$(gawk 'BEGIN { searched=ARGV[2]; ARGV[2]=""; rc=1 } \
-                function modname(filename) { match(filename, /\/([^\/]+)\.k?o/, ret); return ret[1] } \
+                function modname(filename) { match(filename, /\/([^\/]+)\.k?o:?$/, ret); return ret[1] } \
                function show() { if (orig == searched) { print dep; orig=""; rc=0; exit } } \
                /^\/lib/ { show(); \
-                           orig=modname($1); \
-                           if ($2) { dep=modname($2) } else { dep="" } } \
+                           orig=modname($1); dep=""; \
+                           if ($2) { for (i = 2; i <= NF; i++) { dep=sprintf("%s %s", dep, modname($i)); } } } \
                /^	/ { dep=sprintf("%s %s", dep, modname($1));  } \
                END      { show(); exit(rc) }' /lib/modules/$kernel/modules.dep $1)
    [ -n "$verbose" ] && echo -e "\t$deps"
@@ -90,7 +105,7 @@ findmodule() {
 	modName=$(echo $modName | cut -b2-)
    fi

-    if echo $builtins | grep -E -q '(^| )'$modName'( |$)' ; then
+    if echo $builtins | egrep -q '(^| )'$modName'( |$)' ; then
 	[ -n "$verbose" ] && echo "module $modName assumed to be built in"
 	set +x
 	return
@@ -99,7 +114,7 @@ findmodule() {
    # special cases
    if [ "$modName" = "i2o_block" ]; then
 	findmodule i2o_core
-	findmodule i2o_pci
+	findmodule -i2o_pci
 	modName="i2o_block"
    elif [ "$modName" = "ppa" ]; then
 	findmodule parport
@@ -144,6 +159,11 @@ findmodule() {
 	    fi
 	done;

+	if [ -n "$allowmissing" ]; then
+	    echo "WARNING: No module $modName found for kernel $kernel, continuing anyway" >&2
+	    return
+	fi
+    
 	echo "No module $modName found for kernel $kernel, aborting." >&2
 	exit 1
    fi
@@ -216,6 +236,10 @@ while [ $# -gt 0 ]; do
 	    pivot=""
 	    ;;

+	--nosquashfs)
+	    squashfs=""
+	    ;;
+
 	--ifneeded)
 	    # legacy
 	    ;;
@@ -245,6 +269,12 @@ while [ $# -gt 0 ]; do
 	--image-version)
 	    img_vers=yes
 	    ;;
+	--noudev)
+	    USE_UDEV=
+	    ;;
+	--allow-missing)
+	    allowmissing=yes
+	    ;;
 	*)
 	    if [ -z "$target" ]; then
 		target=$1
@@ -282,6 +312,21 @@ if [ $UID != 0 ]; then
    exit 1
 fi

+kernelmajor=`echo $kernel | cut -d . -f 1,2`
+
+#if [ "$kernelmajor" == "2.4" ]; then
+    if [ -n "$verbose" ]; then echo "Creating old-style initrd"; fi
+    USE_UDEV=
+#else
+#    if [ -n "$verbose" ]; then echo "Creating initramfs"; fi
+#    modulefile=/etc/modprobe.conf
+#    initramfs=1
+#    pivot=""
+#fi
+
+# if we're not using udev, don't set any of the other bits
+[ -z "$USE_UDEV" ] && UDEV_TMPFS= && UDEV_KEEP_DEV=
+
 # find a temporary directory which doesn't use tmpfs
 TMPDIR=""
 for t in /tmp /var/tmp /root ${PWD}; do
@@ -319,7 +364,7 @@ if [ -n "$withusb" ]; then
          if [ `which kudzu 2>/dev/null` ]; then
 	    host=$(kudzu --probe -b scsi |
 	      gawk '/^device: '${dev}'/,/^host:/ { if (/^host/) { print $2; exit; } }')
-	    if [ -d /proc/scsi/usb-storage-${host} ]; then
+	    if [ -d /proc/scsi/usb-storage-${host} -o -f /proc/scsi/usb-storage/${host} ]; then
 		needusb=1
 	    fi
          fi
@@ -328,7 +373,7 @@ if [ -n "$withusb" ]; then
 fi

 if [ -n "$needusb" ]; then
-    drivers=$(gawk '/^alias usb-controller[0-9]* / { print $3}' < /etc/modules.conf)
+    drivers=$(gawk '/^alias[[:space:]]+usb-controller[0-9]* / { print $3}' < $modulefile)
    if [ -n "$drivers" ]; then
 	for driver in $drivers; do
 	    findmodule $driver
@@ -345,7 +390,7 @@ if [ -z "$noscsi" ]; then
    fi

    if [ -f $modulefile ]; then
-	scsimodules=`grep "alias[[:space:]]scsi_hostadapter" $modulefile | grep -v '^[ 	]*#' | LC_ALL=C sort -u | gawk '{ print $3 }'`
+	scsimodules=`grep "alias[[:space:]]\+scsi_hostadapter" $modulefile | grep -v '^[ 	]*#' | LC_ALL=C sort -u | gawk '{ print $3 }'`

 	if [ -n "$scsimodules" ]; then
 	    for n in $PRESCSIMODS; do
@@ -371,7 +416,18 @@ fi
 if [ -z "$nolvm" ]; then
    if [ -f /proc/lvm/global  ]; then
        if  grep -q '^VG:' /proc/lvm/global ; then
+	    if [ "$kernelmajor" == "2.4" ]; then
 		findmodule -lvm-mod
+	    else
+		findmodule -dm-mod
+	    fi
+        fi
+    fi
+
+    if [ -x /sbin/dmsetup -a -e /dev/mapper/control ]; then
+	dmout=$(/sbin/dmsetup ls 2>/dev/null)
+	if [ "$dmout" != "No devices found" -a "$dmout" != "" ]; then
+	    findmodule -dm-mod
 	fi
    fi
 fi
@@ -395,7 +451,11 @@ if [ -z "$noraid" -a -f /proc/mdstat ]; then
 	    findmodule linear
 	    startraid=1
 	    ;;
-	raid[0145])
+	multipath)
+	    findmodule multipath
+	    startraid=1
+	    ;;
+	raid[01456])
 	    findmodule $level
 	    startraid=1
 	    ;;
@@ -415,9 +475,9 @@ fi
 rootdev=$(gawk '/^[ \t]*[^#]/ { if ($2 == "/") { print $1; }}' $fstab)
 if echo $rootdev | cut -d/ -f3 | grep -q loop ; then
    key="^# $(echo $rootdev | cut -d/ -f3 | tr '[a-z]' '[A-Z]'):"
-    if ! grep "$key" $fstab > /dev/null; then
-	echo "The root filesystem is on a $rootdev, but there is no magic entry in $fstab" 1>&2
-	echo "for this device. Consult the mkinitrd man page for more information" 2>&2
+    if ! grep "$key" $fstab >> /dev/null; then
+	echo "The root filesystem is on a $rootdev, but there is no magic entry in $fstab" >&2
+	echo "for this device. Consult the mkinitrd man page for more information" >&2
 	exit 1
    fi

@@ -433,19 +493,31 @@ if echo $rootdev | cut -d/ -f3 | grep -q loop ; then
    basicmodules="$basicmodules -${loopFs}"
 # check if the root fs is on a logical volume
 elif ! echo $rootdev | cut -c1-6 |grep -q "LABEL=" ; then
+    root_vg=$(echo $rootdev | cut -d/ -f3)
    rootdev=$(echo "readlink $rootdev" | /sbin/nash --quiet)
    major=`ls -l $rootdev | sed -e "s/.* \\([0-9]\+\\), *[0-9]\+.*/\\1/"`
    [ "$major" != "58" ] || root_lvm=1
+    if echo $rootdev |grep -q /dev/mapper 2>/dev/null ; then root_lvm=1 ; fi
 fi

 rootfs=$(gawk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' $fstab)
-rootopts=$(gawk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab)
+rootopts=$(gawk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' $fstab \
+    | sed -e 's/\(^rw,\|rw,$\)//' -e 's/,rw,/,/' -e 's/^rw$/ro/')

 # in case the root filesystem is modular
 findmodule -${rootfs}

 if [ -n "$root_lvm" ]; then
+    if [ "$kernelmajor" == "2.4" ]; then    
 	findmodule -lvm-mod
+    else
+	findmodule -dm-mod
+	# DM requires all of these to be there in case someone used the
+	# feature.  broken.  (#132001)
+	findmodule -dm-mirror
+	findmodule -dm-zero
+	findmodule -dm-snapshot
+    fi
 fi

 for n in $basicmodules; do 
@@ -459,60 +531,82 @@ fi

 MNTIMAGE=`mktemp -d ${TMPDIR}/initrd.XXXXXX`
 IMAGE=`mktemp ${TMPDIR}/initrd.img.XXXXXX`
-MNTPOINT=`mktemp -d ${TMPDIR}/initrd.mnt.XXXXXX`
-RCFILE=$MNTIMAGE/linuxrc
+if [ -z "$initramfs" ]; then
+    MNTPOINT=`mktemp -d ${TMPDIR}/initrd.mnt.XXXXXX`
+    RCFILE=$MNTIMAGE/linuxrc
+else
+    RCFILE=$MNTIMAGE/init
+fi

-if [ -z "$MNTIMAGE" -o -z "$IMAGE" -o -z "$MNTPOINT" ]; then
+if [ -z "$MNTIMAGE" -o -z "$IMAGE" ]; then
    echo "Error creating temporaries.  Try again" >&2
    exit 1
 fi

-dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1
+if [ -z "$initramfs" ]; then
+  dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1

-LODEV=$(echo findlodev | /sbin/nash --quiet)
+  LODEV=$(echo findlodev | /sbin/nash --quiet)

-if [ -z "$LODEV" ]; then
+  if [ -z "$LODEV" ]; then
    rm -rf $MNTIMAGE $MNTPOINT $IMAGE
    echo "All of your loopback devices are in use." >&2
    exit 1
-fi
+  fi

-losetup ${LODEV} $IMAGE || exit 1
+  losetup ${LODEV} $IMAGE || exit 1

-# We have to "echo y |" so that it doesn't complain about $IMAGE not
-# being a block device
-echo y | mke2fs $LODEV $IMAGESIZE >/dev/null 2>/dev/null
-tune2fs -i0 $LODEV >/dev/null
+  # We have to "echo y |" so that it doesn't complain about $IMAGE not
+  # being a block device
+  echo y | mkfs.minix -i 100 $LODEV $IMAGESIZE >/dev/null 2>/dev/null

-if [ -n "$verbose" ]; then
+  if [ -n "$verbose" ]; then
      echo "Using loopback device $LODEV"
-fi
+  fi

-mkdir -p $MNTPOINT
-mount -t ext2 $LODEV $MNTPOINT || {
+  mkdir -p $MNTPOINT
+  mount -t minix $LODEV $MNTPOINT || {
 	echo "Can't get a loopback device"
 	exit 1
-}
+  }
+
+  # We don't need this directory, so let's save space
+  rmdir $MNTPOINT/lost+found >/dev/null 2>&1
+fi

 mkdir -p $MNTIMAGE
 mkdir -p $MNTIMAGE/lib
 mkdir -p $MNTIMAGE/bin
 mkdir -p $MNTIMAGE/etc
 mkdir -p $MNTIMAGE/dev
+mkdir -p $MNTIMAGE/hd
 mkdir -p $MNTIMAGE/loopfs
 mkdir -p $MNTIMAGE/proc
+mkdir -p $MNTIMAGE/sys
 mkdir -p $MNTIMAGE/sysroot
 ln -s bin $MNTIMAGE/sbin

-# We don't need this directory, so let's save space
-rm -rf $MNTPOINT/lost+found
-
 inst /sbin/nash "$MNTIMAGE/bin/nash"
 inst /sbin/insmod.static "$MNTIMAGE/bin/insmod"
+inst /bin/tar.static "$MNTIMAGE/bin/tar"
+inst /usr/bin/lzmadec "$MNTIMAGE/bin/lzmadec"
+inst /sbin/fsck.minix.static "$MNTIMAGE/bin/fsck.minix"
 ln -s /sbin/nash $MNTIMAGE/sbin/modprobe

+if [ -n "$USE_UDEV" ]; then
+    inst /sbin/udev.static $MNTIMAGE/sbin/udev
+    inst /sbin/udevstart.static $MNTIMAGE/sbin/udevstart
+    mkdir -p $MNTIMAGE/etc/udev
+    inst /etc/udev/udev.conf $MNTIMAGE/etc/udev/udev.conf
+    ln -s /sbin/nash $MNTIMAGE/sbin/hotplug
+fi
+
 for MODULE in $MODULES; do
+    if [ -x /usr/bin/strip ]; then
+	/usr/bin/strip -g $verbose /lib/modules/$kernel/$MODULE -o $MNTIMAGE/lib/$(basename $MODULE)
+    else
 	cp $verbose -a /lib/modules/$kernel/$MODULE $MNTIMAGE/lib
+    fi
 done

 # mknod'ing the devices instead of copying them works both with and
@@ -526,7 +620,7 @@ for i in 1 2 3 4; do
 done

 # FIXME -- this won't work if you're using devfs
-if [ -n "$root_lvm" ]; then
+if [ -n "$root_lvm" -a "$kernelmajor" == "2.4" ]; then
    pvs=$(/sbin/pvscan | grep " PV " | gawk {'print $5;'} |sed 's/"//g')
    for pv in $pvs; do
 	cp $verbose --parents -a $pv $MNTIMAGE/
@@ -539,9 +633,44 @@ if [ -n "$root_lvm" ]; then
    mknod $MNTIMAGE/dev/lvm b 109 0
 fi

-echo "#!/bin/nash" > $RCFILE
+if [ -n "$root_lvm" -a "$kernelmajor" == "2.6" ]; then
+    inst /sbin/lvm.static "$MNTIMAGE/bin/lvm"
+    if [ -f /etc/lvm/lvm.conf ]; then
+	cp $verbose --parents /etc/lvm/lvm.conf $MNTIMAGE/
+    fi
+fi
+
+echo "#!/bin/nash" >| $RCFILE
 echo "" >> $RCFILE

+echo "mount -t proc /proc /proc" >> $RCFILE
+echo "setquiet" >> $RCFILE
+echo "echo Mounted /proc filesystem" >> $RCFILE
+
+if [ "$kernelmajor" != "2.4" ]; then
+    echo "echo Mounting sysfs" >> $RCFILE
+    echo "mount -t sysfs /sys /sys" >> $RCFILE
+fi
+
+if [ -n "$USE_UDEV" ]; then
+    if [ -n "$UDEV_TMPFS" ]; then
+	cat >> $RCFILE <<EOF
+echo Creating /dev
+mount -o mode=0755 -t tmpfs /dev /dev
+mknod /dev/console c 5 1
+mknod /dev/null c 1 3
+mknod /dev/zero c 1 5
+mkdir /dev/pts
+mkdir /dev/shm
+EOF
+    fi
+    cat >> $RCFILE <<EOF
+echo Starting udev
+/sbin/udevstart
+echo -n "/sbin/hotplug" > /proc/sys/kernel/hotplug
+EOF
+fi
+
 for MODULE in $MODULES; do
    text=""
    module=`echo $MODULE | sed "s|.*/||" | sed "s/.k\?o$//"`
@@ -561,12 +690,26 @@ for MODULE in $MODULES; do
    # Hack - we need a delay after loading usb-storage to give things
    #        time to settle down before we start looking a block devices
    if [ "$module" = "usb-storage" ]; then
-	echo "sleep 5" >> $RCFILE
+	echo "sleep 8" >> $RCFILE
+    fi
+    if [ "$module" = "zfcp" -a -f /etc/zfcp.conf ]; then
+        echo "sleep 2" >> $RCFILE
+        cat /etc/zfcp.conf | grep -v "^#" | tr "A-Z" "a-z" | while read DEVICE SCSIID WWPN SCSILUN FCPLUN; do
+            echo "echo -n $WWPN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/port_add" >>$RCFILE
+            echo "echo -n $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/$WWPN/unit_add" >>$RCFILE
+            echo "echo -n 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE/0x/}/online" >>$RCFILE
+        done
    fi
 done

-echo "echo Mounting /proc filesystem" >> $RCFILE
-echo "mount -t proc /proc /proc" >> $RCFILE
+# HACK: module loading + device creation isn't necessarily synchronous...
+# this will make sure that we have all of our devices before trying
+# things like RAID or LVM
+if [ -n "$USE_UDEV" ]; then
+  echo "/sbin/udevstart" >> $RCFILE
+fi
+
+echo "sleep 2" >> $RCFILE

 if [ -n "$startraid" ]; then
    for dev in $raiddevices; do
@@ -575,8 +718,12 @@ if [ -n "$startraid" ]; then
    done
 fi

-echo "echo Creating block devices" >> $RCFILE
-echo "mkdevices /dev" >> $RCFILE
+if [ -z "$USE_UDEV" ]; then
+    echo "echo Creating block devices" >> $RCFILE
+    echo "mkdevices /dev" >> $RCFILE
+fi
+
+echo "mknod /dev/loop0 b 7 0" >> $RCFILE

 if [ -n "$loopDev" ]; then
    mkdir /initrd
@@ -587,40 +734,91 @@ if [ -n "$loopDev" ]; then
    echo "echo Setting up loopback device $rootdev" >> $RCFILE
    echo "losetup $rootdev /loopfs$loopFile" >> $RCFILE
 elif [ -n "$root_lvm" ]; then
+  if [ "$kernelmajor" == "2.4" ]; then
    echo "echo Scanning logical volumes" >> $RCFILE
    echo "vgscan" >> $RCFILE
    echo "echo Activating logical volumes" >> $RCFILE
    echo "vgchange -ay" >> $RCFILE
-else
-    echo "echo Creating root device" >> $RCFILE
-    echo "mkrootdev /dev/root" >> $RCFILE
-    rootdev=/dev/root
+  else
+    echo "echo Making device-mapper control node" >> $RCFILE
+    echo "mkdmnod" >> $RCFILE
+    echo "echo Scanning logical volumes" >> $RCFILE
+    echo "lvm vgscan --ignorelockingfailure" >> $RCFILE
+    echo "echo Activating logical volumes" >> $RCFILE
+    echo "lvm vgchange -ay --ignorelockingfailure $root_vg" >> $RCFILE
+  fi
 fi

-if [ -n "$pivot" ]; then
+echo "echo Creating root device" >> $RCFILE
+echo "mkrootdev /dev/root" >> $RCFILE
+rootdev=/dev/root
+
+if [ -n "$initramfs" ]; then
+  echo "echo Mounting root filesystem" >> $RCFILE
+  if [ -n "$squashfs" ]; then
+    echo "mount -o $rootopts --ro -t $rootfs $rootdev /sysroot" >> $RCFILE
+  else
+    echo "fsck.minix $rootdev" >> $RCFILE
+    echo "mount -o $rootopts -t minix $rootdev /hd" >> $RCFILE
+    echo "losetup /dev/loop0 /hd/ipcop-1.5.0a1.squashfs" >> $RCFILE
+    echo "mount --ro -t squashfs /dev/loop0 /sysroot" >> $RCFILE
+    echo "mount -t tmpfs none /sysroot/var" >> $RCFILE
+    echo "echo Unpacking IPCop configuration.. Please wait.." >> $RCFILE
+    echo "tar -C /sysroot -xjf /hd/ipcop.tbz2" >> $RCFILE
+  fi
+
+  echo "echo Switching to new root" >> $RCFILE
+  if [ -n "$UDEV_KEEP_DEV" ]; then
+    echo "switchroot --movedev /sysroot" >> $RCFILE
+  else
+    echo "switchroot /sysroot" >> $RCFILE
+  fi
+else 
+  if [ "$kernelmajor" != "2.4" ]; then
+    echo "umount /sys" >> $RCFILE
+  fi
+
+  if [ -n "$pivot" ]; then
    echo "echo 0x0100 > /proc/sys/kernel/real-root-dev" >> $RCFILE

    echo "echo Mounting root filesystem" >> $RCFILE
+    if [ -n "$squashfs" ]; then
    	echo "mount -o $rootopts --ro -t $rootfs $rootdev /sysroot" >> $RCFILE
+    else
+    	echo "fsck.minix $rootdev" >> $RCFILE
+    	echo "mount -o $rootopts -t minix $rootdev /hd" >> $RCFILE
+	echo "losetup /dev/loop0 /hd/ipcop-1.5.0a1.squashfs" >> $RCFILE
+        echo "mount --ro -t squashfs /dev/loop0 /sysroot" >> $RCFILE
+    	echo "mount -t tmpfs none /sysroot/var" >> $RCFILE
+    	echo "echo Unpacking IPCop configuration.. Please wait.." >> $RCFILE
+    	echo "tar -C /sysroot -xjf /hd/ipcop.tbz2" >> $RCFILE
+    fi

    echo "pivot_root /sysroot /sysroot/initrd" >> $RCFILE
    echo "umount /initrd/proc" >> $RCFILE
-else
+  else
    echo "umount /proc" >> $RCFILE
-fi
+  fi

+  [ -n "$UDEV_TMPFS" ] && echo "umount /initrd/dev" >> $RCFILE
+fi
 chmod +x $RCFILE

-(cd $MNTIMAGE; tar cf - .) | (cd $MNTPOINT; tar xf -) || exit 1
+if [ -z "$initramfs" ]; then
+  (cd $MNTIMAGE; tar cf - .) | (cd $MNTPOINT; tar xf -) || exit 1

-umount $MNTPOINT
-losetup -d $LODEV
+  umount $MNTPOINT
+  losetup -d $LODEV
+else
+  (cd $MNTIMAGE; find . | cpio --quiet -c -o) >| $IMAGE || exit 1
+fi

 if [ -n "$compress" ]; then
-    gzip -9 < $IMAGE > $target || rc=1
+    gzip -9 < $IMAGE >| $target || rc=1
 else
    cp -a $IMAGE $target || rc=1
 fi
-rm -rf $MNTIMAGE $MNTPOINT $IMAGE
+rm -rf $MNTIMAGE $IMAGE
+if [ -n "$MNTPOINT" ]; then rm -rf $MNTPOINT ; fi

 exit $rc
--- a/src/nash/mount_by_label.c
+++ b/src/nash/mount_by_label.c
@@ -64,7 +64,7 @@ get_label_uuid(const char *device, char **label, char *uuid) {
 	}
 	else if (lseek(fd, 0, SEEK_SET) == 0
 	    && read(fd, (char *) &xfsb, sizeof(xfsb)) == sizeof(xfsb)
-	    && (strncmp(xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) {
+	    && (strncmp((char *)xfsb.s_magic, XFS_SUPER_MAGIC, 4) == 0)) {
 		memcpy(uuid, xfsb.s_uuid, sizeof(xfsb.s_uuid));
 		namesize = sizeof(xfsb.s_fname);
 		if ((*label = calloc(namesize + 1, 1)) != NULL)
@@ -167,7 +167,7 @@ uuidcache_init(void) {

 		if (isdigit(s[-1])) {
 			char * ptr;
-			char * deviceDir;
+			char * deviceDir = NULL;
 			int mustRemove = 0;
 			int mustRemoveDir = 0;
 			int i;
@@ -265,7 +265,7 @@ get_spec_by_uuid(const char *s, int * major, int * minor) {
 	    uuid[i] = ((fromhex(s[0])<<4) | fromhex(s[1]));
 	    s += 2;
 	}
-	return get_spec_by_x(UUID, uuid, major, minor);
+	return get_spec_by_x(UUID, (char *)uuid, major, minor);

 bad_uuid:
 	fprintf(stderr, _("mount: bad UUID"));
@@ -279,7 +279,7 @@ get_spec_by_volume_label(const char *s, int * major, int * minor) {

 int display_uuid_cache(void) {
 	struct uuidCache_s * u;
-	int i;
+	size_t i;

 	uuidcache_init();

--- a/src/nash/name_to_dev_t.c
+++ b/src/nash/name_to_dev_t.c
@@ -0,0 +1,139 @@
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <fcntl.h>
+
+static dev_t try_name(char *name, int part)
+{
+	char path[64];
+	char buf[32];
+	int range;
+	dev_t res;
+	char *s;
+	int len;
+	int fd;
+	unsigned int maj, min;
+
+	/* read device number from .../dev */
+
+	sprintf(path, "/sys/block/%s/dev", name);
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		goto fail;
+	len = read(fd, buf, 32);
+	close(fd);
+	if (len <= 0 || len == 32 || buf[len - 1] != '\n')
+		goto fail;
+	buf[len - 1] = '\0';
+	if (sscanf(buf, "%u:%u", &maj, &min) != 2)
+		goto fail;
+	res = makedev(maj, min);
+	if (maj != major(res) || min != minor(res))
+		goto fail;
+
+	/* if it's there and we are not looking for a partition - that's it */
+	if (!part)
+		return res;
+
+	/* otherwise read range from .../range */
+	snprintf(path, 64, "/sys/block/%s/range", name);
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		goto fail;
+	len = read(fd, buf, 32);
+	close(fd);
+	if (len <= 0 || len == 32 || buf[len - 1] != '\n')
+		goto fail;
+	buf[len - 1] = '\0';
+	range = strtoul(buf, &s, 10);
+	if (*s)
+		goto fail;
+
+	/* if partition is within range - we got it */
+	if (part < range)
+		return res + part;
+fail:
+	return 0;
+}
+
+/*
+ *	Convert a name into device number.  We accept the following variants:
+ *
+ *	1) device number in hexadecimal	represents itself
+ *	2) /dev/nfs represents Root_NFS (0xff)
+ *	3) /dev/<disk_name> represents the device number of disk
+ *	4) /dev/<disk_name><decimal> represents the device number
+ *         of partition - device number of disk plus the partition number
+ *	5) /dev/<disk_name>p<decimal> - same as the above, that form is
+ *	   used when disk name of partitioned disk ends on a digit.
+ *
+ *	If name doesn't have fall into the categories above, we return 0.
+ *	sysfs is used to check if something is a disk name - it has
+ *	all known disks under bus/block/devices.  If the disk name
+ *	contains slashes, name of driverfs node has them replaced with
+ *	bangs.  try_name() does the actual checks, assuming that sysfs
+ *	is mounted on /sys.
+ *
+ *	Note that cases (1) and (2) are already handled by the kernel,
+ *	so we can ifdef them out, provided that we check real-root-dev
+ *	first.
+ */
+
+dev_t name_to_dev_t(char *name)
+{
+	char s[32];
+	char *p;
+	dev_t res = 0;
+	int part;
+
+	if (strncmp(name, "/dev/", 5) != 0) {
+#if 1 /* kernel used to do this */
+		unsigned maj, min;
+
+		if (sscanf(name, "%u:%u", &maj, &min) == 2) {
+			res = makedev(maj, min);
+			if (maj != major(res) || min != minor(res))
+				return 0;
+		} else {
+			res = strtoul(name, &p, 16);
+			if (*p)
+				return 0;
+		}
+#endif
+		return res;
+	}
+
+	name += 5;
+
+#if 1 /* kernel used to do this */
+	if (strcmp(name, "nfs") == 0)
+		return makedev(0, 255);
+#endif
+
+	if (strlen(name) > 31)
+		return 0;
+	strcpy(s, name);
+	for (p = s; *p; p++)
+		if (*p == '/')
+			*p = '!';
+	res = try_name(s, 0);
+	if (res)
+		return res;
+
+	while (p > s && isdigit(p[-1]))
+		p--;
+	if (p == s || !*p || *p == '0')
+		return 0;
+	part = strtoul(p, NULL, 10);
+	*p = '\0';
+	res = try_name(s, part);
+	if (res)
+		return res;
+
+	if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')
+		return 0;
+	p[-1] = '\0';
+	return try_name(s, part);
+}
--- a/src/nash/nash.8
+++ b/src/nash/nash.8
@@ -1,5 +1,4 @@
-.TH NASH 8 "Sat Mar 27 1999"
-.UC 4
+.TH NASH 8 "Mon Aug 02 2004"
 .SH NAME
 nash \- script interpretor to interpret linuxrc images
 .SH SYNOPSIS
@@ -69,6 +68,12 @@ Creates a device inode for \fIpath\fR. This is identical to \fBmkdev\fR(1)
 which the exceptions that it will not create named pipes and if the directories
 in \fIpath\fR do not exist they will be automatically created.

+.TP
+\fBmkdmnod\fR
+Creates a device inode for the device mapper control inode as
+\fI/dev/mapper/control\fR.  If it already exists with the correct
+major/minor, it will not be recreated.
+
 .TP
 \fBmkrootdev \fIpath\fR
 Makes \fIpath\fR a block inode for the device which should be mounted
@@ -93,15 +98,33 @@ The \fBdefaults\fR mount option is silently ignored.
 Makes the filesystem mounted at \fInewrootpath\fR the new root filesystem,
 and mounts the current root filesystem as \fIoldrootpath\fR.

+.TP
+\fBreadlink \fIpath\fR
+Displays the value of the symbolic link \fIpath\fR.
+
 .TP
 \fBraidautorun \fImddevice\fR
 Runs raid autodetection on all raid-typed partitions. \fImddevice\fR must
 be a raid device (any will do).

+.TP
+\fBsetquiet\fR
+Cause any later echos in this script to not be displayed.
+
 .TP
 \fBshowlabels\fR
 Display a table of devices, their filesystem labels, and their uuids.

+.TP
+\fBsleep \fInum\fR
+Sleep for \fInum\fR seconds
+
+.TP
+\fBswitchroot \fInewrootpath\fR
+Makes the filesystem mounted at \fInewrootpath\fR the new root
+filesystem by moving the mountpoint.  This will only work in 2.6 or
+later kernels.
+
 .TP
 \fBumount \fIpath\fR
 Unmounts the filesystem mounted at \fIpath\fR.
--- a/src/nash/nash.c
+++ b/src/nash/nash.c
@@ -5,8 +5,10 @@
 * dietlibc to keep things small.
 *
 * Erik Troan (ewt@redhat.com)
+ * Jeremy Katz (katzj@redhat.com)
+ * Peter Jones (pjones@redhat.com)
 *
- * Copyright 2002 Red Hat Software 
+ * Copyright 2002-2005 Red Hat Software 
 *
 * This software may be freely redistributed under the terms of the GNU
 * public license.
@@ -72,18 +74,34 @@
 #define MS_REMOUNT      32
 #endif

-#ifdef USE_DIET
-static inline _syscall2(int,pivot_root,const char *,one,const char *,two)
+#ifndef MS_BIND
+#define MS_BIND 4096
 #endif

+#ifndef MS_MOVE
+#define MS_MOVE 8192
+#endif
+
+#ifndef MNT_FORCE
+#define MNT_FORCE 0x1
+#endif
+
+#ifndef MNT_DETACH
+#define MNT_DETACH 0x2
+#endif
+
+extern dev_t name_to_dev_t(char *name);
+extern int display_uuid_cache(void);
+
 #define MAX(a, b) ((a) > (b) ? a : b)

-int testing = 0, quiet = 0;
+int testing = 0, quiet = 0, reallyquiet = 0;

 #define PATH "/usr/bin:/bin:/sbin:/usr/sbin"

 char * env[] = {
    "PATH=" PATH,
+    "LVM_SUPPRESS_FD_WARNINGS=1",
    NULL
 };

@@ -91,14 +109,14 @@ int smartmknod(char * device, mode_t mode, dev_t dev) {
    char buf[256];
    char * end;

-    strcpy(buf, device);
+    strncpy(buf, device, 256);

    end = buf;
    while (*end) {
 	if (*end == '/') {
 	    *end = '\0';
 	    if (access(buf, F_OK) && errno == ENOENT) 
-		mkdir(buf, 0700);
+		mkdir(buf, 0755);
 	    *end = '/';
 	}

@@ -111,7 +129,7 @@ int smartmknod(char * device, mode_t mode, dev_t dev) {
 char * getArg(char * cmd, char * end, char ** arg) {
    char quote = '\0';

-    if (cmd >= end) return NULL;
+    if (!cmd || cmd >= end) return NULL;

    while (isspace(*cmd) && cmd < end) cmd++;
    if (cmd >= end) return NULL;
@@ -138,6 +156,10 @@ char * getArg(char * cmd, char * end, char ** arg) {
 	*arg = cmd;
 	while (!isspace(*cmd) && cmd < end) cmd++;
 	*cmd = '\0';
+	if (**arg == '$')
+            *arg = getenv(*arg+1);
+        if (*arg == NULL)
+            *arg = "";
    }

    cmd++;
@@ -147,15 +169,107 @@ char * getArg(char * cmd, char * end, char ** arg) {
    return cmd;
 }

+/* taken from anaconda/isys/probe.c */
+static int readFD (int fd, char **buf)
+{
+    char *p;
+    size_t size = 4096;
+    int s, filesize;
+
+    *buf = malloc (size);
+    if (*buf == 0)
+      return -1;
+
+    filesize = 0;
+    do {
+	p = &(*buf) [filesize];
+	s = read (fd, p, 4096);
+	if (s < 0)
+	    break;
+	filesize += s;
+	if (s != 4096)
+	    break;
+	size += 4096;
+	*buf = realloc (*buf, size);
+    } while (1);
+
+    if (filesize == 0 && s < 0) {
+	free (*buf);     
+	*buf = NULL;
+	return -1;
+    }
+
+    return filesize;
+}
+
+#ifdef __powerpc__
+#define CMDLINESIZE 256
+#else
+#define CMDLINESIZE 1024
+#endif
+
+/* get the contents of the kernel command line from /proc/cmdline */
+static char * getKernelCmdLine(void) {
+    int fd, i;
+    char * buf;
+
+    fd = open("/proc/cmdline", O_RDONLY, 0);
+    if (fd < 0) {
+	printf("getKernelCmdLine: failed to open /proc/cmdline: %d\n", errno);
+	return NULL;
+    }
+
+    buf = malloc(CMDLINESIZE);
+    if (!buf)
+        return buf;
+
+    i = read(fd, buf, CMDLINESIZE);
+    if (i < 0) {
+	printf("getKernelCmdLine: failed to read /proc/cmdline: %d\n", errno);
+	close(fd);
+	return NULL;
+    }
+
+    close(fd);
+    if (i == 0)
+        buf[0] = '\0';
+    else
+        buf[i - 1] = '\0';
+    return buf;
+}
+
+/* get the start of a kernel arg "arg".  returns everything after it
+ * (useful for things like getting the args to init=).  so if you only
+ * want one arg, you need to terminate it at the n */
+static char * getKernelArg(char * arg) {
+    char * start, * cmdline;
+
+    cmdline = start = getKernelCmdLine();
+    if (start == NULL) return NULL;
+    while (*start) {
+	if (isspace(*start)) {
+	    start++;
+	    continue;
+	}
+	if (strncmp(start, arg, strlen(arg)) == 0) {
+            return start + strlen(arg);
+        }
+	while (*++start && !isspace(*start))
+	    ;
+    }
+
+    return NULL;
+}
+
 int mountCommand(char * cmd, char * end) {
    char * fsType = NULL;
    char * device;
    char * mntPoint;
-    char * deviceDir;
+    char * deviceDir = NULL;
    char * options = NULL;
    int mustRemove = 0;
    int mustRemoveDir = 0;
-    int rc;
+    int rc = 0;
    int flags = MS_MGC_VAL;
    char * newOpts;

@@ -168,6 +282,9 @@ int mountCommand(char * cmd, char * end) {
    while (cmd && *device == '-') {
 	if (!strcmp(device, "--ro")) {
 	    flags |= MS_RDONLY;
+        } else if (!strcmp(device, "--bind")) {
+            flags = MS_BIND;
+            fsType = "none";
 	} else if (!strcmp(device, "-o")) {
 	    cmd = getArg(cmd, end, &options);
 	    if (!cmd) {
@@ -331,17 +448,20 @@ int mountCommand(char * cmd, char * end) {
 }

 int otherCommand(char * bin, char * cmd, char * end, int doFork) {
-    char * args[128];
+    char ** args;
    char ** nextArg;
-    int pid;
+    int pid, wpid;
    int status;
    char fullPath[255];
-    const static char * sysPath = PATH;
+    static const char * sysPath = PATH;
    const char * pathStart;
    const char * pathEnd;
    char * stdoutFile = NULL;
    int stdoutFd = 0;

+    args = (char **)malloc(sizeof(char *) * 128);
+    if (!args)
+        return 1;
    nextArg = args;

    if (!strchr(bin, '/')) {
@@ -365,7 +485,7 @@ int otherCommand(char * bin, char * cmd, char * end, int doFork) {
 	}
    }

-    *nextArg = bin;
+    *nextArg = strdup(bin);

    while (cmd && cmd < end) {
 	nextArg++;
@@ -406,16 +526,103 @@ int otherCommand(char * bin, char * cmd, char * end, int doFork) {

 	close(stdoutFd);

-	wait4(-1, &status, 0, NULL);
+	for (;;) {
+	     wpid = wait4(-1, &status, 0, NULL);
+	     if (wpid == -1) {
+		  printf("ERROR: Failed to wait for process %d\n", wpid);
+	     }
+
+	     if (wpid != pid)
+		  continue;
+
 	     if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-	    printf("ERROR: %s exited abnormally!\n", args[0]);
+		  printf("ERROR: %s exited abnormally with value %d ! (pid %d)\n", args[0], WEXITSTATUS(status), pid);
 		  return 1;
 	     }
+	     break;
+	}
    }

    return 0;
 }

+#ifdef DEBUG
+static int lsdir(char *thedir, char * prefix) {
+    DIR * dir;
+    struct dirent * entry;
+    struct stat sb;
+    char * fn;
+
+    if (!(dir = opendir(thedir))) {
+        printf("error opening %s: %d\n", thedir, errno);
+        return 1;
+    }
+
+    fn = malloc(1024);
+    while ((entry = readdir(dir))) {
+        if (entry->d_name[0] == '.')
+            continue;
+        snprintf(fn, 1024, "%s/%s", thedir, entry->d_name);
+        stat(fn, &sb);
+        printf("%s%s", prefix, fn);
+
+        if (S_ISDIR(sb.st_mode)) {
+            char * pfx;
+            pfx = malloc(strlen(prefix) + 3);
+            sprintf(pfx, "%s  ", prefix);
+            printf("/\n");
+        } else if (S_ISCHR(sb.st_mode)) {
+            printf(" c %d %d\n", major(sb.st_rdev), minor(sb.st_rdev));
+        } else if (S_ISBLK(sb.st_mode)) {
+            printf(" b %d %d\n", major(sb.st_rdev), minor(sb.st_rdev));
+        } else if (S_ISLNK(sb.st_mode)) {
+            char * target;
+            target = malloc(1024);
+            readlink(fn, target, 1024);
+            printf("->%s\n", target);
+            free(target);
+        } else {
+            printf("\n");
+        }
+    }    
+    return 0;
+}
+
+int catCommand(char * cmd, char * end) {
+    char * file;
+    char * buf;
+    int fd;
+
+    if (!(cmd = getArg(cmd, end, &file))) {
+	printf("cat: argument expected\n");
+	return 1;
+    }
+
+    if ((fd = open(file, O_RDONLY)) < 0) {
+        printf("cat: error opening %s: %d\n", file, errno);
+        return 1;
+    }
+
+    buf = malloc(1024);
+    while (read(fd, buf, 1024) > 0) {
+        write(1, buf, 1024);
+    }
+    return 0;
+}
+
+int lsCommand(char * cmd, char * end) {
+    char * dir;
+
+    if (!(cmd = getArg(cmd, end, &dir))) {
+	printf("ls: argument expected\n");
+	return 1;
+    }
+
+    lsdir(dir, "");
+    return 0;
+}
+#endif
+
 int execCommand(char * cmd, char * end) {
    char * bin;

@@ -486,6 +693,7 @@ int losetupCommand(char * cmd, char * end) {
    return 0;
 }

+#define RAID_MAJOR 9
 int raidautorunCommand(char * cmd, char * end) {
    char * device;
    int fd;
@@ -500,6 +708,22 @@ int raidautorunCommand(char * cmd, char * end) {
 	return 1;
    }

+    /* with udev, the raid devices don't exist until they get started.
+     * this won't work so well with raidautorun.  so, let's be smart
+     * and create them ourselves if we need to */
+    if (access(device, R_OK & W_OK)) {
+        int minor;
+        if (sscanf(device, "/dev/md%d", &minor) != 1) {
+            printf("raidautorun: unable to autocreate %s\n", device);
+            return 1;
+        }
+
+        if (smartmknod(device, S_IFBLK | 0600, makedev(RAID_MAJOR, minor))) {
+            printf("raidautorun: unable to autocreate %s\n", device);
+            return 1;
+        }
+    }
+
    fd = open(device, O_RDWR, 0);
    if (fd < 0) {
 	printf("raidautorun: failed to open %s: %d\n", device, errno);
@@ -516,6 +740,10 @@ int raidautorunCommand(char * cmd, char * end) {
    return 0;
 }

+#ifdef USE_DIET
+extern int pivot_root(char *, char *);
+#endif
+
 static int my_pivot_root(char * one, char * two) {
 #ifdef USE_DIET
    return pivot_root(one, two);
@@ -551,41 +779,178 @@ int pivotrootCommand(char * cmd, char * end) {
    return 0;
 }

+#define MAX_INIT_ARGS 32
+/* 2.6 magic not-pivot-root but kind of similar stuff.
+ * This is based on code from klibc/utils/run_init.c
+ */
+int switchrootCommand(char * cmd, char * end) {
+    char * new;
+    const char * initprogs[] = { "/sbin/init", "/etc/init", 
+                                 "/bin/init", "/bin/sh", NULL };
+    char * init, * cmdline = NULL;
+    char ** initargs;
+    /*  Don't try to unmount the old "/", there's no way to do it. */
+    const char * umounts[] = { "/dev", "/proc", "/sys", NULL };
+    int fd, i = 0;
+    int moveDev = 0;
+
+    cmd = getArg(cmd, end, &new);
+    if (cmd) {
+        if (!strcmp(new, "--movedev"))
+            moveDev = 1;
+        cmd = getArg(cmd, end, &new);
+    }
+
+    if (!cmd) {
+	printf("switchroot: new root mount point expected\n");
+	return 1;
+    }
+
+    if (chdir(new)) {
+        printf("switchroot: chdir(%s) failed: %d\n", new, errno);
+        return 1;
+    }
+
+    init = getKernelArg("init=");
+    if (init == NULL)
+        cmdline = getKernelCmdLine();
+
+    if (moveDev) {
+        i = 1;
+        mount("/dev", "./dev", NULL, MS_MOVE, NULL);
+    }
+
+    if ((fd = open("./dev/console", O_RDWR)) < 0) {
+        printf("ERROR opening /dev/console!!!!: %d\n", errno);
+        fd = 0;
+    }
+
+    if (dup2(fd, 0) != 0) printf("error dup2'ing fd of %d to 0\n", fd);
+    if (dup2(fd, 1) != 1) printf("error dup2'ing fd of %d to 1\n", fd);
+    if (dup2(fd, 2) != 2) printf("error dup2'ing fd of %d to 2\n", fd);
+    if (fd > 2)
+        close(fd);
+
+    fd = open("/", O_RDONLY);
+    for (; umounts[i] != NULL; i++) {
+        if (!quiet) printf("unmounting old %s\n", umounts[i]);
+        if (umount2(umounts[i], MNT_DETACH)) {
+            printf("ERROR unmounting old %s: %d\n", umounts[i], errno);
+            printf("forcing unmount of %s\n", umounts[i]);
+            umount2(umounts[i], MNT_FORCE);
+        }
+    }
+    i=0;
+
+    if (mount(".", "/", NULL, MS_MOVE, NULL)) {
+        printf("switchroot: mount failed: %d\n", errno);
+        close(fd);
+        return 1;
+    }
+
+    if (chroot(".") || chdir("/")) {
+        printf("switchroot: chroot() failed: %d\n", errno);
+        close(fd);
+        return 1;
+    }
+
+    /* release the old "/" */
+    close(fd);
+
+    if (init == NULL) {
+        int j;
+        for (j = 0; initprogs[j] != NULL; j++) {
+            if (!access(initprogs[j], X_OK)) {
+                init = strdup(initprogs[j]);
+                break;
+            }
+        }
+    }
+
+    initargs = (char **)malloc(sizeof(char *)*(MAX_INIT_ARGS+1));
+    if (cmdline && init) {
+        initargs[i++] = strdup(init);
+    } else {
+        cmdline = init;
+        initargs[0] = NULL;
+    }
+
+    if (cmdline != NULL) {
+        char * chptr, * start;
+
+        start = chptr = cmdline;
+        for (; (i < MAX_INIT_ARGS) && (*start != '\0'); i++) {
+            while (*chptr && !isspace(*chptr)) chptr++;
+            if (*chptr != '\0') *(chptr++) = '\0';
+            initargs[i] = strdup(start);
+            start = chptr;
+        }
+    }
+
+    initargs[i] = NULL;
+
+    if (access(initargs[0], X_OK)) {
+        printf("WARNING: can't access %s\n", initargs[0]);
+    }
+    execv(initargs[0], initargs);
+    printf("exec of init (%s) failed!!!: %d\n", initargs[0], errno);
+    return 1;
+}
+
+int isEchoQuiet(int fd) {
+    if (!reallyquiet) return 0;
+    if (fd != 1) return 0;
+    return 1;
+}
+
 int echoCommand(char * cmd, char * end) {
    char * args[256];
    char ** nextArg = args;
    int outFd = 1;
    int num = 0;
    int i;
+    int newline = 1;
+    int length = 0;
+    char *string;

    if (testing && !quiet) {
 	printf("(echo) ");
 	fflush(stdout);
    }

-    while ((cmd = getArg(cmd, end, nextArg)))
+    while ((cmd = getArg(cmd, end, nextArg))) {
+        if (!strncmp("-n", *nextArg, MAX(2, strlen(*nextArg)))) {
+            newline = 0;
+        } else {
+            length += strlen(*nextArg);
            nextArg++, num++;
+        }
+    }
+    length += num + 1;

    if ((nextArg - args >= 2) && !strcmp(*(nextArg - 2), ">")) {
-	outFd = open(*(nextArg - 1), O_RDWR | O_CREAT | O_TRUNC, 0644);
+	outFd = open(*(nextArg - 1), O_WRONLY | O_CREAT | O_TRUNC, 0644);
 	if (outFd < 0) {
 	    printf("echo: cannot open %s for write: %d\n", 
 		    *(nextArg - 1), errno);
 	    return 1;
 	}

+        newline = 0;
 	num -= 2;
    }
-
+    string = (char *)malloc(length * sizeof(char));
+    *string = '\0';
    for (i = 0; i < num;i ++) {
-	if (i)
-	    write(outFd, " ", 1);
-	write(outFd, args[i], strlen(args[i]));
+	if (i) strcat(string, " ");
+        strncat(string, args[i], strlen(args[i]));
    }

-    write(outFd, "\n", 1);
+    if (newline) strcat(string, "\n");
+    if (!isEchoQuiet(outFd)) write(outFd, string, strlen(string));

    if (outFd != 1) close(outFd);
+    free(string);

    return 0;
 }
@@ -613,8 +978,8 @@ int umountCommand(char * cmd, char * end) {

 int mkrootdevCommand(char * cmd, char * end) {
    char * path;
-    char * start, * chptr;
-    unsigned int devNum = 0;
+    char *root, * chptr;
+    int devNum = 0;
    int fd;
    int i;
    char buf[1024];
@@ -630,36 +995,21 @@ int mkrootdevCommand(char * cmd, char * end) {
 	return 1;
    }

-    fd = open("/proc/cmdline", O_RDONLY, 0);
-    if (fd < 0) {
-	printf("mkrootdev: failed to open /proc/cmdline: %d\n", errno);
-	return 1;
-    }
+    root = getKernelArg("root=");

-    i = read(fd, buf, sizeof(buf));
-    if (i < 0) {
-	printf("mkrootdev: failed to read /proc/cmdline: %d\n", errno);
-	close(fd);
-	return 1;
-    }
-
-    close(fd);
-    buf[i - 1] = '\0';
-
-    start = buf;
-    while (*start && isspace(*start)) start++;
-    while (*start && strncmp(start, "root=", 5)) {
-	while (*start && !isspace(*start)) start++;
-	while (*start && isspace(*start)) start++;
-    }
-
-    start += 5;
-    chptr = start;
+    if (root) {
+	chptr = root;
 	while (*chptr && !isspace(*chptr)) chptr++;
 	*chptr = '\0';
+    }

-    if (!strncmp(start, "LABEL=", 6)) {
-	if (get_spec_by_volume_label(start + 6, &major, &minor)) {
+    if (root && !access(root, R_OK)) {
+        if (!symlink(root, "/dev/root"))
+            return 0;
+    }
+
+    if (root && !strncmp(root, "LABEL=", 6)) {
+	if (get_spec_by_volume_label(root + 6, &major, &minor)) {
 	    if (smartmknod(path, S_IFBLK | 0600, makedev(major, minor))) {
 		printf("mount: cannot create device %s (%d,%d)\n",
 		       path, major, minor);
@@ -669,7 +1019,23 @@ int mkrootdevCommand(char * cmd, char * end) {
 	    return 0;
 	}

-	printf("mkrootdev: label %s not found\n", start + 6);
+	printf("mkrootdev: label %s not found\n", root + 6);
+
+	return 1;
+    }
+
+    if (root && !strncmp(root, "UUID=", 5)) {
+        if (get_spec_by_uuid(root+5, &major, &minor)) {
+            if (smartmknod(path, S_IFBLK | 0600, makedev(major, minor))) {
+                printf("mount: cannot create device %s (%d,%d)\n",
+                       path, major, minor);
+                return 1;
+            }
+
+            return 0;
+        }
+
+        printf("mkrootdev: UUID %s not found\n", root+5);

        return 1;
    }
@@ -688,6 +1054,9 @@ int mkrootdevCommand(char * cmd, char * end) {
    }

    close(fd);
+    if (i == 0)
+        buf[i] = '\0';
+    else
        buf[i - 1] = '\0';

    devNum = atoi(buf);
@@ -696,6 +1065,9 @@ int mkrootdevCommand(char * cmd, char * end) {
 	return 1;
    }

+    if (!devNum && root)
+	devNum = name_to_dev_t(root);
+
    if (smartmknod(path, S_IFBLK | 0700, devNum)) {
 	printf("mkrootdev: mknod failed: %d\n", errno);
 	return 1;
@@ -733,7 +1105,7 @@ int mkdirCommand(char * cmd, char * end) {
 int accessCommand(char * cmd, char * end) {
    char * permStr;
    int perms = 0;
-    char * file;
+    char * file = NULL;

    cmd = getArg(cmd, end, &permStr);
    if (cmd) cmd = getArg(cmd, end, &file);
@@ -758,7 +1130,7 @@ int accessCommand(char * cmd, char * end) {
 	permStr++;
    }

-    if (access(file, perms))
+    if ((file == NULL) || (access(file, perms)))
 	return 1;

    return 0;
@@ -783,6 +1155,7 @@ int readlinkCommand(char * cmd, char * end) {
    char * path;
    char * buf, * respath, * fullpath;
    struct stat sb;
+    int rc = 0;

    if (!(cmd = getArg(cmd, end, &path))) {
        printf("readlink: file expected\n");
@@ -802,12 +1175,14 @@ int readlinkCommand(char * cmd, char * end) {
    buf = malloc(512);
    if (readlink(path, buf, 512) == -1) {
 	fprintf(stderr, "error readlink %s: %d\n", path, errno);
+        free(buf);
 	return 1;
    }

    /* symlink is absolute */
    if (buf[0] == '/') {
        printf("%s\n", buf);
+        free(buf);
        return 0;
    } 
   
@@ -823,11 +1198,16 @@ int readlinkCommand(char * cmd, char * end) {
    respath = malloc(PATH_MAX);
    if (!(respath = realpath(fullpath, respath))) {
        fprintf(stderr, "error realpath %s: %d\n", fullpath, errno);
-        return 1;
+        rc = 1;
+        goto readlinkout;
    }

    printf("%s\n", respath);
-    return 0;
+ readlinkout:
+    free(buf);
+    free(respath);
+    free(fullpath);
+    return rc;
 }

 int doFind(char * dirName, char * name) {
@@ -977,7 +1357,7 @@ int mknodCommand(char * cmd, char * end) {

 int mkdevicesCommand(char * cmd, char * end) {
    int fd;
-    char buf[32768];
+    char *buf;
    int i;
    char * start, * chptr;
    int major, minor;
@@ -1000,7 +1380,7 @@ int mkdevicesCommand(char * cmd, char * end) {
 	return 1;
    }

-    i = read(fd, buf, sizeof(buf));
+    i = readFD(fd, &buf);
    if (i < 1) {
 	close(fd);
 	printf("failed to read /proc/partitions: %d\n", errno);
@@ -1084,6 +1464,86 @@ int mkdevicesCommand(char * cmd, char * end) {
    return 0;
 }

+static int getDevNumFromProc(char * file, char * device) {
+    char buf[32768], line[4096];
+    char * start, *end;
+    int num;
+    int fd;
+
+    if ((fd = open(file, O_RDONLY)) == -1) {
+        printf("can't open file %s: %d\n", file, errno);
+        return -1;
+    }
+
+    num = read(fd, buf, sizeof(buf));
+    if (num < 1) {
+        close(fd);
+        printf("failed to read %s: %d\n", file, errno);
+        return -1;
+    }
+    buf[num] = '\0';
+    close(fd);
+
+    start = buf;
+    end = strchr(start, '\n');
+    while (start && end) {
+        *end++ = '\0';
+        if ((sscanf(start, "%d %s", &num, line)) == 2) {
+            if (!strncmp(device, line, strlen(device)))
+                return num;
+        }
+        start = end;
+        end = strchr(start, '\n');
+    }
+    return -1;
+}
+
+int mkDMNodCommand(char * cmd, char * end) {
+    int major = getDevNumFromProc("/proc/devices", "misc");
+    int minor = getDevNumFromProc("/proc/misc", "device-mapper");
+
+    if ((major == -1) || (minor == -1)) {
+        printf("Unable to find device-mapper major/minor\n");
+        return 1;
+    }
+
+    if (!access("/dev/mapper/control", R_OK)) {
+        struct stat sb;
+        if (stat("/dev/mapper/control", &sb) == 0) {
+            if (S_ISCHR(sb.st_mode) && (sb.st_rdev == makedev(major, minor)))
+                return 0;
+        } 
+
+        unlink("/dev/mapper/control");
+    }
+
+    if (smartmknod("/dev/mapper/control", S_IFCHR | 0600, 
+                   makedev(major, minor))) {
+        printf("failed to create /dev/mapper/control\n");
+        return 1;
+    }
+    
+    return 0;
+}
+
+int setQuietCommand(char * cmd, char * end) {
+    int fd, rc;
+
+    if ((fd = open("/proc/cmdline", O_RDONLY)) >= 0) {
+        char * buf = malloc(512);
+        rc = read(fd, buf, 511);
+        if (strstr(buf, "quiet") != NULL)
+            reallyquiet = 1;
+        close(fd);
+        free(buf);
+    }
+
+    if (reallyquiet)
+          quiet = 1;
+
+    return 0;
+}
+
 int runStartup(int fd) {
    char contents[32768];
    int i;
@@ -1096,6 +1556,7 @@ int runStartup(int fd) {
 	printf("Failed to read /startup.rc -- file too large.\n");
 	return 1;
    }
+    close(fd);

    contents[i] = '\0';

@@ -1140,6 +1601,8 @@ int runStartup(int fd) {
 	    rc = raidautorunCommand(chptr, end);
 	else if (!strncmp(start, "pivot_root", MAX(10, chptr - start)))
 	    rc = pivotrootCommand(chptr, end);
+        else if (!strncmp(start, "switchroot", MAX(10, chptr - start)))
+            rc = switchrootCommand(chptr, end);
 	else if (!strncmp(start, "mkrootdev", MAX(9, chptr - start)))
 	    rc = mkrootdevCommand(chptr, end);
 	else if (!strncmp(start, "umount", MAX(6, chptr - start)))
@@ -1162,8 +1625,18 @@ int runStartup(int fd) {
 	    rc = sleepCommand(chptr, end);
 	else if (!strncmp(start, "mknod", MAX(5, chptr-start)))
 	    rc = mknodCommand(chptr, end);
+        else if (!strncmp(start, "mkdmnod", MAX(7, chptr-start)))
+            rc = mkDMNodCommand(chptr, end);
        else if (!strncmp(start, "readlink", MAX(8, chptr-start)))
            rc = readlinkCommand(chptr, end);
+        else if (!strncmp(start, "setquiet", MAX(8, chptr-start)))
+            rc = setQuietCommand(chptr, end);
+#ifdef DEBUG
+        else if (!strncmp(start, "cat", MAX(3, chptr-start)))
+            rc = catCommand(chptr, end);
+        else if (!strncmp(start, "ls", MAX(2, chptr-start)))
+            rc = lsCommand(chptr, end);
+#endif
 	else {
 	    *chptr = '\0';
 	    rc = otherCommand(start, chptr + 1, end, 1);
@@ -1189,6 +1662,12 @@ int main(int argc, char **argv) {

    if (!strcmp(name, "modprobe"))
 	exit(0);
+    if (!strcmp(name, "hotplug")) {
+        argv[0] = strdup("/sbin/udev");
+        execv(argv[0], argv);
+        printf("ERROR: exec of udev failed!\n");
+        exit(1);
+    }

    testing = (getppid() != 0) && (getppid() != 1);
    argv++, argc--;
@@ -1201,6 +1680,9 @@ int main(int argc, char **argv) {
 	} else if (!strcmp(*argv, "--quiet")) {
 	    quiet = 1;
 	    argv++, argc--;
+        } else if (!strcmp(*argv, "--reallyquiet")) {
+            reallyquiet = 1;
+            argv++, argc--;
 	} else {
 	    printf("unknown argument %s\n", *argv);
 	    return 1;
@@ -1223,8 +1705,8 @@ int main(int argc, char **argv) {
 	}
    }

+    /* runStartup closes fd */
    rc = runStartup(fd);
-    close(fd);

    return rc;
 }