diff options
| author | Mike Fiore <mfiore@multitech.com> | 2013-04-24 09:20:00 -0500 |
|---|---|---|
| committer | Mike Fiore <mfiore@multitech.com> | 2013-04-24 09:20:00 -0500 |
| commit | 00c38bd045e51fdecdf310c1de1462e6c5a9d182 (patch) | |
| tree | e6f2a2e5ca8704c08a160ad3af07326e80439ccc /multitech/recipes | |
| parent | 27fbad82e88a7e64ca0622e3fee6937c4a6daedc (diff) | |
| parent | 6ea81e4b677a05e47cdd93165ea5c3c1eea3916d (diff) | |
Merge branch 'master' of git.multitech.net:corecdp
Diffstat (limited to 'multitech/recipes')
| -rw-r--r-- | multitech/recipes/multitech/config/network/interfaces | 6 | ||||
| -rw-r--r-- | multitech/recipes/multitech/config_1.0.bb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/multitech/recipes/multitech/config/network/interfaces b/multitech/recipes/multitech/config/network/interfaces index ab3a27a..e34c39c 100644 --- a/multitech/recipes/multitech/config/network/interfaces +++ b/multitech/recipes/multitech/config/network/interfaces @@ -1,5 +1,5 @@ # /etc/network/interfaces -- configuration file for ifup(8), ifdown(8) - + # The loopback interface auto lo iface lo inet loopback @@ -11,7 +11,9 @@ address 192.168.2.1 netmask 255.255.255.0 # Wifi client -#auto wlan0 +# NOTE: udev rules will bring up wlan0 automatically if a wifi device is detected +# and the wlan0 interface is defined, therefore an "auto wlan0" line is not needed. +# If "auto wlan0" is also specified, startup conflicts may result. #iface wlan0 inet dhcp #wpa-conf /var/config/wpa_supplicant.conf #wpa-driver nl80211 diff --git a/multitech/recipes/multitech/config_1.0.bb b/multitech/recipes/multitech/config_1.0.bb index cdc0909..7d488d2 100644 --- a/multitech/recipes/multitech/config_1.0.bb +++ b/multitech/recipes/multitech/config_1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Provides default system config files and /var/config fs" SECTION = "base" LICENSE = "GPL" -PR = "r18" +PR = "r19" inherit update-rc.d |