diff --git a/config/rootfiles/common/capi-4k-utils b/config/rootfiles/common/capi-4k-utils index 635b6e6a5..016f7e854 100644 --- a/config/rootfiles/common/capi-4k-utils +++ b/config/rootfiles/common/capi-4k-utils @@ -2,12 +2,12 @@ #etc/drdsl/adsl.conf #etc/ppp/peers #etc/ppp/peers/isdn -#etc/ppp/peers/isdn/arcor -#etc/ppp/peers/isdn/avm -#etc/ppp/peers/isdn/avm-ml -#etc/ppp/peers/isdn/leased -#etc/ppp/peers/isdn/otelo -#etc/ppp/peers/isdn/talkline +etc/ppp/peers/isdn/arcor +etc/ppp/peers/isdn/avm +etc/ppp/peers/isdn/avm-ml +etc/ppp/peers/isdn/leased +etc/ppp/peers/isdn/otelo +etc/ppp/peers/isdn/talkline #sbin/avmcapictrl sbin/capiinit usr/bin/capiinfo diff --git a/config/rootfiles/common/rp-pppoe b/config/rootfiles/common/rp-pppoe index 56736b182..3a77732ff 100644 --- a/config/rootfiles/common/rp-pppoe +++ b/config/rootfiles/common/rp-pppoe @@ -1,8 +1,8 @@ -etc/ppp/firewall-masq -etc/ppp/firewall-standalone +#etc/ppp/firewall-masq +#etc/ppp/firewall-standalone #etc/ppp/plugins #etc/ppp/plugins/README -etc/ppp/pppoe-server-options +#etc/ppp/pppoe-server-options etc/ppp/pppoe.conf #usr/man/man5/pppoe.conf.5 #usr/man/man8/pppoe-connect.8 @@ -16,8 +16,8 @@ etc/ppp/pppoe.conf #usr/man/man8/pppoe.8 usr/sbin/pppoe usr/sbin/pppoe-connect -usr/sbin/pppoe-relay -usr/sbin/pppoe-server +#usr/sbin/pppoe-relay +#usr/sbin/pppoe-server usr/sbin/pppoe-setup usr/sbin/pppoe-sniff usr/sbin/pppoe-start diff --git a/make.sh b/make.sh index da58ddbec..3e81e841e 100755 --- a/make.sh +++ b/make.sh @@ -24,7 +24,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.0t4" # Version number +VERSION="2.0a4" # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level diff --git a/src/pakfire/pakfire.conf b/src/pakfire/pakfire.conf index 679f48f4a..1920533c8 100644 --- a/src/pakfire/pakfire.conf +++ b/src/pakfire/pakfire.conf @@ -2,7 +2,7 @@ package Conf; -$version = "2.0testing4"; +$version = "2.0alpha4"; $mainserver = "pakfire.ipfire.org";