webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-24 18:03:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Jan Paul Tuecking
2010-07-13 13:13:44 +02:00
parent f56b0d5ff9 75842d01ba
commit 7d83243a1a
26 changed files with 197 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/initscripts
View File

@@ -78,6 +78,7 @@ etc/rc.d/init.d/networking/red.up/50-ipsec
etc/rc.d/init.d/networking/red.up/50-ovpn
etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
etc/rc.d/init.d/networking/red.up/99-pakfire-update
#etc/rc.d/init.d/openvmtools
#etc/rc.d/init.d/nfs-server
etc/rc.d/init.d/ntp
#etc/rc.d/init.d/nut

25
config/rootfiles/common/ppp
View File

@@ -25,21 +25,24 @@ etc/ppp/standardloginscript
#usr/include/pppd/pathnames.h
#usr/include/pppd/pppcrypt.h
#usr/include/pppd/pppd.h
#usr/include/pppd/session.h
#usr/include/pppd/sha1.h
#usr/include/pppd/spinlock.h
#usr/include/pppd/tdb.h
#usr/include/pppd/upap.h
#usr/lib/pppd
#usr/lib/pppd/2.4.4
usr/lib/pppd/2.4.4/minconn.so
usr/lib/pppd/2.4.4/passprompt.so
usr/lib/pppd/2.4.4/passwordfd.so
usr/lib/pppd/2.4.4/pppoatm.so
usr/lib/pppd/2.4.4/radattr.so
usr/lib/pppd/2.4.4/radius.so
usr/lib/pppd/2.4.4/radrealms.so
usr/lib/pppd/2.4.4/rp-pppoe.so
usr/lib/pppd/2.4.4/winbind.so
usr/lib/pppd
usr/lib/pppd/2.4.5
usr/lib/pppd/2.4.5/minconn.so
usr/lib/pppd/2.4.5/openl2tp.so
usr/lib/pppd/2.4.5/passprompt.so
usr/lib/pppd/2.4.5/passwordfd.so
usr/lib/pppd/2.4.5/pppoatm.so
usr/lib/pppd/2.4.5/pppol2tp.so
usr/lib/pppd/2.4.5/radattr.so
usr/lib/pppd/2.4.5/radius.so
usr/lib/pppd/2.4.5/radrealms.so
usr/lib/pppd/2.4.5/rp-pppoe.so
usr/lib/pppd/2.4.5/winbind.so
usr/sbin/chat
usr/sbin/pppd
usr/sbin/pppdump

33
config/rootfiles/common/rp-pppoe
View File

@@ -1,33 +0,0 @@
#etc/ppp/firewall-masq
#etc/ppp/firewall-standalone
#etc/ppp/plugins
#etc/ppp/plugins/README
#etc/ppp/pppoe-server-options
etc/ppp/pppoe.conf
#usr/man/man5/pppoe.conf.5
#usr/man/man8/pppoe-connect.8
#usr/man/man8/pppoe-relay.8
#usr/man/man8/pppoe-server.8
#usr/man/man8/pppoe-setup.8
#usr/man/man8/pppoe-sniff.8
#usr/man/man8/pppoe-start.8
#usr/man/man8/pppoe-status.8
#usr/man/man8/pppoe-stop.8
#usr/man/man8/pppoe.8
usr/sbin/pppoe
usr/sbin/pppoe-connect
#usr/sbin/pppoe-relay
#usr/sbin/pppoe-server
usr/sbin/pppoe-setup
usr/sbin/pppoe-sniff
usr/sbin/pppoe-start
usr/sbin/pppoe-status
usr/sbin/pppoe-stop
#usr/share/doc/rp-pppoe-3.8
#usr/share/doc/rp-pppoe-3.8/CHANGES
#usr/share/doc/rp-pppoe-3.8/HOW-TO-CONNECT
#usr/share/doc/rp-pppoe-3.8/KERNEL-MODE-PPPOE
#usr/share/doc/rp-pppoe-3.8/LICENSE
#usr/share/doc/rp-pppoe-3.8/README
#usr/share/doc/rp-pppoe-3.8/SERVPOET
#usr/share/doc/rp-pppoe-3.8/pap-secrets

