Changeset 295

Timestamp:

Jul 24, 2011, 1:50:19 PM (8 years ago)

Author:

amain

Message:

debwrt-net: fix some minor install issues, add dnsmasq support

Location:

trunk/debian/package/debwrt-net/debian

Files:

• conffiles (modified) (1 diff)
• control (modified) (1 diff)
• postinst (modified) (1 diff)
• rules (modified) (1 diff)

trunk/debian/package/debwrt-net/debian/conffiles

@@ -4 +4 @@
 /etc/firewall/firewall.sh
 /etc/sysctl.d/debwrt.conf
+/etc/dnsmasq.d/debwrt.conf

trunk/debian/package/debwrt-net/debian/control

@@ -8 +8 @@
 Package: debwrt-net
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, robocfg (>= 1.0.1), broadcom-wl, hostapd, swconfig
+Depends: ${shlibs:Depends}, ${misc:Depends}, robocfg (>= 1.0.1), broadcom-wl, hostapd, swconfig, dnsmasq
 Description: DebWrt network scripts

trunk/debian/package/debwrt-net/debian/postinst

@@ -22 +22 @@
 case ${ACTION} in
     configure)
-       if ! cat /etc/modules 2>/dev/null | grep wl; then
-          cat >/etc/modules <<EOF
+       if ! cat /etc/modules 2>/dev/null | grep -q -e "^wl" -e "^#\W*wl"; then
+          cat >>/etc/modules <<EOF
 # DebWrt - default is to use the proprietary wl driver
 #          there are still performance problems with the open source b43 driver in AP mode
+#          uncomment to use broadcom
+#          ( note: also unblacklist b43 in /etc/modprobe.d/b43.conf )
 wl
 EOF

trunk/debian/package/debwrt-net/debian/rules

@@ -14 +14 @@
         install -o root -g root -d $(INSTDIR)/etc/modprobe.d
         install -o root -g root -d $(INSTDIR)/etc/sysctl.d
+        install -o root -g root -d $(INSTDIR)/etc/dnsmasq.d
         install -o root -g root -d $(INSTDIR)/usr/share/doc/debwrt-net
-        install -o root -g root -m 644 usr/sbin/pciunbind              $(INSTDIR)/usr/sbin/pciunbind
+        install -o root -g root -m 755 usr/sbin/pciunbind              $(INSTDIR)/usr/sbin/pciunbind
         install -o root -g root -m 644 etc/network/interfaces.broadcom $(INSTDIR)/etc/network/interfaces.broadcom
         install -o root -g root -m 644 etc/modprobe.d/wl.conf          $(INSTDIR)/etc/modprobe.d/wl.conf
         install -o root -g root -m 644 etc/modprobe.d/b43.conf         $(INSTDIR)/etc/modprobe.d/b43.conf
-        install -o root -g root -m 644 etc/firewall/firewall.sh        $(INSTDIR)/etc/firewall/firewall.sh
+        install -o root -g root -m 755 etc/firewall/firewall.sh        $(INSTDIR)/etc/firewall/firewall.sh
         install -o root -g root -m 644 etc/sysctl.d/debwrt.conf        $(INSTDIR)/etc/sysctl.d/debwrt.conf
         install -o root -g root -m 644 usr/share/doc/debwrt-net/nas    $(INSTDIR)/usr/share/doc/debwrt-net/nas
+        install -o root -g root -m 644 etc/dnsmasq.d/debwrt.conf       $(INSTDIR)/etc/dnsmasq.d/debwrt.conf
+