Changeset 3063

Show
Ignore:
Timestamp:
07/02/07 14:06:40 (1 year ago)
Author:
tg
Message:

• fix cat abuse and double-sed
• change lanbridge config to “inet manual”, requested by wbx@

spaetzle: if changing ANYTHING in fwifupdown, PLEASE make sure that the
auto-generated network configs from the base-files package are in sync.
In _all_ possible combinations.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/package/base-files/Makefile

    r3053 r3063  
    1010PKG_NAME:=              base-files 
    1111PKG_VERSION:=           1.1 
    12 PKG_RELEASE:=           8 
     12PKG_RELEASE:=           9 
    1313WRKDIST=                ${WRKDIR}/base-files 
    1414NO_DISTFILES:=          1 
    …… 
    136136        echo -e "\n# LAN port configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    137137ifeq ($(strip $(subst ",,${FWRT_NETWORK_LAN_SWITCH_PORTS})),) 
    138         cat ./netcfg/interfaces.static | sed "/broadcast/d" | \ 
    139             sed "/^auto/d" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    140 else 
    141         cat ./netcfg/interfaces.static.switch | sed "/broadcast/d" | \ 
    142             sed "/^auto/d" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     138        sed '/broadcast/d' <netcfg/interfaces.manual \ 
     139            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     140else 
     141        sed '/broadcast/d' <netcfg/interfaces.manual.switch \ 
     142            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    143143        $(SED) "s/@FWRT_SWITCH_PORTS@/$(strip $(subst ",,${FWRT_NETWORK_LAN_SWITCH_PORTS}))/g" \ 
    144144            $(IDIR_BASE_FILES)/etc/network/interfaces 
    …… 
    234234        echo -e "\n# WLAN configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    235235ifeq ($(FWRT_NETWORK_LANBRIDGE),y) 
    236         cat ./netcfg/interfaces.wlan | sed "/broadcast/d" | \ 
    237             sed "/^auto/d" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     236        sed '/broadcast/d' <netcfg/interfaces.wlan.manual \ 
     237            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    238238        $(SED) "s/@FWRT_WLAN@/$(FWRT_NETWORK_WLAN_INTERFACE)/g" \ 
    239239            $(IDIR_BASE_FILES)/etc/network/interfaces 
    240         $(SED) "s/@FWRT_ADDRESS@/0.0.0.0/g" \ 
    241             $(IDIR_BASE_FILES)/etc/network/interfaces 
    242         $(SED) "s/@FWRT_NETMASK@/255.255.255.255/g" \ 
    243             $(IDIR_BASE_FILES)/etc/network/interfaces 
    244240        printf '\twireless-bridge-if %s\n' '${FWRT_NETWORK_LANBRIDGE_INTERFACE}' \ 
    245241            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    246242else 
    247         cat ./netcfg/interfaces.wlan \ 
    248             >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     243        cat netcfg/interfaces.wlan >>$(IDIR_BASE_FILES)/etc/network/interfaces 
    249244        $(SED) "s/@FWRT_WLAN@/$(FWRT_NETWORK_WLAN_INTERFACE)/g" \ 
    250245            $(IDIR_BASE_FILES)/etc/network/interfaces