2
config/rootfiles/core/39/exclude
View File

@@ -0,0 +1,2 @@
etc/ppp/chap-secrets
etc/ppp/pap-secrets

5
config/rootfiles/core/39/filelists/files
View File

@@ -1 +1,6 @@
etc/system-release
etc/rc.d/init.d/dnsmasq
etc/rc.d/init.d/networking/red
etc/rc.d/helper/getdnsfromdhcpc.pl
srv/web/ipfire/cgi-bin/pppsetup.cgi
usr/local/bin/backupiso

1
config/rootfiles/core/39/filelists/ppp Symbolic link
View File

@@ -0,0 +1 @@
../../../common/ppp

3
config/rootfiles/packages/ddrescue Normal file
View File

@@ -0,0 +1,3 @@
usr/bin/ddrescue
#usr/share/info/ddrescue.info
#usr/share/man/man1/ddrescue.1

26
config/rootfiles/packages/minicom Normal file
View File

@@ -0,0 +1,26 @@
usr/bin/ascii-xfr
usr/bin/minicom
usr/bin/runscript
usr/bin/xminicom
#usr/share/locale/cs/LC_MESSAGES/minicom.mo
#usr/share/locale/da/LC_MESSAGES/minicom.mo
#usr/share/locale/de/LC_MESSAGES/minicom.mo
#usr/share/locale/es/LC_MESSAGES/minicom.mo
#usr/share/locale/fi/LC_MESSAGES/minicom.mo
#usr/share/locale/fr/LC_MESSAGES/minicom.mo
#usr/share/locale/hu/LC_MESSAGES/minicom.mo
#usr/share/locale/id/LC_MESSAGES/minicom.mo
#usr/share/locale/ja/LC_MESSAGES/minicom.mo
#usr/share/locale/nb/LC_MESSAGES/minicom.mo
#usr/share/locale/pl/LC_MESSAGES/minicom.mo
#usr/share/locale/pt_BR/LC_MESSAGES/minicom.mo
#usr/share/locale/ro/LC_MESSAGES/minicom.mo
#usr/share/locale/ru/LC_MESSAGES/minicom.mo
#usr/share/locale/rw/LC_MESSAGES/minicom.mo
#usr/share/locale/sv/LC_MESSAGES/minicom.mo
#usr/share/locale/vi/LC_MESSAGES/minicom.mo
#usr/share/locale/zh_TW/LC_MESSAGES/minicom.mo
#usr/share/man/man1/ascii-xfr.1
#usr/share/man/man1/minicom.1
#usr/share/man/man1/runscript.1
#usr/share/man/man1/xminicom.1

2
config/rootfiles/packages/watchdog
View File

@@ -1,8 +1,10 @@
etc/watchdog.conf
usr/sbin/watchdog
usr/sbin/wd_identify
usr/sbin/wd_keepalive
#usr/share/man/man5/watchdog.conf.5
#usr/share/man/man8/watchdog.8
#usr/share/man/man8/wd_identify.8
#usr/share/man/man8/wd_keepalive.8
var/ipfire/backup/addons/includes/watchdog
etc/rc.d/init.d/watchdog

7
doc/packages-list.txt
View File

@@ -84,6 +84,7 @@
* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
* db-4.4.20
* dbus-1.0.3
* ddrescue-1.12
* dhcp-3.1.0
* dhcpcd-5.1.3
* diffutils-2.8.1
@@ -224,6 +225,7 @@
* mediatomb-svn2020
* memtest86+-4.10
* miau-0.6.5
* minicom-2.4
* misc-progs
* mkinitcpio-0.5.9
* mktemp-1.5
@@ -276,7 +278,7 @@
* popt-1.10.4
* portmap_6.0
* postfix-2.6.5
* ppp-2.4.4
* ppp-2.4.5
* pptp-1.7.2
* procps-3.2.6
* psmisc-22.2
@@ -291,7 +293,6 @@
* readline-5.1
* reiser4progs-1.0.6
* reiserfsprogs-3.6.21
* rp-pppoe-3.8
* rrdtool-1.2.30
* rssdler-0.4.0a
* rsync-3.0.7
@@ -354,7 +355,7 @@
* vnstati-beta3
* vsftpd-2.1.2
* w_scan-20080105
* watchdog-5.6
* watchdog-5.9
* wget-1.10.2
* whatmask-1.2
* which-2.16

