commit linuxrc for openSUSE:Factory
Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at Thu Jan 29 00:22:11 CET 2009. -------- --- linuxrc/linuxrc.changes 2009-01-20 16:49:40.000000000 +0100 +++ linuxrc/linuxrc.changes 2009-01-27 16:18:41.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Jan 27 16:18:38 CET 2009 - snwint@suse.de + +- do not ask for display type in auto mode (bnc #446458) +- correctly detect dhcp failure (bnc #406475) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- linuxrc-3.3.27.tar.bz2 New: ---- linuxrc-3.3.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.b25934/_old 2009-01-29 00:19:24.000000000 +0100 +++ /var/tmp/diff_new_pack.b25934/_new 2009-01-29 00:19:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.3.27) +# spec file for package linuxrc (Version 3.3.29) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.3.27 +Version: 3.3.29 Release: 1 -Source: linuxrc-3.3.27.tar.bz2 +Source: linuxrc-3.3.29.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,6 +61,9 @@ %doc linuxrc.html %changelog +* Tue Jan 27 2009 snwint@suse.de +- do not ask for display type in auto mode (bnc #446458) +- correctly detect dhcp failure (bnc #406475) * Tue Jan 20 2009 snwint@suse.de - load edd before starting udev (bnc #465709) * Mon Jan 19 2009 snwint@suse.de ++++++ linuxrc-3.3.27.tar.bz2 -> linuxrc-3.3.29.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.27/Changelog new/linuxrc-3.3.29/Changelog --- old/linuxrc-3.3.27/Changelog 2009-01-20 16:19:38.000000000 +0100 +++ new/linuxrc-3.3.29/Changelog 2009-01-27 16:17:42.000000000 +0100 @@ -1,6 +1,12 @@ ****** This is NOT sle11/11.1! ****** +27/1/2009: v3.3.29 + - correctly detect dhcp failure (bnc #406475) + +23/1/2009: v3.3.28 + - do not ask for display type in auto mode (bnc #446458) + 20/1/2009: v3.3.27 - load edd before starting udev (bnc #465709) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.27/install.c new/linuxrc-3.3.29/install.c --- old/linuxrc-3.3.27/install.c 2009-01-12 18:42:47.000000000 +0100 +++ new/linuxrc-3.3.29/install.c 2009-01-23 16:34:42.000000000 +0100 @@ -239,17 +239,23 @@ #if defined(__s390__) || defined(__s390x__) int inst_choose_display() { - dia_item_t di; - dia_item_t items[] = { - di_display_x11, - di_display_vnc, - di_display_ssh, - di_none - }; + if(!config.manual && (config.net.displayip.ok || config.vnc || config.usessh)) { + net_ask_password(); + return 0; + } + else { + dia_item_t di; + dia_item_t items[] = { + di_display_x11, + di_display_vnc, + di_display_ssh, + di_none + }; - di = dia_menu2(txt_get(TXT_CHOOSE_DISPLAY), 33, inst_choose_display_cb, items, di_inst_choose_display_last); + di = dia_menu2(txt_get(TXT_CHOOSE_DISPLAY), 33, inst_choose_display_cb, items, di_inst_choose_display_last); - return di == di_none ? -1 : 0; + return di == di_none ? -1 : 0; + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.27/net.c new/linuxrc-3.3.29/net.c --- old/linuxrc-3.3.27/net.c 2008-11-25 18:05:33.000000000 +0100 +++ new/linuxrc-3.3.29/net.c 2009-01-27 15:59:26.000000000 +0100 @@ -1847,6 +1847,7 @@ char cmd[256], file[256], *s; file_t *f0, *f; window_t win; + int got_ip = 0; slist_t *sl0, *sl; if(config.net.dhcp_active || config.net.keep) return 0; @@ -1887,6 +1888,7 @@ for(f = f0; f; f = f->next) { switch(f->key) { case key_ipaddr: + got_ip = 1; name2inet(&config.net.hostname, f->value); net_check_address(&config.net.hostname, 0); break; @@ -1946,7 +1948,7 @@ if(config.win) win_close(&win); - if(f0) { + if(got_ip) { config.net.dhcp_active = 1; if(config.net.ifup_wait) sleep(config.net.ifup_wait); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.3.27/VERSION new/linuxrc-3.3.29/VERSION --- old/linuxrc-3.3.27/VERSION 2009-01-20 16:04:30.000000000 +0100 +++ new/linuxrc-3.3.29/VERSION 2009-01-27 15:59:39.000000000 +0100 @@ -1 +1 @@ -3.3.27 +3.3.29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de