[RFC] [PATCH 6/7] Add WPA support to netcfg.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
makefile and small tidbits patch.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFIEs8NV8GyuTwyskMRAhPiAJ4+q7lkTumg4hMj8ribJ5G467ueYwCeMu9K
3sFAHYxnYAlShpYV4DPwfMU=
=RXTV
-----END PGP SIGNATURE-----
diff --git a/packages/netcfg/Makefile b/packages/netcfg/Makefile
index 4753350..15d2f67 100644
--- a/packages/netcfg/Makefile
+++ b/packages/netcfg/Makefile
@@ -17,8 +17,8 @@ endif
all: $(TARGETS)
-netcfg-static: netcfg-static.o static.o
-netcfg: netcfg.o dhcp.o static.o ethtool-lite.o
+netcfg-static: netcfg-static.o static.o wpa.o
+netcfg: netcfg.o dhcp.o static.o ethtool-lite.o wpa.o
$(TARGETS): $(COMMON_OBJS)
$(CC) -o $@ $^ $(LDOPTS)
diff --git a/packages/netcfg/base-installer b/packages/netcfg/base-installer
index da51feb..9ae7a56 100644
--- a/packages/netcfg/base-installer
+++ b/packages/netcfg/base-installer
@@ -1,7 +1,7 @@
#!/bin/sh -e
# Copy all relevant networking-related files to /target.
-for file in /etc/network/interfaces /etc/networks /etc/hostname /etc/resolv.conf /etc/hosts; do
+for file in /etc/network/interfaces /etc/networks /etc/hostname /etc/resolv.conf /etc/hosts /etc/wpa_supplicant/wpa_supplicant.conf; do
if [ -f "$file" ]; then
mkdir /target/$(dirname $file) -p
cp $file /target/$file
diff --git a/packages/netcfg/debian/rules b/packages/netcfg/debian/rules
index 21b5f13..1b2b5ce 100755
--- a/packages/netcfg/debian/rules
+++ b/packages/netcfg/debian/rules
@@ -26,7 +26,7 @@ install: build
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs -A usr/lib/base-installer.d etc/network bin
+ dh_installdirs -A usr/lib/base-installer.d etc/network etc/wpa_supplicant bin
# Install files that are the same in all packages
$(foreach PACKAGE, $(PACKAGES), \
install -m 755 $(PACKAGE) debian/$(PACKAGE)/bin/netcfg; \
@@ -36,7 +36,8 @@ install: build
$(foreach PACKAGE, $(DHCP_PACKAGES), \
mkdir -p debian/$(PACKAGE)/etc/dhcp debian/$(PACKAGE)/etc/dhcp3; \
mkdir -p debian/$(PACKAGE)/var/dhcp ; \
- install -m 755 killall.sh debian/$(PACKAGE)/bin/killall.sh)
+ install -m 755 killall.sh debian/$(PACKAGE)/bin/killall.sh; \
+ install -m 755 killwpa.sh debian/$(PACKAGE)/bin/killwpa.sh)
# Build architecture-independent files here.
Reply to: