DHCP und Squid-Initscripts optimiert fuer ein schnelleres starten und stoppen.

Which und lsof zur ISO hinzugefuegt.
Update-XLrator cacht unsere Pakfire-Pakete und rpm/deb-Pakete.
Pakfire weitergebaut.
UPnP aus dem Menue genommen.
Samba-Symlinks korrigiert.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@657 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-07-01 21:41:27 +00:00
parent 32ab16debd
commit 186e3d2cf8
16 changed files with 245 additions and 75 deletions

View File

@@ -79,9 +79,9 @@ END
system("/usr/local/bin/pakfire update --force");
} elsif ($pakfiresettings{'ACTION'} eq 'unlock') {
} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
&Pakfire::lock("off");
system("/usr/local/bin/pakfire upgrade -y");
} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
@@ -108,23 +108,32 @@ if ($errormessage) {
&Header::closebox();
}
if ( -e "/opt/pakfire/pakfire.lock" ) {
my $return = `pidof pakfire`;
chomp($return);
if ($return) {
&Header::openbox("100%", "center", "Aktiv");
print <<END;
<table>
<tr><td>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='unlock' />
<input type='image' src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
</form>
<img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
<td>
Pakfire fuehrt gerade eine Aufgabe aus... Bitte warten sie, bis diese erfolgreich beendet wurde.
<tr><td colspan='2' align='center'>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
</form>
### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
<tr><td colspan='2' align='left'><pre>
END
my @output = `tail /var/log/messages | grep pakfire`;
foreach (@output) {
print "$_";
}
print <<END;
</pre>
</table>
END
### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
@@ -133,6 +142,8 @@ END
&Header::openbox("100%", "center", "Pakfire");
system("pakfire update &>dev/null");
print <<END;
<table width='100%'>
<tr><td width='40%' align="center">Verfuegbare Addons:<br />

View File

@@ -462,6 +462,12 @@ END
} elsif ($metadata[1] eq 'Avast')
{
print "<img src='/images/updxl-src-avast.gif' alt='Avast'}' />&nbsp;</td>\n";
} elsif ($metadata[1] eq 'IPFire')
{
print "<img src='/images/updxl-src-ipfire.gif' alt='IPFire'}' />&nbsp;</td>\n";
} elsif ($metadata[1] eq 'Linux')
{
print "<img src='/images/updxl-src-linux.gif' alt='Linux'}' />&nbsp;</td>\n";
} else
{
print "<img src='/images/updxl-src-unknown.gif' alt='$Lang::tr{'updxlrtr unknown'}' />&nbsp;</td>\n";
@@ -541,18 +547,22 @@ print <<END
<td align='center'><img src='/images/updxl-src-symantec.gif' alt='Symantec' /></td>
<td class='base'>Symantec</td>
<td class='base'>&nbsp;</td>
<td align='center'><img src='/images/updxl-src-unknown.gif' alt='$Lang::tr{'updxlrtr unknown'}' /></td>
<td class='base'>$Lang::tr{'updxlrtr unknown'}</td>
<td align='center'><img src='/images/updxl-src-avira.gif' alt='Avira' /></td>
<td class='base'>Avira</td>
</tr>
<tr>
<td class='base' colspan='2'>&nbsp;</td>
<td align='center'><img src='/images/updxl-src-ipfire.gif' alt='IPFire' /></td>
<td class='base'>IPFire</td>
<td class='base'>&nbsp;</td>
<td align='center'><img src='/images/updxl-src-linux.gif' alt='Linux' /></td>
<td class='base'>Linux</td>
<td class='base'>&nbsp;</td>
<td align='center'><img src='/images/updxl-src-avast.gif' alt='Avast' /></td>
<td class='base'>Avast</td>
<td class='base'>&nbsp;</td>
<td align='center'><img src='/images/updxl-src-avira.gif' alt='Avira' /></td>
<td class='base'>Avira</td>
<td class='base'>&nbsp;</td>
<td class='base' colspan='5'>&nbsp;</td>
<td align='center'><img src='/images/updxl-src-unknown.gif' alt='$Lang::tr{'updxlrtr unknown'}' /></td>
<td class='base'>$Lang::tr{'updxlrtr unknown'}</td>
</tr>
</table>
END