Hello community, here is the log from the commit of package linuxrc checked in at Thu Aug 16 18:45:17 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-08-14 16:47:03.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-08-16 18:20:06.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 16 18:20:01 CEST 2007 - snwint@suse.de + +- really write proxy port (#300177) +- manual mode: allow to enter server port (#299224) +- nfsport option gone + +------------------------------------------------------------------- Old: ---- linuxrc-3.0.6.tar.bz2 New: ---- linuxrc-3.0.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.Yqo831/_old 2007-08-16 18:44:28.000000000 +0200 +++ /var/tmp/diff_new_pack.Yqo831/_new 2007-08-16 18:44:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.0.6) +# spec file for package linuxrc (Version 3.0.7) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ Group: System/Boot Autoreqprov: on Summary: SUSE Installation Program -Version: 3.0.6 +Version: 3.0.7 Release: 1 -Source: linuxrc-3.0.6.tar.bz2 +Source: linuxrc-3.0.7.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,10 @@ %doc linuxrc.html %changelog +* Thu Aug 16 2007 - snwint@suse.de +- really write proxy port (#300177) +- manual mode: allow to enter server port (#299224) +- nfsport option gone * Tue Aug 14 2007 - snwint@suse.de - fix nfs mount, nfs.tcp option gone (#216392) - fixed network setup bug ++++++ linuxrc-3.0.6.tar.bz2 -> linuxrc-3.0.7.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/Changelog new/linuxrc-3.0.7/Changelog --- old/linuxrc-3.0.6/Changelog 2007-08-14 16:46:50.000000000 +0200 +++ new/linuxrc-3.0.7/Changelog 2007-08-16 18:19:31.000000000 +0200 @@ -1,3 +1,8 @@ +16/8/2007: v3.0.7 + - really write proxy port (#300177) + - manual mode: allow to enter server port (#299224) + - nfsport option gone + 14/8/2007: v3.0.6 - fix nfs mount, nfs.tcp option gone (#216392) - fixed network setup bug diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/dialog.c new/linuxrc-3.0.7/dialog.c --- old/linuxrc-3.0.6/dialog.c 2007-08-01 12:50:28.000000000 +0200 +++ new/linuxrc-3.0.7/dialog.c 2007-08-16 17:36:39.000000000 +0200 @@ -52,7 +52,6 @@ { di_expert_animate, TXT_ASK_ANIMATE, }, { di_expert_forceroot, TXT_FORCE_ROOTIMAGE, }, { di_expert_rootimage, TXT_NEW_ROOTIMAGE, }, - { di_expert_nfsport, TXT_NFSPORT, }, { di_expert_bootptimeout, TXT_BOOTP_TIMEOUT, }, { di_expert_dhcp, 0, "DHCP/BOOTP" }, { di_expert_vnc, TXT_VNC_SWITCH }, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/dialog.h new/linuxrc-3.0.7/dialog.h --- old/linuxrc-3.0.6/dialog.h 2007-08-01 12:50:14.000000000 +0200 +++ new/linuxrc-3.0.7/dialog.h 2007-08-16 17:36:32.000000000 +0200 @@ -32,7 +32,6 @@ di_expert_animate, di_expert_forceroot, di_expert_rootimage, - di_expert_nfsport, di_expert_bootptimeout, di_expert_dhcp, di_expert_vnc, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/file.c new/linuxrc-3.0.7/file.c --- old/linuxrc-3.0.6/file.c 2007-08-14 15:59:31.000000000 +0200 +++ new/linuxrc-3.0.7/file.c 2007-08-16 17:34:54.000000000 +0200 @@ -146,7 +146,6 @@ { key_info, "Info", kf_cfg + kf_cmd_early }, { key_proxy, "Proxy", kf_cfg + kf_cmd }, { key_usedhcp, "UseDHCP", kf_cfg + kf_cmd }, - { key_nfsport, "NFSPort", kf_cfg + kf_cmd }, { key_dhcptimeout, "DHCPTimeout", kf_cfg + kf_cmd }, { key_tftptimeout, "TFTPTimeout", kf_cfg + kf_cmd }, { key_tmpfs, "_TmpFS", kf_cmd }, @@ -729,10 +728,6 @@ } break; - case key_nfsport: - if(f->is.numeric) config.net.nfs_port = f->nvalue; - break; - case key_memlimit: if(f->is.numeric) config.memory.min_free = f->nvalue; break; @@ -1571,7 +1566,7 @@ if(config.url.proxy->used.server.ok) { file_write_inet(f, key_proxy, &config.url.proxy->used.server); } - fprintf(f, "ProxyPort: %u\n", config.net.proxyport); + if(config.url.proxy->port) fprintf(f, "ProxyPort: %u\n", config.url.proxy->port); fprintf(f, "ProxyProto: http\n"); fprintf(f, "ProxyURL: %s\n", url_print(config.url.proxy, 1)); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/file.h new/linuxrc-3.0.7/file.h --- old/linuxrc-3.0.6/file.h 2007-08-14 15:59:42.000000000 +0200 +++ new/linuxrc-3.0.7/file.h 2007-08-16 17:34:39.000000000 +0200 @@ -21,7 +21,7 @@ key_bootfile, key_install, key_instsys, key_instmode, key_memtotal, key_memfree, key_buffers, key_cached, key_swaptotal, key_swapfree, key_memlimit, key_memyast, key_memloadimage, key_info, key_proxy, - key_usedhcp, key_nfsport, key_dhcptimeout, key_tftptimeout, key_tmpfs, + key_usedhcp, key_dhcptimeout, key_tftptimeout, key_tmpfs, key_testmode, key_debugwait, key_expert, key_rescue, key_rootimage, key_rescueimage, key_nopcmcia, key_vnc, key_vncpassword, key_displayip, key_sshpassword, key_term, key_addswap, key_aborted, key_netstop, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/global.h new/linuxrc-3.0.7/global.h --- old/linuxrc-3.0.6/global.h 2007-08-14 15:59:17.000000000 +0200 +++ new/linuxrc-3.0.7/global.h 2007-08-16 17:34:30.000000000 +0200 @@ -489,10 +489,6 @@ int file_length; /* length of currently retrieved file */ char *domain; /* domain name */ char *nisdomain; /* NIS domain name */ - unsigned proxyport; /* proxy port */ - unsigned port; /* port */ - instmode_t proxyproto; /* http or ftp */ - int nfs_port; /* nfs port */ int bootp_timeout; /* various timeout values (in s) */ int dhcp_timeout; int tftp_timeout; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/install.c new/linuxrc-3.0.7/install.c --- old/linuxrc-3.0.6/install.c 2007-08-09 17:37:49.000000000 +0200 +++ new/linuxrc-3.0.7/install.c 2007-08-16 17:28:51.000000000 +0200 @@ -685,13 +685,15 @@ */ int inst_do_network(instmode_t scheme) { - int i, err = 0, proxy_port = 0; + int i, err = 0, port = 0, n_port = 0, proxy_port = 0; unsigned u; char *s; char *buf = NULL, *buf2 = NULL, *path = NULL, *share = NULL, *domain = NULL, - *user = NULL, *password = NULL, *proxy_user = NULL, *proxy_password = NULL; + *user = NULL, *password = NULL, *proxy_user = NULL, *proxy_password = NULL, + *n_user = NULL, *n_password = NULL; char **to_free[] = { - &buf, &buf2, &path, &share, &domain, &user, &password, &proxy_user, &proxy_password + &buf, &buf2, &path, &share, &domain, &user, &password, &proxy_user, &proxy_password, + &n_user, &n_password }; inet_t server = {}, proxy = {}; @@ -706,11 +708,75 @@ str_copy(&domain, config.url.install->domain); str_copy(&user, config.url.install->user); str_copy(&password, config.url.install->password); + port = config.url.install->port; } /* server name */ strprintf(&buf, txt_get(TXT_INPUT_NETSERVER), get_instmode_name_up(scheme)); - if(net_get_address(buf, &server, 1)) err = 1; + if(net_get_address2(buf, &server, 1, &n_user, &n_password, &n_port)) err = 1; + if(!err && n_port) port = n_port; + + /* smb share */ + if(!err && scheme == inst_smb && dia_input2(txt_get(TXT_SMB_ENTER_SHARE), &share, 30, 0)) err = 1; + + /* path */ + if(!err && dia_input2(txt_get(TXT_INPUT_DIR), &path, 30, 0)) err = 1; + + /* user, password */ + if(!err && (scheme == inst_http || scheme == inst_ftp)) { + if(!n_user) { + strprintf(&buf, + txt_get(TXT_USER_PW_SERVER), + get_instmode_name_up(scheme) + ); + i = dia_yesno(buf, NO); + + if(i == ESCAPE) { + err = 1; + } + else { + if(i == NO) { + str_copy(&user, NULL); + str_copy(&password, NULL); + } + else { + strprintf(&buf, txt_get(TXT_ENTER_USER), get_instmode_name_up(scheme)); + strprintf(&buf2, txt_get(TXT_ENTER_PASSWORD), get_instmode_name_up(scheme)); + if( + dia_input2(buf, &user, 20, 0) || + dia_input2(buf2, &password, 20, 1) + ) err = 1; + } + } + } + else { + str_copy(&user, n_user); + str_copy(&password, n_password); + } + } + + /* smb user, password, workgroup */ + if(!err && scheme == inst_smb) { + i = dia_yesno(txt_get(TXT_SMB_GUEST_LOGIN), YES); + + if(i == ESCAPE) { + err = 1; + } + else { + if(i == YES) { + str_copy(&user, NULL); + str_copy(&password, NULL); + str_copy(&domain, NULL); + } + else { + if( + dia_input2(txt_get(TXT_SMB_ENTER_USER), &user, 20, 0) || + dia_input2(txt_get(TXT_SMB_ENTER_PASSWORD), &password, 20, 1) || + dia_input2(txt_get(TXT_SMB_ENTER_WORKGROUP), &domain, 20, 0) + ) err = 1; + } + } + } /* proxy setup */ if(!err && (scheme == inst_http || scheme == inst_ftp)) { @@ -731,45 +797,56 @@ else if(i == YES) { /* new proxy */ strprintf(&buf, txt_get(TXT_ENTER_PROXY), get_instmode_name_up(inst_http)); - if(net_get_address(buf, &proxy, 1)) err = 1; + if(net_get_address2(buf, &proxy, 1, &n_user, &n_password, &n_port)) err = 1; if(!err) { - strprintf(&buf2, "%u", proxy_port); - strprintf(&buf, txt_get(TXT_ENTER_PROXYPORT), get_instmode_name_up(inst_http)); - if(dia_input2(buf, &buf2, 6, 0)) err = 1; - if(!err) { - u = strtoul(buf2, &s, 0); - if(*s) { - dia_message(txt_get(TXT_INVALID_INPUT), MSGTYPE_ERROR); - err = 1; - } - else { - proxy_port = u; + if(!n_port) { + strprintf(&buf2, "%u", proxy_port); + strprintf(&buf, txt_get(TXT_ENTER_PROXYPORT), get_instmode_name_up(inst_http)); + if(dia_input2(buf, &buf2, 6, 0)) err = 1; + if(!err) { + u = strtoul(buf2, &s, 0); + if(*s) { + dia_message(txt_get(TXT_INVALID_INPUT), MSGTYPE_ERROR); + err = 1; + } + else { + proxy_port = u; + } } } + else { + proxy_port = n_port; + } } /* proxy user, password */ if(!err) { - i = dia_yesno(txt_get(TXT_USER_PW_PROXY), NO); + if(!n_user) { + i = dia_yesno(txt_get(TXT_USER_PW_PROXY), NO); - if(i == ESCAPE) { - err = 1; - } - else { - if(i == NO) { - str_copy(&proxy_user, NULL); - str_copy(&proxy_password, NULL); + if(i == ESCAPE) { + err = 1; } else { - strprintf(&buf, txt_get(TXT_ENTER_USER), "proxy"); - strprintf(&buf2, txt_get(TXT_ENTER_PASSWORD), "proxy"); - if( - dia_input2(buf, &proxy_user, 20, 0) || - dia_input2(buf2, &proxy_password, 20, 1) - ) err = 1; + if(i == NO) { + str_copy(&proxy_user, NULL); + str_copy(&proxy_password, NULL); + } + else { + strprintf(&buf, txt_get(TXT_ENTER_USER), "proxy"); + strprintf(&buf2, txt_get(TXT_ENTER_PASSWORD), "proxy"); + if( + dia_input2(buf, &proxy_user, 20, 0) || + dia_input2(buf2, &proxy_password, 20, 1) + ) err = 1; + } } } + else { + str_copy(&proxy_user, n_user); + str_copy(&proxy_password, n_password); + } } } else { @@ -792,62 +869,6 @@ } } - /* smb share */ - if(!err && scheme == inst_smb && dia_input2(txt_get(TXT_SMB_ENTER_SHARE), &share, 30, 0)) err = 1; - - /* path */ - if(!err && dia_input2(txt_get(TXT_INPUT_DIR), &path, 30, 0)) err = 1; - - /* user, password */ - if(!err && (scheme == inst_http || scheme == inst_ftp)) { - strprintf(&buf, - txt_get(TXT_USER_PW_SERVER), - get_instmode_name_up(scheme) - ); - i = dia_yesno(buf, NO); - - if(i == ESCAPE) { - err = 1; - } - else { - if(i == NO) { - str_copy(&user, NULL); - str_copy(&password, NULL); - } - else { - strprintf(&buf, txt_get(TXT_ENTER_USER), get_instmode_name_up(scheme)); - strprintf(&buf2, txt_get(TXT_ENTER_PASSWORD), get_instmode_name_up(scheme)); - if( - dia_input2(buf, &user, 20, 0) || - dia_input2(buf2, &password, 20, 1) - ) err = 1; - } - } - } - - /* smb user, password, workgroup */ - if(!err && scheme == inst_smb) { - i = dia_yesno(txt_get(TXT_SMB_GUEST_LOGIN), YES); - - if(i == ESCAPE) { - err = 1; - } - else { - if(i == YES) { - str_copy(&user, NULL); - str_copy(&password, NULL); - str_copy(&domain, NULL); - } - else { - if( - dia_input2(txt_get(TXT_SMB_ENTER_USER), &user, 20, 0) || - dia_input2(txt_get(TXT_SMB_ENTER_PASSWORD), &password, 20, 1) || - dia_input2(txt_get(TXT_SMB_ENTER_WORKGROUP), &domain, 20, 0) - ) err = 1; - } - } - } - /* set new values */ if(!err) { url_free(config.url.install); @@ -858,6 +879,8 @@ memcpy(&config.url.install->used.server, &server, sizeof config.url.install->used.server); memset(&server, 0, sizeof server); + config.url.install->port = port; + str_copy(&config.url.install->device, config.net.device); str_copy(&config.url.install->used.device, config.net.device); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/linuxrc.c new/linuxrc-3.0.7/linuxrc.c --- old/linuxrc-3.0.6/linuxrc.c 2007-08-14 16:00:01.000000000 +0200 +++ new/linuxrc-3.0.7/linuxrc.c 2007-08-16 17:39:38.000000000 +0200 @@ -974,7 +974,7 @@ config.manual |= 1; if(j) { sprintf(buf, "Could not find the %s ", config.product); - strcat(buf, "Installation Source."); + strcat(buf, "Repository."); strcat(buf, "\n\nActivating manual setup program.\n"); dia_message(buf, MSGTYPE_ERROR); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/net.c new/linuxrc-3.0.7/net.c --- old/linuxrc-3.0.6/net.c 2007-08-14 15:56:34.000000000 +0200 +++ new/linuxrc-3.0.7/net.c 2007-08-16 17:34:19.000000000 +0200 @@ -54,6 +54,7 @@ #include "file.h" #include "module.h" #include "hotplug.h" +#include "url.h" #define NFS_PROGRAM 100003 #define NFS_VERSION 2 @@ -76,7 +77,7 @@ static int net_input_data(void); #endif static void net_show_error(enum nfs_stat status_rv); -static int _net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, int flags); +static int _net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, unsigned port, int flags); static void if_down(char *dev); static int wlan_auth_cb(dia_item_t di); @@ -813,23 +814,22 @@ * * config.net.nfs_rsize: read size * config.net.nfs_wsize: write size - * config.net.nfs_port: NFS port * * return: * 0: ok * != 0: error code * */ -int net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir) +int net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, unsigned port) { int err; /* first, v3 with tcp */ - err = _net_mount_nfs(mountpoint, server, hostdir, NFS_MOUNT_TCP | NFS_MOUNT_VER3 | NFS_MOUNT_NONLM); + err = _net_mount_nfs(mountpoint, server, hostdir, port, NFS_MOUNT_TCP | NFS_MOUNT_VER3 | NFS_MOUNT_NONLM); /* if that doesn't work, try v2, with udp */ if(err == EPROTONOSUPPORT) { - err = _net_mount_nfs(mountpoint, server, hostdir, NFS_MOUNT_NONLM); + err = _net_mount_nfs(mountpoint, server, hostdir, port, NFS_MOUNT_NONLM); } return err; @@ -848,19 +848,18 @@ * * config.net.nfs_rsize: read size * config.net.nfs_wsize: write size - * config.net.nfs_port: NFS port * * return: * 0: ok * != 0: error code * */ -int _net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, int flags) +int _net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, unsigned port, int flags) { struct sockaddr_in server_in, mount_server_in; struct nfs_mount_data mount_data; CLIENT *client; - int sock, fsock, port, err, i; + int sock, fsock, err, i; struct timeval tv; struct fhstatus fhs; char *buf = NULL; @@ -942,11 +941,7 @@ return -1; } - if(config.net.nfs_port) { - fprintf(stderr, "nfs: using specified port %d\n", config.net.nfs_port); - port = config.net.nfs_port; - } - else { + if(!port) { server_in.sin_port = PMAPPORT; port = pmap_getport(&server_in, NFS_PROGRAM, NFS_VERSION, IPPROTO_UDP); if(!port) port = NFS_PORT; @@ -1512,20 +1507,84 @@ */ int net_get_address(char *text, inet_t *inet, int do_dns) { - int rc; + int err = 0; char input[256]; *input = 0; if(inet->name) strcpy(input, inet->name); do { - if((rc = dia_input(text, input, sizeof input - 1, 16, 0))) return rc; + if((err = dia_input(text, input, sizeof input - 1, 16, 0))) break; name2inet(inet, input); - rc = net_check_address2(inet, do_dns); - if(rc) dia_message(txt_get(TXT_INVALID_INPUT), MSGTYPE_ERROR); - } while(rc); + err = net_check_address2(inet, do_dns); + if(err) dia_message(txt_get(TXT_INVALID_INPUT), MSGTYPE_ERROR); + } while(err); - return 0; + return err; +} + + +/* + * Ask user for some network address. + * (Used for netmasks, too.) + * + * Either numeric or dns resolved. + * + * Return: + * 0: ok + * != 0: error or abort + * + * Note: expects window mode. + */ +int net_get_address2(char *text, inet_t *inet, int do_dns, char **user, char **password, unsigned *port) +{ + int err = 0; + unsigned n_port = 0; + char *input = NULL, *buf = NULL, *n_user = NULL, *n_password = NULL; + url_t *url; + + str_copy(&input, inet->name); + + do { + if((err = dia_input2(text, &input, 16, 0))) break; + if(input) { + if((user || password || port) && strchr(input, ':')) { + strprintf(&buf, "http://%s", input); + url = url_set(buf); + if(url->server) { + name2inet(inet, url->server); + n_port = url->port; + str_copy(&n_user, url->user); + str_copy(&n_password, url->password); + } + else { + err = 1; + } + url_free(url); + } + else { + name2inet(inet, input); + } + if(!err) err = net_check_address2(inet, do_dns); + } + else { + err = 1; + } + if(err) dia_message(txt_get(TXT_INVALID_INPUT), MSGTYPE_ERROR); + } while(err); + + if(!err) { + if(port) *port = n_port; + if(user) str_copy(user, n_user); + if(password) str_copy(password, n_password); + } + + str_copy(&input, NULL); + str_copy(&buf, NULL); + str_copy(&n_user, NULL); + str_copy(&n_password, NULL); + + return err; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/net.h new/linuxrc-3.0.7/net.h --- old/linuxrc-3.0.6/net.h 2006-10-20 13:02:47.000000000 +0200 +++ new/linuxrc-3.0.7/net.h 2007-08-16 17:32:26.000000000 +0200 @@ -9,7 +9,7 @@ int net_config(void); int net_bootp(void); void net_ask_password(void); -int net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir); +int net_mount_nfs(char *mountpoint, inet_t *server, char *hostdir, unsigned port); int net_mount_smb(char *mountpoint, inet_t *server, char *hostdir, char *user, char *password, char *workgroup); void net_smb_get_mount_options(char *options, inet_t *server, char *user, char *password, char *workgroup); void net_stop(void); @@ -22,6 +22,7 @@ void net_dhcp_stop(void); unsigned net_config_mask(void); int net_get_address(char *text, inet_t *inet, int do_dns); +int net_get_address2(char *text, inet_t *inet, int do_dns, char **user, char **password, unsigned *port); char *net_if2module(char *net_if); void net_apply_ethtool(char *device, char *hwaddr); int wlan_setup(void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/settings.c new/linuxrc-3.0.7/settings.c --- old/linuxrc-3.0.6/settings.c 2007-08-01 12:50:05.000000000 +0200 +++ new/linuxrc-3.0.7/settings.c 2007-08-16 17:37:40.000000000 +0200 @@ -554,7 +554,6 @@ di_expert_animate, di_expert_forceroot, di_expert_rootimage, - di_expert_nfsport, di_expert_bootptimeout, di_expert_dhcp, di_expert_vnc, @@ -608,15 +607,6 @@ rc = dia_input2(txt_get(TXT_ENTER_ROOTIMAGE), &config.rootimage, 30, 0); break; - case di_expert_nfsport: - if(config.net.nfs_port) - sprintf(tmp, "%d", config.net.nfs_port); - else - *tmp = 0; - rc = dia_input(txt_get(TXT_ENTER_NFSPORT), tmp, 6, 6, 0); - if(!rc) config.net.nfs_port = atoi(tmp); - break; - case di_expert_bootptimeout: sprintf(tmp, "%d", config.net.bootp_timeout); rc = dia_input(txt_get(TXT_ENTER_BOOTP_TIMEOUT), tmp, 4, 4, 0); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/url.c new/linuxrc-3.0.7/url.c --- old/linuxrc-3.0.6/url.c 2007-08-14 12:44:51.000000000 +0200 +++ new/linuxrc-3.0.7/url.c 2007-08-16 17:31:45.000000000 +0200 @@ -969,7 +969,7 @@ if(config.debug) fprintf(stderr, "[server = %s]\n", inet2print(&url->used.server)); - err = net_mount_nfs(url->mount, &url->used.server, url->path); + err = net_mount_nfs(url->mount, &url->used.server, url->path, url->port); fprintf(stderr, "nfs: %s -> %s (%d)\n", url->path, url->mount, err); if(err == ENOTDIR || err == ENOENT) { @@ -982,7 +982,7 @@ if(config.debug) fprintf(stderr, "[server = %s]\n", inet2print(&url->used.server)); - err = net_mount_nfs(url->tmp_mount, &url->used.server, buf); + err = net_mount_nfs(url->tmp_mount, &url->used.server, buf, url->port); fprintf(stderr, "nfs: %s -> %s (%d)\n", buf, url->tmp_mount, err); if(err) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/util.c new/linuxrc-3.0.7/util.c --- old/linuxrc-3.0.6/util.c 2007-08-14 15:59:50.000000000 +0200 +++ new/linuxrc-3.0.7/util.c 2007-08-16 17:36:11.000000000 +0200 @@ -1205,6 +1205,12 @@ slist_append_str(&sl0, buf); } + if((s = url_print(config.url.proxy, 0))) { + slist_append_str(&sl0, "proxy url:"); + sprintf(buf, " %s", s); + slist_append_str(&sl0, buf); + } + if(config.autoyast) { sprintf(buf, "autoyast = %s", config.autoyast); slist_append_str(&sl0, buf); @@ -1249,12 +1255,6 @@ slist_append_str(&sl0, buf); } - if((s = url_print(config.url.proxy, 0))) { - slist_append_str(&sl0, "proxy url:"); - sprintf(buf, " %s", s); - slist_append_str(&sl0, buf); - } - sprintf(buf, "ptp host = %s", inet2print(&config.net.ptphost)); slist_append_str(&sl0, buf); @@ -1310,16 +1310,8 @@ slist_append_str(&sl0, buf); } - if(config.net.nfs_port || config.net.bootp_wait) { - *buf = 0; - if(config.net.nfs_port) sprintf(buf, "nfs port = %d", config.net.nfs_port); - if(config.net.bootp_wait) { - sprintf(buf + strlen(buf), - "%sbootp wait = %d", - config.net.nfs_port ? ", " : "", - config.net.bootp_wait - ); - } + if(config.net.bootp_wait) { + sprintf(buf, "bootp wait = %d", config.net.bootp_wait); slist_append_str(&sl0, buf); } @@ -2027,7 +2019,7 @@ *srv_dir++ = 0; str_copy(&inet.name, dev); - i = net_mount_nfs(dir, &inet, srv_dir); + i = net_mount_nfs(dir, &inet, srv_dir, 0); if(i && errno) { i = errno; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.6/VERSION new/linuxrc-3.0.7/VERSION --- old/linuxrc-3.0.6/VERSION 2007-08-13 16:12:10.000000000 +0200 +++ new/linuxrc-3.0.7/VERSION 2007-08-16 17:28:58.000000000 +0200 @@ -1 +1 @@ -3.0.6 +3.0.7 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org