mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-17 06:23:00 +02:00
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
This commit is contained in:
Michael Tremer
@@ -55,3 +55,6 @@ HOME=/
|
||||
|
||||
# fireinfo
|
||||
%nightly,random * 23-4 /usr/bin/sendprofile >/dev/null 2>&1
|
||||
|
||||
# pakfire
|
||||
%nightly,random * 23-4 /usr/local/bin/pakfire update >/dev/null 2>&1
|
||||
|
||||
15124
config/kernel/ipfire_logo.ppm
Normal file
15124
config/kernel/ipfire_logo.ppm
Normal file
File diff suppressed because it is too large
Load Diff
@@ -23,6 +23,8 @@ srv/web/ipfire/cgi-bin/memory.cgi
|
||||
srv/web/ipfire/cgi-bin/netexternal.cgi
|
||||
srv/web/ipfire/cgi-bin/netinternal.cgi
|
||||
srv/web/ipfire/cgi-bin/system.cgi
|
||||
srv/web/ipfire/cgi-bin/services.cgi
|
||||
srv/web/ipfire/cgi-bin/backup.cgi
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
|
||||
srv/web/ipfire/html/images/urlfilter/copy.gif
|
||||
var/ipfire/general-functions.pl
|
||||
|
||||
@@ -101,6 +101,12 @@ echo Unpack the updated files ...
|
||||
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
|
||||
--no-overwrite-dir
|
||||
|
||||
# Re-read crontab
|
||||
fcrontab -z
|
||||
|
||||
# Remove old pakfire cronjob.
|
||||
rm -f /etc/fcron.daily/pakfire-update
|
||||
|
||||
# Convert /etc/fstab entries to UUID ...
|
||||
#
|
||||
echo Convert fstab entries to UUID ...
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 2005-2010 IPFire Team #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
@@ -35,6 +35,8 @@ my %cgiparams=();
|
||||
my %checked = ();
|
||||
my $message = "";
|
||||
my $errormessage = "";
|
||||
my @backups = "";
|
||||
my @backupisos = "";
|
||||
|
||||
$a = new CGI;
|
||||
|
||||
@@ -150,8 +152,13 @@ if ( $message ne "" ){
|
||||
&Header::closebox();
|
||||
}
|
||||
|
||||
my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
|
||||
my @backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`;
|
||||
if ( -e "/var/ipfire/backup/" ){
|
||||
@backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
|
||||
}
|
||||
|
||||
if ( -e "/var/tmp/backupiso/" ){
|
||||
@backupisos = `cd /var/tmp/backupiso/ && ls *.iso 2>/dev/null`;
|
||||
}
|
||||
|
||||
&Header::openbox('100%', 'center', $Lang::tr{'backup'});
|
||||
|
||||
@@ -186,6 +193,7 @@ print <<END
|
||||
END
|
||||
;
|
||||
foreach (@backups){
|
||||
if ( $_ !~ /ipf$/){next;}
|
||||
chomp($_);
|
||||
my $Datei = "/var/ipfire/backup/".$_;
|
||||
my @Info = stat($Datei);
|
||||
@@ -195,6 +203,7 @@ print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Siz
|
||||
print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>";
|
||||
}
|
||||
foreach (@backupisos){
|
||||
if ( $_ !~ /iso$/){next;}
|
||||
chomp($_);
|
||||
my $Datei = "/var/tmp/backupiso/".$_;
|
||||
my @Info = stat($Datei);
|
||||
@@ -318,4 +327,4 @@ END
|
||||
;
|
||||
&Header::closebox();
|
||||
&Header::closebigbox();
|
||||
&Header::closepage();
|
||||
&Header::closepage();
|
||||
@@ -2,7 +2,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
|
||||
# Copyright (C) 2005-2010 IPFire Team #
|
||||
# #
|
||||
# This program is free software: you can redistribute it and/or modify #
|
||||
# it under the terms of the GNU General Public License as published by #
|
||||
@@ -275,7 +275,7 @@ sub isrunningaddon{
|
||||
my $exename;
|
||||
my @memory;
|
||||
|
||||
my $testcmd = `/usr/local/bin/addonctrl $_ status`;
|
||||
my $testcmd = `/usr/local/bin/addonctrl $_ status 2>/dev/null`;
|
||||
|
||||
if ( $testcmd =~ /is\ running/ && $testcmd !~ /is\ not\ running/){
|
||||
$status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
|
||||
|
||||
@@ -145,6 +145,10 @@ endif
|
||||
# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
|
||||
|
||||
# Install ipfire logo
|
||||
cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \
|
||||
drivers/video/logo/logo_linux_clut224.ppm
|
||||
|
||||
# Cleanup kernel source
|
||||
|
||||
cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
|
||||
|
||||
@@ -55,9 +55,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
mv -vf $(DIR_APP)/pakfire.conf $(DIR_APP)/etc/
|
||||
chown root.root $(DIR_APP) -R
|
||||
chmod 755 $(DIR_APP)/pakfire
|
||||
|
||||
ln -sf ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update
|
||||
|
||||
touch /var/log/pakfire.log
|
||||
chown root.nobody /var/log/pakfire.log
|
||||
chmod 664 /var/log/pakfire.log
|
||||
|
||||
Reference in New Issue
Block a user