Merge remote-tracking branch 'stevee/wlan-client' into next

Conflicts:
	config/cfgroot/general-functions.pl

diff --cc config/cfgroot/general-functions.pl
index 90eacbdb011487e2f4af8e60eb8cc42e249f3620,3a04369e357a652b13985afd2dc9a91a996d3367..3cdb36fbd4709229edd93b2f39893a145a17425f
--- 1/config/cfgroot/general-functions.pl
--- 2/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@@ -984,28 -981,26 +984,50 @@@ sub GetIcmpDescription ($) 
      if ($index>41) {return 'unknown'} else {return @icmp_description[$index]};
  }
  
 +sub GetCoreUpdateVersion() {
 +      my $core_update;
 +
 +      open(FILE, "/opt/pakfire/db/core/mine");
 +      while (<FILE>) {
 +              $core_update = $_;
 +              last;
 +      }
 +      close(FILE);
 +
 +      return $core_update;
 +}
 +
 +sub MakeUserAgent() {
 +      my $user_agent = "IPFire/$General::version";
 +
 +      my $core_update = &GetCoreUpdateVersion();
 +      if ($core_update ne "") {
 +              $user_agent .= "/$core_update";
 +      }
 +
 +      return $user_agent;
 +}
 +
+ sub RedIsWireless() {
+       # This function checks if a network device is a wireless device.
+ 
+       my %settings = ();
+       &readhash("${General::swroot}/ethernet/settings", \%settings);
+ 
+       # Find the name of the network device.
+       my $device = $settings{'RED_DEV'};
+ 
+       # Exit, if no device is configured.
+       return 0 if ($device eq "");
+ 
+       # Return 1 if the device is a wireless one.
+       my $path = "/sys/class/net/$device/wireless";
+       if (-d $path) {
+               return 1;
+       }
+ 
+       # Otherwise return zero.
+       return 0;
+ }
+ 
  1;

diff --cc config/rootfiles/common/armv5tel/initscripts
Simple merge

diff --cc config/rootfiles/common/i586/initscripts
Simple merge