echo dict_translate("PPPoE MTU/MRU:"); > |
">/
diff -urP ./apps/web/common/lib/setrouter.inc ./apps/web/common/lib/setrouter.inc
--- ./apps/web/common/lib/setrouter.inc 2009-03-31 13:35:16.000000000 +0600
+++ ./apps/web/common/lib/setrouter.inc 2009-09-16 11:08:25.000000000 +0600
@@ -30,7 +30,7 @@
set_ipv4($cfg, $eth_iface, $lanip, $lanmask);
set_ipv4gw($cfg, $wan_iface, $wangw);
set_dhcpc($cfg, $wan_iface, $dhcpc);
-set_pppoe($cfg, $wan_iface, $wanppoeuser, $wanppoepass, $wanpppoemppe, $pppoe, $pppoemtu, $pppoemru);
+set_pppoe($cfg, $wan_iface, $wanppoeuser, $wanppoepass, $wanpppoemppe, $pppoe, $pppoemtu, $pppoemru, $pppoeservicename);
set_dhcpd($cfg, $lan_iface, $dhcpd_start, $dhcpd_end, $dhcpd_netmask, $dhcpd_lease, $dhcpd_status, $dhcpd_dnsproxy_status);
set_dns($cfg, $dns1, $dns2);
if (strlen($natifc) == 0) {
diff -urP ./apps/web/common/network.js ./apps/web/common/network.js
--- ./apps/web/common/network.js 2008-10-17 21:00:48.000000000 +0600
+++ ./apps/web/common/network.js 2009-09-16 11:08:25.000000000 +0600
@@ -50,7 +50,7 @@
var apst = ['lanip','lanmask'];
var stast = ['wlanip', 'wlanmask'];
var st = new Array('wangw','dns1','dns2');
- var pppoe = new Array('wanppoeuser','wanppoepass', 'wanpppoemppe', 'pppoemtu', 'pppoemru');
+ var pppoe = new Array('wanppoeuser','wanppoepass', 'wanpppoemppe', 'pppoemtu', 'pppoemru', 'pppoeservicename');
var dhcp = new Array('fallback_ip');
var e = new Array();
var d = new Array();
diff -urP ./apps/web/English.txt ./apps/web/English.txt
--- ./apps/web/English.txt 2009-01-28 13:38:45.000000000 +0500
+++ ./apps/web/English.txt 2009-09-16 11:19:41.000000000 +0600
@@ -361,6 +361,7 @@
PPPoE Password: => PPPoE Password:
PPPoE => PPPoE
PPPoE Username: => PPPoE Username:
+PPPoE Service Name: => PPPoE Service Name:
PPP => PPP
PPP STATISTICS => PPP STATISTICS
PPP THROUGHPUT => PPP THROUGHPUT
@@ -550,6 +551,7 @@
WLAN Network Settings => WLAN Network Settings
WLAN PPPoE Password => WLAN PPPoE Password
WLAN PPPoE Username => WLAN PPPoE Username
+WLAN PPPoE Service Name => WLAN PPPoE Service Name
WLAN STATISTICS => WLAN STATISTICS
WLAN THROUGHPUT => WLAN THROUGHPUT
WLAN => WLAN
diff -urP ./conf/xs2/busybox.config ./conf/xs2/busybox.config
--- ./conf/xs2/busybox.config 2008-10-21 03:34:04.000000000 +0600
+++ ./conf/xs2/busybox.config 2009-09-16 11:08:25.000000000 +0600
@@ -80,10 +80,11 @@
CONFIG_DATE=y
# CONFIG_FEATURE_DATE_ISOFMT is not set
CONFIG_DD=y
-# CONFIG_DF is not set
+CONFIG_DF=y
# CONFIG_DIRNAME is not set
# CONFIG_DOS2UNIX is not set
-# CONFIG_DU is not set
+CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
CONFIG_ECHO=y
CONFIG_FEATURE_FANCY_ECHO=y
# CONFIG_ENV is not set
@@ -112,7 +113,7 @@
CONFIG_MV=y
# CONFIG_OD is not set
CONFIG_PRINTF=y
-# CONFIG_PWD is not set
+CONFIG_PWD=y
# CONFIG_REALPATH is not set
CONFIG_RM=y
# CONFIG_RMDIR is not set
@@ -137,14 +138,14 @@
# CONFIG_TR is not set
CONFIG_TRUE=y
# CONFIG_TTY is not set
-# CONFIG_UNAME is not set
+CONFIG_UNAME=y
CONFIG_UNIQ=y
# CONFIG_USLEEP is not set
# CONFIG_UUDECODE is not set
# CONFIG_UUENCODE is not set
-# CONFIG_WATCH is not set
-# CONFIG_WC is not set
-# CONFIG_WHO is not set
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
# CONFIG_WHOAMI is not set
# CONFIG_YES is not set
@@ -194,7 +195,8 @@
#
# Editors
#
-# CONFIG_AWK is not set
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
# CONFIG_PATCH is not set
CONFIG_SED=y
CONFIG_VI=y
@@ -296,7 +298,7 @@
# Networking Utilities
#
# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_ARPING is not set
+CONFIG_ARPING=y
CONFIG_BRCTL=y
# CONFIG_FTPGET is not set
# CONFIG_FTPPUT is not set
@@ -324,8 +326,8 @@
# CONFIG_IPTUNNEL is not set
# CONFIG_NAMEIF is not set
CONFIG_NC=y
-# CONFIG_NETSTAT is not set
-# CONFIG_NSLOOKUP is not set
+CONFIG_NETSTAT=y
+CONFIG_NSLOOKUP=y
CONFIG_PING=y
CONFIG_FEATURE_FANCY_PING=y
CONFIG_PWDOG=y
@@ -354,14 +356,15 @@
#
# Process Utilities
#
-# CONFIG_FREE is not set
+CONFIG_FREE=y
CONFIG_KILL=y
# CONFIG_KILLALL is not set
CONFIG_PIDOF=y
CONFIG_PS=y
# CONFIG_RENICE is not set
-# CONFIG_TOP is not set
-# CONFIG_UPTIME is not set
+CONFIG_TOP=y
+FEATURE_CPU_USAGE_PERCENTAGE=y
+CONFIG_UPTIME=y
# CONFIG_SYSCTL is not set
#
diff -urP ./conf/xs2/fw-layout-flushcfg.txt ./conf/xs2/fw-layout-flushcfg.txt
--- ./conf/xs2/fw-layout-flushcfg.txt 1970-01-01 05:00:00.000000000 +0500
+++ ./conf/xs2/fw-layout-flushcfg.txt 2009-09-16 11:08:25.000000000 +0600
@@ -0,0 +1,3 @@
+kernel 0x01 0xBFC30000 0x000D0000 0x80041000 0x80041000 vmlinux.lzma
+cramfs 0x02 0xBFD00000 0x002C0000 0x00000000 0x00000000 squashfs.bin
+cfg 0x03 0xBFFC0000 0x00020000 0x00000000 0x00000000 xs2.cfg
diff -urP ./conf/xs2/linux-kernel-2.4.config ./conf/xs2/linux-kernel-2.4.config
--- ./conf/xs2/linux-kernel-2.4.config 2008-12-24 17:54:30.000000000 +0500
+++ ./conf/xs2/linux-kernel-2.4.config 2009-09-16 11:08:25.000000000 +0600
@@ -179,7 +179,7 @@
# CONFIG_BINFMT_MISC is not set
# CONFIG_OOM_KILLER is not set
CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,9600 root=/dev/mtdblock2 rootfstype=squashfs init=/linuxrc ro quiet"
+CONFIG_CMDLINE="console=ttyS0,9600 root=/dev/mtdblock2 rootfstype=squashfs init=/linuxrc ro"
#
# Memory Technology Devices (MTD)
diff -urP ./conf/xs2/product.mk ./conf/xs2/product.mk
--- ./conf/xs2/product.mk 2009-05-21 18:03:36.000000000 +0600
+++ ./conf/xs2/product.mk 2009-09-16 11:32:31.000000000 +0600
@@ -37,7 +37,7 @@
wireless-tools hostapd-0.6.3 wpasupplicant-0.6.3 \
iproute2 trigger_url ntpclient igmpproxy dropbear
# bird batmand wifidog
-#APPS_GPL += libpcap tcpdump iperf
+APPS_GPL += libpcap tcpdump iperf
export DRIVERS APPS_OPEN APPS_GPL
Только в .: patch.diff
diff -urP ./rootfs/create_image.sh ./rootfs/create_image.sh
--- ./rootfs/create_image.sh 2008-08-19 16:29:46.000000000 +0600
+++ ./rootfs/create_image.sh 2009-09-16 11:08:25.000000000 +0600
@@ -18,6 +18,7 @@
fi;
rm -rf ${stagingdir}/dev
mkdir -p ${stagingdir}/dev
+find ${stagingdir}/lib/modules/ -name "*.o" -exec /opt/toolchain/mips_ls/bin/mips-linux-strip -g {} +
# updates timestamp for web files
rm -f ${stagingdir}/__romfs.meta
find ${stagingdir} | xargs touch -c
diff -urP ./rootfs/ls2/linuxrc ./rootfs/ls2/linuxrc
--- ./rootfs/ls2/linuxrc 2009-04-17 16:55:29.000000000 +0600
+++ ./rootfs/ls2/linuxrc 2009-09-16 11:08:25.000000000 +0600
@@ -129,6 +129,10 @@
/sbin/ubntconf
fi
+if [ "`grep 'service' /tmp/system.cfg | cut -f2 -d'='`" != "" ];then
+ echo "rp_pppoe_service" `grep 'service' /tmp/system.cfg | cut -f2 -d'='` >> /etc/ppp/options
+fi
+
echo "Executing init..."
exec /sbin/init -f
diff -urP ./rootfs/ls2/usr/etc/rc.d/rc.softrestart ./rootfs/ls2/usr/etc/rc.d/rc.softrestart
--- ./rootfs/ls2/usr/etc/rc.d/rc.softrestart 2008-07-29 17:03:56.000000000 +0600
+++ ./rootfs/ls2/usr/etc/rc.d/rc.softrestart 2009-09-16 11:08:25.000000000 +0600
@@ -20,6 +20,10 @@
/sbin/ubntconf
fi
+if [ "`grep 'service' /tmp/system.cfg | cut -f2 -d'='`" != "" ];then
+ echo "rp_pppoe_service" `grep 'service' /tmp/system.cfg | cut -f2 -d'='` >> /etc/ppp/options
+fi
+
RC_CMD=start
. /etc/rc.d/rc
diff -urP ./rootfs/Makefile ./rootfs/Makefile
--- ./rootfs/Makefile 2009-08-03 18:10:37.000000000 +0600
+++ ./rootfs/Makefile 2009-09-16 11:08:25.000000000 +0600
@@ -102,6 +102,8 @@
cp ${build_kernel_directory}/arch/mips/boot/bzImage ${VER}/
cp ${build_kernel_directory}/vmlinux ${VER}/
cp ${build_kernel_directory}/vmlinux.notstripped ${VER}/
+ # create and copy null file for mtd3 partition
+ dd if=/dev/zero of=${VER}/xs2.cfg bs=64k count=2
# lzma has different swiches in different versions
# try first newer version
lzma -f ${VER}/vmlinux || lzma e ${VER}/vmlinux ${VER}/vmlinux.lzma
|