--- a/ChangeLog	Fri Aug 29 18:36:58 2008 +0000
+++ b/ChangeLog	Sat Aug 30 04:59:54 2008 +0000
@@ -1,3 +1,8 @@
+2008-08-30  Jim Li  <[email protected]>
+
+	* patches/system-tools-backends-04-network.diff:
+          Fix for Bug#6743173, parse the new output format of 'dladm -p'
+
 2008-08-29  local account  <set EMAIL_ADDRESS environment variable>
 
 	Released 0.36 tarball and remove these patches. RE is still to upload

--- a/patches/system-tools-backends-04-network.diff	Fri Aug 29 18:36:58 2008 +0000
+++ b/patches/system-tools-backends-04-network.diff	Sat Aug 30 04:59:54 2008 +0000
@@ -1,5 +1,5 @@
---- system-tools-backends-1.4.2.orig/network-conf.in	Mon Jan  2 23:32:33 2006
-+++ system-tools-backends-1.4.2/network-conf.in	Fri May 30 14:37:10 2008
+--- system-tools-backends-1.4.2.orig/network-conf.in	Thu Aug 21 05:46:02 2008
++++ system-tools-backends-1.4.2/network-conf.in	Thu Aug 21 05:47:16 2008
 @@ -77,7 +77,8 @@
                "vine-3.0", "vine-3.1",
                "ark", 
@@ -32,8 +32,8 @@
    &gst_report_end ();
  
    &gst_xml_print_begin  ("enable-iface");
---- system-tools-backends-1.4.2.orig/network.pl.in	Mon Jan  2 23:50:54 2006
-+++ system-tools-backends-1.4.2/network.pl.in	Fri May 30 14:31:12 2008
+--- system-tools-backends-1.4.2.orig/network.pl.in	Thu Aug 21 05:46:02 2008
++++ system-tools-backends-1.4.2/network.pl.in	Sat Aug 30 06:10:46 2008
 @@ -28,8 +28,10 @@
  use Socket;
  
@@ -481,13 +481,13 @@
 +  my (@ifaces);
 +
 +  # First let's get all ethernet and wireless interfaces
-+  $fd = &gst_file_run_pipe_read ("dladm show-link -p");
++  $fd = &gst_file_run_pipe_read ("dladm show-link -p -o LINK");
 +
 +  unless ($fd eq undef)  {
 +    while (<$fd>)
 +    {
 +      chomp;
-+      if (/^\s*LINK="(\S*)".*/)
++      if (/^\s*(\S*)\s*/)
 +      {
 +        push @ifaces, $1;
 +      }
@@ -786,13 +786,13 @@
 +  &gst_report ("network_iface_active_get");
 +
 +  # First let's get all real network nterfaces known to the kernel
-+  $fd = &gst_file_run_pipe_read ("dladm show-link -p");
++  $fd = &gst_file_run_pipe_read ("dladm show-link -p -o LINK");
 +
 +  unless ($fd eq undef)  {
 +    while (<$fd>)
 +    {
 +      chomp;
-+      if (/^.*LINK="([^"]*)".*/)
++      if (/^\s*(\S*)\s*/)
 +      {
 +        $dev = $1;
 +        $ifaces{$dev}{"dev"}    = $dev;