2
html/cgi-bin/outgoingfw.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPTifre Team #
# 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 #

2
html/cgi-bin/outgoinggrp.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPTifre Team #
# 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 #

19
html/cgi-bin/pppsetup.cgi
View File

@@ -394,7 +394,6 @@ $selected{'ENCAP'}{$pppsettings{'ENCAP'}} = "selected='selected'";
$checked{'METHOD'}{'STATIC'} = '';
$checked{'METHOD'}{'PPPOE'} = '';
$checked{'METHOD'}{'PPPOE_PLUGIN'} = '';
$checked{'METHOD'}{'DHCP'} = '';
$checked{'METHOD'}{$pppsettings{'METHOD'}} = "checked='checked'";
@@ -765,13 +764,13 @@ print <<END
<td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pppoe settings'}</b></td>
</tr>
<tr>
<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%'>$Lang::tr{'service name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
<td colspan='2' width='50%'></td>
<td width='25%'><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
</tr>
<tr>
<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%'>$Lang::tr{'concentrator name'}&nbsp;<img src='/blob.gif' alt='*' /></td>
<td colspan='2' width='50%'></td>
<td width='25%'><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
</tr>
<tr>
@@ -897,14 +896,8 @@ sub initprofile
$pppsettings{'PPTP_PEER'} = '10.0.0.138';
$pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
$pppsettings{'PROTOCOL'} = 'RFC2364';
$pppsettings{'METHOD'} = 'PPPOE_PLUGIN';
if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) {
$pppsettings{'MTU'} = '1492';
$pppsettings{'MRU'} = '1492';
} else {
$pppsettings{'MTU'} = '1452';
$pppsettings{'MRU'} = '1452';
}
$pppsettings{'MTU'} = '1492';
$pppsettings{'MRU'} = '1492';
$pppsettings{'DIALMODE'} = 'T';
$pppsettings{'MAXRETRIES'} = 5;
$pppsettings{'HOLDOFF'} = 30;

10
html/cgi-bin/samba.cgi
View File

@@ -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 #
@@ -620,7 +620,7 @@ if ($sambasettings{'SECURITY'} eq 'user')
&Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'});
}
print <<END
<a name="$Lang::tr{'accounting'}"</a>
<a name="$Lang::tr{'accounting'}"></a>
<br />
<table width='95%' cellspacing='0'>
<tr><td colspan='6' align='left'></td></tr>
@@ -866,7 +866,7 @@ my %shares = config("${General::swroot}/samba/shares");
print <<END
<a name="$Lang::tr{'manage shares'}"</a>
<a name="$Lang::tr{'manage shares'}"></a>
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b>
@@ -1014,7 +1014,7 @@ if ( -e "/var/ipfire/cups/enable")
my @Printers = keys(%printer);
print <<END
<a name="$Lang::tr{'manage printers'}"</a>
<a name="$Lang::tr{'manage printers'}"></a>
<br />
<table width='95%' cellspacing='0'>
<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b>
@@ -1154,7 +1154,7 @@ $Log=~s/\n/<br \/>/g;
&Header::openbox('100%', 'center', $Lang::tr{'log'});
print <<END
<a name="$Lang::tr{'log view'}"</a>
<a name="$Lang::tr{'log view'}"></a>
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'log view'}'>
<table width='95%' cellspacing='0'>

2
html/cgi-bin/updatexlrator.cgi
View File

@@ -11,7 +11,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPTifre Team #
# 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 #

23
lfs/rp-pppoe → lfs/ddrescue
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# 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 #
@@ -24,13 +24,16 @@
include Config
VER = 3.8
THISAPP = rp-pppoe-$(VER)
VER = 1.12
THISAPP = ddrescue-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ddrescue
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
@@ -40,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 0e32760f498f9cde44081ee6aafc823b
$(DL_FILE)_MD5 = b3d8a9a9098b87939fba05a45848bd8d
install : $(TARGET)
@@ -50,6 +53,10 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# Downloading, checking, md5sum
###############################################################################
@@ -70,8 +77,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP)/src && ./configure --disable-nls
cd $(DIR_APP)/src && make $(MAKETUNING)
cd $(DIR_APP)/src && make install
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

86
lfs/minicom Normal file
View File

@@ -0,0 +1,86 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
# #
# 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 #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 2.4
THISAPP = minicom-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = minicom
PAK_VER = 0
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 700976a3c2dcc8bbd50ab9bb1c08837b
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
dist:
@$(PAK)
###############################################################################
# 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) && \
./configure \
--prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
lfs/openvmtools
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = openvmtools
PAK_VER = 0
PAK_VER = 1
DEPS = "glib"
###############################################################################

4
lfs/ppp
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.4.4
VER = 2.4.5
THISAPP = ppp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 183800762e266132218b204dfb428d29
$(DL_FILE)_MD5 = 4621bc56167b6953ec4071043fe0ec57
install : $(TARGET)

4
lfs/samba
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2009 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 #
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 28
PAK_VER = 29
DEPS = "cups"

6
lfs/watchdog
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.6
VER = 5.9
THISAPP = watchdog-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = watchdog
PAK_VER = 2
PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 6df285569dd1d85528b983c98c9b2b7c
$(DL_FILE)_MD5 = d7cae3c9829f5d9a680764f314234867
install : $(TARGET)

3
make.sh
View File

@@ -337,7 +337,6 @@ buildipfire() {
ipfiremake libusb
ipfiremake libpcap
ipfiremake ppp
ipfiremake rp-pppoe
ipfiremake pptp
ipfiremake unzip
ipfiremake which
@@ -641,6 +640,8 @@ buildipfire() {
ipfiremake mdadm
ipfiremake eject
ipfiremake pound
ipfiremake minicom
ipfiremake ddrescue
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild

2
src/initscripts/helper/getdnsfromdhcpc.pl
View File

@@ -42,6 +42,6 @@ if (open(FILE, "${General::swroot}/red/iface")) {
$dns = $dhcpc{'domain_name_servers'};
@alldns = split(',', $dns);
@alldns = split(' ', $dns);
print "$alldns[$count - 1]\n";

8
src/initscripts/init.d/dnsmasq
View File

@@ -28,11 +28,15 @@ case "${1}" in
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
DNS1=$(cat /var/ipfire/red/dns1 2>/dev/null)
echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
if [ ! -z ${DNS1} ]; then
echo "nameserver ${DNS1}" >> /var/ipfire/red/resolv.conf
fi
fi
if [ -e "/var/ipfire/red/dns2" ]; then
DNS2=$(cat /var/ipfire/red/dns2 2>/dev/null)
echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
if [ ! -z ${DNS2} ]; then
echo "nameserver ${DNS2}" >> /var/ipfire/red/resolv.conf
fi
fi
[ -e "/var/ipfire/red/active" ] && ARGS="$ARGS -r /var/ipfire/red/resolv.conf"

9
src/initscripts/init.d/networking/red
View File

@@ -220,7 +220,7 @@ case "${1}" in
fi
elif [ "$TYPE" == "PPPOE" ]; then
if ( ps ax | grep -q [p]ppd ); then
boot_mesg "pppd is still running." ${FAILURE}
echo_failure
@@ -230,7 +230,10 @@ case "${1}" in
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
[ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
# We force the plugin method, anyway.
METHOD="PPPOE_PLUGIN"
PPP_NIC=${DEVICE}
if [ "$TYPE" == "vdsl" ]; then
@@ -370,7 +373,7 @@ case "${1}" in
#
if [ "$TYPE" == "pppoe" ]; then
[ "${METHOD}" == "PPPOE_PLUGIN" ] && \
PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
PLUGOPTS="plugin rp-pppoe.so"
fi
### Synchronous Mode

2
src/scripts/backupiso
View File

@@ -3,7 +3,7 @@
COREVER=`cat /opt/pakfire/db/core/mine`
# FIXME: edit this lines before release
URL=http://download.ipfire.org/iso/
ISO=ipfire-2.5.i586-full-core$COREVER.iso
ISO=ipfire-2.7.i586-full-core$COREVER.iso
if [ -z "$1" ]; then
echo usage: $0 backup-file