Changeset 7669240 in freewrt for package/webif

Timestamp:

Sep 23, 2006, 10:30:38 PM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

0543ddc

Parents:

a3f04e0

Message:

• add a generic network init script which is using busybox ifup/ifdown
• move ifup/ifdown with nvram calls to webif package
• add specific dnsmasq.conf and startup script for dnsmasq for webif
• add version file

This unbreaks DNS/DHCP options in Webif. Even WPA/WPA2 seems possible
if you install broadcom-nas package. I have no WPA/WPA2 enabled box
or operating system to test..

tg@ will add some rc.conf checks so that either webif network
configuration is used or ifup/ifdown from busybox

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@673 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/webif

Files:

• Config.in (modified) (1 diff)
• Makefile (modified) (1 diff)
• files/dnsmasq.conf (added)
• files/dnsmasq.init (added)
• files/ifdown (moved) (moved from package/base-files/default/sbin/ifdown ) (1 diff)
• files/ifup (moved) (moved from package/base-files/default/sbin/ifup ) (1 diff)
• files/network-nvram.sh (added)
• files/network.init (moved) (moved from package/base-files/default/etc/init.d/S40network ) (1 diff)
• files/usr/lib/webif/apply.sh (modified) (2 diffs)
• files/usr/lib/webif/webif.sh (modified) (1 diff)

package/webif/Config.in

@@ -3 +3 @@
         tristate
         select FWRT_PACKAGE_HASERL
+        select FWRT_PACKAGE_BRIDGE_UTILS
+        select FWRT_PACKAGE_IPTABLES
+        select FWRT_PACKAGE_DNSMASQ
         default n
         help
-          A web interface for configuring FreeWRT
+          A web interface for configuring FreeWRT as wireless router.
 

package/webif/Makefile

@@ -30 +30 @@
 $(IPKG_WEBIF):
         cd files; pax -rw www usr $(IDIR_WEBIF)/
-        install -d $(IDIR_WEBIF)/usr/bin
-        install -m0755 $(WRKBUILD)/webif-page $(IDIR_WEBIF)/usr/bin/webif-page
-        install -m0755 $(WRKBUILD)/bstrip $(IDIR_WEBIF)/usr/bin/bstrip
+        $(INSTALL_DIR) $(IDIR_WEBIF)/usr/bin
+        $(INSTALL_DIR) $(IDIR_WEBIF)/sbin
+        $(INSTALL_BIN) $(WRKBUILD)/webif-page $(IDIR_WEBIF)/usr/bin/webif-page
+        $(INSTALL_BIN) $(WRKBUILD)/bstrip $(IDIR_WEBIF)/usr/bin/bstrip
+        $(INSTALL_BIN) ./files/ifup $(IDIR_WEBIF)/sbin/ifup.nvram
+        $(INSTALL_BIN) ./files/ifdown $(IDIR_WEBIF)/sbin/ifdown.nvram
         ln -sf /www/index.html $(IDIR_WEBIF)/www/index.asp
-        install -d $(IDIR_WEBIF)/etc/init.d
-        install -m0755 ./files/httpd.init $(IDIR_WEBIF)/etc/init.d/S50httpd
+        $(INSTALL_DIR) $(IDIR_WEBIF)/etc/init.d
+        $(INSTALL_BIN) ./files/httpd.init $(IDIR_WEBIF)/etc/init.d/S50httpd-webif
+        $(INSTALL_BIN) ./files/network.init $(IDIR_WEBIF)/etc/init.d/S40net-webif
+        $(INSTALL_BIN) ./files/dnsmasq.init $(IDIR_WEBIF)/etc/init.d/S50dns-webif
+        $(INSTALL_DATA) ./files/dnsmasq.conf $(IDIR_WEBIF)/etc/dnsmasq.conf-webif
+        $(INSTALL_DATA) ./files/network-nvram.sh $(IDIR_WEBIF)/etc/
         find $(IDIR_WEBIF) -name CVS -o -name .svn | xargs rm -rf
         $(IPKG_BUILD) $(IDIR_WEBIF) $(PACKAGE_DIR)

package/webif/files/ifdown

@@ -1 +1 @@
 #!/bin/sh
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
-. /etc/functions.sh
+. /etc/network-nvram.sh
 
 type=$1

package/webif/files/ifup

@@ -1 +1 @@
 #!/bin/ash
 [ $# = 0 ] && { echo "  $0 <group>"; exit; }
-. /etc/functions.sh
+. /etc/network-nvram.sh
 type=$1
 debug "### ifup $type ###"

package/webif/files/network.init

@@ -5 +5 @@
         ifup_interfaces=${ifup_interfaces:-"lan wan wifi"}
         for iface in $ifup_interfaces; do
-                ifup $iface
+                ifup.nvram $iface
                 [ "$iface" = wifi ] && wifi up
         done

package/webif/files/usr/lib/webif/apply.sh

@@ -20 +20 @@
         echo '@TR<<Reloading>> @TR<<networking settings>> ...'
         egrep '^w?wan_' config-network >&- 2>&- && {
-                ifdown wan
-                ifup wan
+                ifdown.nvram wan
+                ifup.nvram wan
                 killall -HUP dnsmasq
         }
         
         grep '^lan_' config-network >&- 2>&- && {
-                ifdown lan
-                ifup lan
+                ifdown.nvram lan
+                ifup.nvram lan
                 killall dnsmasq
-                /etc/init.d/S??dnsmasq
+                /etc/init.d/S??dnsmasq-webif
         }
 }
@@ -38 +38 @@
         (
                 /sbin/wifi
-                [ -f /etc/init.d/S41wpa ] && /etc/init.d/S41wpa
+                [ -f /etc/init.d/S49nas ] && /etc/init.d/S49nas
         ) >&- 2>&- <&-
 }

package/webif/files/usr/lib/webif/webif.sh

@@ -65 +65 @@
         _uptime="${_uptime%%,*}"
         _hostname=$(cat /proc/sys/kernel/hostname)
-        _version=$( grep "(" /etc/banner )
-        _version="${_version%% ---*}"
+        _version=$(cat /etc/version)
         _head="${3:+<div class=\"settings-block-title\"><h2>$3$_saved_title</h2></div>}"
         _form="${5:+<form enctype=\"multipart/form-data\" action=\"$5\" method=\"post\"><input type=\"hidden\" name=\"submit\" value=\"1\" />}"