diff --git a/lib/initcpio/install/arch_net b/lib/initcpio/install/arch_net index e629af6da..41e71ba24 100644 --- a/lib/initcpio/install/arch_net +++ b/lib/initcpio/install/arch_net @@ -8,7 +8,7 @@ install () for i in $STAGING; do MODULES="$MODULES $(checked_modules "/drivers/staging/$i")" done - BINARIES="ping ping6 route nslookup telnet ssh arpd genl ifcfg ifstat ip lnstat ctstat rtstat nstat routef routel rtacct rtmon rtpr ss tc dhclient" + BINARIES="ping ping6 route nslookup telnet ssh arpd genl ifcfg ifstat ip lnstat ctstat rtstat nstat routef routel rtacct rtmon rtpr ss tc dhclient ifplugd ifplugstatus" FILES="" SCRIPT="" add_file "/sbin/dhcpcd" @@ -37,6 +37,10 @@ install () add_file "/sbin/dhclient-script" add_dir "/var/lib/dhclient" add_dir "/var/state/dhcp" + # add ifplugd support + add_file "/etc/rc.d/ifplugd" + add_file ""/usr/share/archboot/net/etc/ifplugd/ifplugd.action" "/etc/ifplugd/ifplugd.action" + add_file ""/usr/share/archboot/net/etc/ifplugd/ifplugd.conf" "/etc/ifplugd/ifplugd.conf" # fixing licenses add_file "/usr/share/licenses/db/LICENSE" add_file "/usr/share/licenses/dhcpcd/LICENSE" diff --git a/lib/initcpio/install/arch_netcfg b/lib/initcpio/install/arch_netcfg index e79a65fbe..484fba757 100644 --- a/lib/initcpio/install/arch_netcfg +++ b/lib/initcpio/install/arch_netcfg @@ -3,7 +3,7 @@ install () { MODULES="" - BINARIES="netcfg-auto-wireless netcfg-menu netcfg2 netcfg" + BINARIES="net-auto-wired netcfg-wpa_actiond netcfg-wpa_actiond-action netcfg-menu netcfg2 netcfg" FILES="" SCRIPT="" for i in /usr/lib/network/*; do @@ -12,15 +12,21 @@ install () for i in /usr/lib/network/connections/*; do add_file $i done + for i in /usr/lib/network/hooks/*; do + add_file $i + done add_dir "/var/run/network/interfaces" add_dir "/var/run/network/profiles" for i in /etc/network.d/examples/*; do add_file $i done + add_dir "/etc/network.d/hooks" add_file "/etc/rc.d/net-profiles" add_file "/etc/rc.d/net-rename" - add_file "/etc/rc.d/net-auto" + add_file "/etc/rc.d/net-auto-wired" + add_file "/etc/rc.d/net-auto-wireless" add_file "/usr/share/archboot/netcfg/etc/iftab" "/etc/iftab" + add_file "/usr/share/archboot/netcfg/etc/ifplugd/netcfg.action" "/etc/ifplugd/netcfg.action" # fix licenses add_file "/usr/share/licenses/netcfg/LICENSE" } diff --git a/lib/initcpio/install/arch_wireless b/lib/initcpio/install/arch_wireless index fede58b3e..ce7d33849 100644 --- a/lib/initcpio/install/arch_wireless +++ b/lib/initcpio/install/arch_wireless @@ -8,7 +8,7 @@ install () for i in $STAGING; do MODULES="$MODULES $(checked_modules "/drivers/staging/$i")" done - BINARIES="iwconfig iwevent iwgetid iwlist iwpriv iwspy ifrename b43-fwcutter wpa_cli wpa_passphrase wpa_supplicant loadndisdriver perl iw crda regdbdump" + BINARIES="iwconfig iwevent iwgetid iwlist iwpriv iwspy ifrename b43-fwcutter wpa_cli wpa_passphrase wpa_supplicant loadndisdriver perl iw crda regdbdump wpa_actiond" FILES="" SCRIPT="" add_file "/usr/share/archboot/wireless/etc/conf.d/wireless" "/etc/conf.d/wireless"