[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipfire-scm
Subject:    [git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 86918e351d1e258f33cd6b7dc401
From:       git () ipfire ! org (Arne Fitzenreiter)
Date:       2012-09-26 11:41:53
Message-ID: 20120926114153.BB98A200BB () argus ! ipfire ! org
[Download RAW message or body]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, thirteen has been updated
       via  86918e351d1e258f33cd6b7dc401a0c97488ac02 (commit)
       via  371d0e29bc28faca571f920525716f19773a4041 (commit)
      from  0ffd7752112e40abfd1820146f41e1a869c9a171 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 86918e351d1e258f33cd6b7dc401a0c97488ac02
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date:   Tue Sep 25 16:08:43 2012 -0400

    setup: fix setup on arm if dhcp client is selected.

commit 371d0e29bc28faca571f920525716f19773a4041
Author: Arne Fitzenreiter <arne_f at ipfire.org>
Date:   Tue Sep 25 16:08:24 2012 -0400

    dracut: fix omap initrd.

-----------------------------------------------------------------------

Summary of changes:
 lfs/dracut                             |    2 +-
 src/install+setup/libsmooth/netstuff.c |   11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

Difference in files:
diff --git a/lfs/dracut b/lfs/dracut
index f2195a7..0779a6b 100644
--- a/lfs/dracut
+++ b/lfs/dracut
@@ -96,7 +96,7 @@ ifeq "$(MACHINE_TYPE)" "arm"
 	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-kirkwood.img $(KVER)-ipfire-kirkwood
 	cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-kirkwood.img uInit-ipfire-kirkwood
 	# omap kernel
-	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-omap.img $(KVER3)-ipfire-omap
+	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER)-omap.img $(KVER)-ipfire-omap
 	cd /boot && mkimage -A arm -T ramdisk -C lzma -d ipfirerd-$(KVER)-omap.img uInit-ipfire-omap
 else
 	/sbin/dracut --force --verbose --strip /boot/ipfirerd-$(KVER).img $(KVER)-ipfire
diff --git a/src/install+setup/libsmooth/netstuff.c b/src/install+setup/libsmooth/netstuff.c
index 46e49c0..de5c558 100644
--- a/src/install+setup/libsmooth/netstuff.c
+++ b/src/install+setup/libsmooth/netstuff.c
@@ -221,7 +221,14 @@ int changeaddress(struct keyvalue *kv, char *colour, int typeflag,
 				setnetaddress(kv, colour);
 				result = 1;
 			}
-		}			
+		}
+		/* Workaround for a bug that dhcp radiobutton also end the dialog at arm
+		*/
+		else {
+			if (es.u.co != cancel) {
+				error = 1;
+			}
+		}
 	}
 	while (error);
 
@@ -322,7 +329,7 @@ void networkdialogcallbacktype(newtComponent cm, void *data)
 		newtEntrySetFlags(dhcpforcemtuentry, NEWT_FLAG_DISABLED, NEWT_FLAGS_SET);		
 	}
 	newtRefresh();
-	newtDrawForm(networkform);	
+	newtDrawForm(networkform);
 }
 
 int interfacecheck(struct keyvalue *kv, char *colour)


hooks/post-receive
--
IPFire 2.x development tree

[prev in list] [next in list] [prev in thread] [next in thread]