diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-05-02 12:21:43 -0700 |
|---|---|---|
| committer | Irfan Sheriff <isheriff@google.com> | 2011-05-02 12:21:43 -0700 |
| commit | a68ff199ae71689a966e1b8c1a0147dc58040588 (patch) | |
| tree | fe36eed5df410c7597251c644b7218e26efc12a4 /init.herring.rc | |
| parent | 96753b04e2d89309fd22a4c75d141d6e8d4672d2 (diff) | |
| parent | 06399ebfa2fbbb4cc9c1c66ccb3668c6def92a35 (diff) | |
| download | device_samsung_crespo-a68ff199ae71689a966e1b8c1a0147dc58040588.zip device_samsung_crespo-a68ff199ae71689a966e1b8c1a0147dc58040588.tar.gz device_samsung_crespo-a68ff199ae71689a966e1b8c1a0147dc58040588.tar.bz2 | |
resolved conflicts for merge of 06399ebf to honeycomb-plus-aosp
Change-Id: I6264bc8b47ecc73a11c55a9d1dd0e38ba238b343
Diffstat (limited to 'init.herring.rc')
| -rwxr-xr-x | init.herring.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init.herring.rc b/init.herring.rc index 04a1a53..c4e21a9 100755 --- a/init.herring.rc +++ b/init.herring.rc @@ -82,7 +82,7 @@ service wpa_supplicant /system/bin/wpa_supplicant -Dwext -iwlan0 -c/data/misc/wi # DHCPCD # wi-fi -service dhcpcd_eth0 /system/bin/dhcpcd -ABKL +service dhcpcd_wlan0 /system/bin/dhcpcd -ABKL disabled oneshot @@ -93,7 +93,7 @@ service dhcpcd_uwbr0 /system/bin/dhcpcd -ABKL # IP Renew # wi-fi -service iprenew_eth0 /system/bin/dhcpcd -n +service iprenew_wlan0 /system/bin/dhcpcd -n disabled oneshot |