diff options
author | Matthias Hentges <oe@hentges.net> | 2007-06-03 16:14:30 +0000 |
---|---|---|
committer | Matthias Hentges <oe@hentges.net> | 2007-06-03 16:14:30 +0000 |
commit | 40c44c63416e2aa92344d18c5f7e6d1be8884821 (patch) | |
tree | 98609d69fe861942fbfde37a66db1f8a7708d733 /packages/wpa-supplicant/wpa-supplicant-0.5.inc | |
parent | 65f4f9a4f9e79a26d86899ec2cecb4a46cdb79aa (diff) |
wpa-supplicant: Replace /etc/wpa_supplicant.conf with the Debian way to handle WPA:
- All configuration is done via /etc/network/interfaces (similiar to WEP)
- /etc/init.d/wpa is no longer needed
- wpa_supplicant is launched on ifup with the settings from /e/n/interfaces
Diffstat (limited to 'packages/wpa-supplicant/wpa-supplicant-0.5.inc')
-rw-r--r-- | packages/wpa-supplicant/wpa-supplicant-0.5.inc | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc index 28f355c612..b5e53e3f56 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/packages/wpa-supplicant/wpa-supplicant-0.5.inc @@ -12,24 +12,18 @@ DEFAULT_PREFERENCE = "-2" SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ - file://init.sh \ file://gnutlsfix.patch;patch=1 \ - file://defaults-sane \ - file://wpa-supplicant.sh \ - file://wpa_supplicant.conf \ - file://wpa_supplicant.conf-sane" + file://ifupdown.sh \ + file://functions.sh" S = "${WORKDIR}/wpa_supplicant-${PV}" -PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " +PACKAGES_prepend = "wpa-supplicant-passphrase " FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" -RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" +RREPLACES = "wpa-supplicant-cli" -INITSCRIPT_NAME = "wpa" -INITSCRIPT_PARAMS = "defaults 10" -inherit update-rc.d +RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" @@ -55,20 +49,16 @@ do_install () { install -d ${D}${localstatedir}/run/wpa_supplicant install -d ${D}${docdir}/wpa_supplicant - install -m 644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/init.d - install -m 700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - - install -d ${D}${sysconfdir}/default - install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa - install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf + install -m 644 README ${D}${docdir}/wpa_supplicant install -d ${D}${sysconfdir}/network/if-pre-up.d/ install -d ${D}${sysconfdir}/network/if-post-down.d/ install -d ${D}${sysconfdir}/network/if-down.d/ - install -m 644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - install -m 755 ${WORKDIR}/wpa-supplicant.sh ${D}${sysconfdir}/network/if-pre-up.d/wpa-supplicant - cd ${D}${sysconfdir}/network/ && \ - ln -sf ../if-pre-up.d/wpa-supplicant if-post-down.d/wpa-supplicant + + install -d ${D}${sysconfdir}/wpa_supplicant + install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/ + install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant + + ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant + ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant } |