Hello community, here is the log from the commit of package linuxrc checked in at Sat Oct 21 22:16:21 CEST 2006. -------- --- linuxrc/linuxrc.changes 2006-10-19 18:07:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2006-10-20 15:28:40.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Oct 20 15:28:37 CEST 2006 - snwint@suse.de + +- get rid of network config questions after failed network + install (#171102) +- add wlan setup during auto install + +------------------------------------------------------------------- Old: ---- linuxrc-2.1.8.tar.bz2 New: ---- linuxrc-2.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.RELYHt/_old 2006-10-21 22:16:16.000000000 +0200 +++ /var/tmp/diff_new_pack.RELYHt/_new 2006-10-21 22:16:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.1.8) +# spec file for package linuxrc (Version 2.1.9) # # Copyright (c) 2006 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: 2.1.8 +Version: 2.1.9 Release: 1 -Source: linuxrc-2.1.8.tar.bz2 +Source: linuxrc-2.1.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,10 @@ %doc linuxrc.html %changelog -n linuxrc +* Fri Oct 20 2006 - snwint@suse.de +- get rid of network config questions after failed network + install (#171102) +- add wlan setup during auto install * Thu Oct 19 2006 - snwint@suse.de - extend $PATH for busybox - better active driver detection @@ -694,13 +698,13 @@ - Use %%ix86 macro * Wed Jun 26 2002 - snwint@suse.de - merge (mainly ftp) changes from 8.0 branch: -- raised min free memory limit to 12MB -- fixed proxy code -- added 'ProxyProto' entry to install.inf -- ask for http proxy -- ftp proxy is proxy via http per default -- link .S.u.S.E* file to /var/adm/mount for ftp/http/tftp install -- let 'NetDevice' option cooperate with auto install + - raised min free memory limit to 12MB + - fixed proxy code + - added 'ProxyProto' entry to install.inf + - ask for http proxy + - ftp proxy is proxy via http per default + - link .S.u.S.E* file to /var/adm/mount for ftp/http/tftp install + - let 'NetDevice' option cooperate with auto install * Mon May 27 2002 - snwint@suse.de - fixed Makefile for sparc * Mon May 27 2002 - snwint@suse.de @@ -1050,8 +1054,8 @@ - load parport mods for imm/ppa * Mon Jan 15 2001 - snwint@suse.de - adapted memory limits: -- no YaST2 unless mem >= 32M -- load root image into ramdisk if mem >= 256M + - no YaST2 unless mem >= 32M + - load root image into ramdisk if mem >= 256M * Mon Jan 15 2001 - snwint@suse.de - symlink /etc/init.d instead of /etc/rc.d * Sun Jan 14 2001 - snwint@suse.de ++++++ linuxrc-2.1.8.tar.bz2 -> linuxrc-2.1.9.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/Changelog new/linuxrc-2.1.9/Changelog --- old/linuxrc-2.1.8/Changelog 2006-10-19 18:06:44.000000000 +0200 +++ new/linuxrc-2.1.9/Changelog 2006-10-20 15:27:40.000000000 +0200 @@ -1,3 +1,8 @@ +20/10/2006: v2.1.9 + - get rid of network config questions after failed network + install (#171102) + - add wlan setup during auto install + 19/10/2006: v2.1.8 - extend $PATH for busybox - better active driver detection diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/VERSION new/linuxrc-2.1.9/VERSION --- old/linuxrc-2.1.8/VERSION 2006-10-19 18:05:34.000000000 +0200 +++ new/linuxrc-2.1.9/VERSION 2006-10-20 14:40:25.000000000 +0200 @@ -1 +1 @@ -2.1.8 +2.1.9 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/auto2.c new/linuxrc-2.1.9/auto2.c --- old/linuxrc-2.1.8/auto2.c 2006-10-19 15:27:02.000000000 +0200 +++ new/linuxrc-2.1.9/auto2.c 2006-10-20 14:38:47.000000000 +0200 @@ -36,13 +36,11 @@ static void auto2_user_netconfig(void); -// static hd_t *add_hd_entry(hd_t **hd, hd_t *new_hd); static int auto2_harddisk_dev(void); static int auto2_cdrom_dev(void); static int auto2_net_dev(hd_t **); static int auto2_net_dev1(hd_t *hd); static int driver_is_active(hd_t *hd); -// static int auto2_activate_devices(hd_hw_item_t hw_class, unsigned last_idx); static void auto2_progress(char *pos, char *msg); static void get_zen_config(void); static void load_drivers(hd_data_t *hd_data, hd_hw_item_t hw_item); @@ -168,7 +166,7 @@ config.module.delay += 2; - for(hd = hd_pcmcia; hd; hd = hd->next) activate_driver2(hd_data, hd, NULL, 0); + for(hd = hd_pcmcia; hd; hd = hd->next) activate_driver(hd_data, hd, NULL, 0); hd_pcmcia = hd_free_hd_list(hd_pcmcia); config.module.delay -= 2; @@ -181,7 +179,7 @@ hd_pcmcia2 = hd_list(hd_data, hw_pcmcia, 1, NULL); if(hd_pcmcia2) config.has_pcmcia = 1; - for(hd = hd_pcmcia2; hd; hd = hd->next) activate_driver2(hd_data, hd, NULL, 0); + for(hd = hd_pcmcia2; hd; hd = hd->next) activate_driver(hd_data, hd, NULL, 0); hd_pcmcia2 = hd_free_hd_list(hd_pcmcia2); printf(" ok\n"); @@ -208,7 +206,7 @@ } } - for(hd = hd_usb; hd; hd = hd->next) activate_driver2(hd_data, hd, &usb_modules, 0); + for(hd = hd_usb; hd; hd = hd->next) activate_driver(hd_data, hd, &usb_modules, 0); hd_usb = hd_free_hd_list(hd_usb); mod_modprobe("input", NULL); @@ -244,7 +242,7 @@ config.module.delay += 3; - for(hd = hd_fw; hd; hd = hd->next) activate_driver2(hd_data, hd, NULL, 0); + for(hd = hd_fw; hd; hd = hd->next) activate_driver(hd_data, hd, NULL, 0); hd_fw = hd_free_hd_list(hd_fw); mod_modprobe("sbp2", NULL); @@ -275,7 +273,7 @@ hd_sys = hd_list(hd_data, hw_sys, 0, NULL); - activate_driver2(hd_data, hd_sys, NULL, 0); + activate_driver(hd_data, hd_sys, NULL, 0); /* usb keyboard -> load usb */ if(ju) { @@ -456,9 +454,12 @@ */ int auto2_net_dev(hd_t **hd0) { - hd_t *hd; + hd_t *hd, *hd_card; hd_data_t *hd_data; int err = 1; + hd_hw_item_t hw_items[] = { + hw_network_ctrl, hw_network + }; #if defined(__s390__) || defined(__s390x__) static int as3d = 0; @@ -473,7 +474,13 @@ hd_data = calloc(1, sizeof *hd_data); - for(hd = hd_list(hd_data, hw_network, 1, NULL); hd; hd = hd->next) { + hd_list2(hd_data, hw_items, 1); + + for(hd = hd_list(hd_data, hw_network, 0, NULL); hd; hd = hd->next) { + // set wlan tag for interface + hd_card = hd_get_device_by_idx(hd_data, hd->attached_to); + if(hd_card && hd_card->is.wlan) hd->is.wlan = 1; + if(!auto2_net_dev1(hd)) { err = 0; break; @@ -503,6 +510,7 @@ if(!hd || !(device = hd->unix_dev_name)) return 1; if(!strncmp(device, "lo", sizeof "lo" - 1)) return 1; + if(!strncmp(device, "sit", sizeof "sit" - 1)) return 1; for(res = hd->res; res; res = res->next) { if(res->any.type == res_hwaddr) { @@ -548,6 +556,8 @@ config.net.configured = nc_static; + if(hd->is.wlan) wlan_setup(); + /* do bootp if there's some indication that a net install is intended * but some data are still missing */ @@ -641,72 +651,11 @@ } -#if 0 -/* - * Activate device driver. - * Returns 1 if it worked, else 0. - */ -int activate_driver(hd_data_t *hd_data, hd_t *hd, slist_t **mod_list) -{ - driver_info_t *di; - str_list_t *sl1, *sl2; - slist_t *slm; - int i, ok = 0; - char buf[256]; - - if(!hd || driver_is_active(hd)) return 1; - - if(hd->is.notready) return 1; - - // if(ID_TAG(hd->vendor.id) == TAG_PCMCIA) return 0; - - if( - !config.nopcmcia && - hd->hotplug == hp_pcmcia && - hd->hotplug_slot && - util_check_exist("/sbin/pcmcia-socket-startup") - ) { - sprintf(buf, "%s %d\n", "/sbin/pcmcia-socket-startup", hd->hotplug_slot - 1); - fprintf(stderr, "pcmcia socket startup for: %s (socket %d)\n", hd->sysfs_id, hd->hotplug_slot - 1); - - system(buf); - } - - for(di = hd->driver_info; di; di = di->next) { - if(di->module.type == di_module) { - for( - sl1 = di->module.names, sl2 = di->module.mod_args; - sl1 && sl2; - sl1 = sl1->next, sl2 = sl2->next - ) { - di->module.modprobe ? mod_modprobe(sl1->str, sl2->str) : mod_insmod(sl1->str, sl2->str); - if(mod_list) { - slm = slist_add(mod_list, slist_new()); - str_copy(&slm->key, sl1->str); - } - } - - /* all modules should be loaded now */ - for(i = 1, sl1 = di->module.names; sl1; sl1 = sl1->next) { - i &= hd_module_is_active(hd_data, sl1->str); - } - - if(i) { - ok = 1; - break; - } - } - } - - return ok; -} -#endif - /* * Activate device driver. * Returns 1 if it worked, else 0. */ -int activate_driver2(hd_data_t *hd_data, hd_t *hd, slist_t **mod_list, int show_modules) +int activate_driver(hd_data_t *hd_data, hd_t *hd, slist_t **mod_list, int show_modules) { driver_info_t *di; str_list_t *sl1, *sl2; @@ -767,49 +716,6 @@ } -#if 0 -/* - * Activate storage/network devices. - * Returns 0 or the index of the last controller we activated. - */ -int auto2_activate_devices(hd_hw_item_t hw_class, unsigned last_idx) -{ - hd_t *hd; - int ok; - - for(hd = hd_data->hd; hd; hd = hd->next) { - if(hd->idx > last_idx) break; - } - - last_idx = 0; /* re-use */ - - if(!hd) return 0; /* no further entries */ - - for(; hd; hd = hd->next) { - if(hd_is_hw_class(hd, hw_class) && !driver_is_active(hd)) { - if((ok = activate_driver(hd_data, hd, NULL))) { - last_idx = hd->idx; - fprintf(stderr, "Ok, that seems to have worked. :-)\n"); - } - else { - fprintf(stderr, "Oops, that didn't work.\n"); - } - - /* some module was loaded...; in demo mode activate all disks */ - if( - !( - (config.activate_storage && hw_class == hw_storage_ctrl) || - (config.activate_network && hw_class == hw_network_ctrl) - ) && - ok - ) break; - } - } - - return last_idx; -} -#endif - /* * Checks if autoinstall is possible. * @@ -834,7 +740,6 @@ util_splash_bar(40, SPLASH_40); if(config.update.ask && !config.update.shown) { - // auto2_activate_devices(hw_storage_ctrl, 0); if(!(win_old = config.win)) util_disp_init(); if(config.update.name_list) { dia_show_lines2("Driver Updates added", config.update.name_list, 64); @@ -864,8 +769,6 @@ if(!config.net.do_setup) return; - // auto2_activate_devices(hw_network_ctrl, 0); - if((net_config_mask() & 3) == 3) { /* we have ip & netmask */ config.net.configured = nc_static; /* looks a bit weird, but we need it here for net_activate_ns() */ @@ -912,36 +815,12 @@ util_debugwait("CD?"); - // if(config.activate_storage) auto2_activate_devices(hw_storage_ctrl, 0); - - // if(config.activate_network) auto2_activate_devices(hw_network_ctrl, 0); - fprintf(stderr, "Looking for a %s CD...\n", config.product); if(!(i = auto2_cdrom_dev())) { auto2_user_netconfig(); return TRUE; } -#if 0 - for(last_idx = 0;;) { - /* i == 1 -> try to activate another storage device */ - if(i == 1) { - fprintf(stderr, "Ok, that didn't work; see if we can activate another storage device...\n"); - } - - if(!(last_idx = auto2_activate_devices(hw_storage_ctrl, last_idx))) { - fprintf(stderr, "No further storage devices found; giving up.\n"); - break; - } - - fprintf(stderr, "Looking for a %s CD again...\n", config.product); - if(!(i = auto2_cdrom_dev(&hd_devs))) { - auto2_user_netconfig(); - return TRUE; - } - } -#endif - if(config.cdrom) { auto2_user_netconfig(); return TRUE; @@ -956,36 +835,12 @@ util_debugwait("HD?"); - // if(config.activate_storage) auto2_activate_devices(hw_storage_ctrl, 0); - - // if(config.activate_network) auto2_activate_devices(hw_network_ctrl, 0); - fprintf(stderr, "Looking for a %s hard disk...\n", config.product); if(!(i = auto2_harddisk_dev())) { auto2_user_netconfig(); return TRUE; } -#if 0 - for(last_idx = 0;;) { - /* i == 1 -> try to activate another storage device */ - if(i == 1) { - fprintf(stderr, "Ok, that didn't work; see if we can activate another storage device...\n"); - } - - if(!(last_idx = auto2_activate_devices(hw_storage_ctrl, last_idx))) { - fprintf(stderr, "No further storage devices found; giving up.\n"); - break; - } - - fprintf(stderr, "Looking for a %s hard disk again...\n", config.product); - if(!(i = auto2_harddisk_dev(&hd_devs))) { - auto2_user_netconfig(); - return TRUE; - } - } -#endif - util_debugwait("Nothing found"); return FALSE; @@ -1009,27 +864,9 @@ fprintf(stderr, "server: %s\n", inet2print(&config.net.server)); fprintf(stderr, "nameserver: %s\n", inet2print(&config.net.nameserver[0])); - // if(config.activate_network) auto2_activate_devices(hw_network_ctrl, 0); - - // if(config.activate_storage) auto2_activate_devices(hw_storage_ctrl, 0); - fprintf(stderr, "Looking for a network server...\n"); if(!auto2_net_dev(&hd_devs)) return TRUE; -#if 0 - for(last_idx = 0;;) { - fprintf(stderr, "Ok, that didn't work; see if we can activate another network device...\n"); - - if(!(last_idx = auto2_activate_devices(hw_network_ctrl, last_idx))) { - fprintf(stderr, "No further network cards found; giving up.\n"); - break; - } - - fprintf(stderr, "Looking for a network server again...\n"); - if(!auto2_net_dev(&hd_devs)) return TRUE; - } -#endif - } util_debugwait("Nothing found"); @@ -1252,7 +1089,7 @@ fflush(stdout); } } - activate_driver2(hd_data, hd, NULL, 1); + activate_driver(hd_data, hd, NULL, 1); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/auto2.h new/linuxrc-2.1.9/auto2.h --- old/linuxrc-2.1.8/auto2.h 2006-10-18 15:41:03.000000000 +0200 +++ new/linuxrc-2.1.9/auto2.h 2006-10-20 12:51:37.000000000 +0200 @@ -2,10 +2,9 @@ int auto2_mount_harddisk(char *dev); void auto2_scan_hardware(char *log_file); int auto2_init(void); -// char *auto2_disk_list(int *boot_disk); char *auto2_serial_console(void); int auto2_find_install_medium(void); int auto2_find_floppy(void); void load_network_mods(void); -int activate_driver2(hd_data_t *hd_data, hd_t *hd, slist_t **mod_list, int show_modules); +int activate_driver(hd_data_t *hd_data, hd_t *hd, slist_t **mod_list, int show_modules); void pcmcia_socket_startup(void); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/dialog.c new/linuxrc-2.1.9/dialog.c --- old/linuxrc-2.1.8/dialog.c 2006-10-17 16:36:54.000000000 +0200 +++ new/linuxrc-2.1.9/dialog.c 2006-10-20 14:07:34.000000000 +0200 @@ -319,6 +319,8 @@ int key_ii; char *s; + if(!config.win) util_disp_init(); + if (config.linemode) { putchar('\n'); @@ -1556,6 +1558,8 @@ item_t *item_list; char *s; + if(!config.win) util_disp_init(); + for(item_cnt = 0, it = items; *it != di_none; it++) { if(*it != di_skip) item_cnt++; } @@ -1611,6 +1615,8 @@ if(!item_cnt) return 0; + if(!config.win) util_disp_init(); + item_list = calloc(item_cnt, sizeof *item_list); util_create_items(item_list, item_cnt, width); @@ -1675,6 +1681,8 @@ if(!input) return 0; + if(!config.win) util_disp_init(); + *buf = 0; if(*input) strncpy(buf, *input, sizeof buf - 1); buf[sizeof buf - 1] = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/install.c new/linuxrc-2.1.9/install.c --- old/linuxrc-2.1.8/install.c 2006-10-18 12:52:46.000000000 +0200 +++ new/linuxrc-2.1.9/install.c 2006-10-20 15:11:01.000000000 +0200 @@ -184,6 +184,9 @@ items[config.demo ? 0 : 1] = di_skip; + /* hope this is correct... */ + config.net.do_setup = 0; + di = dia_menu2(txt_get(TXT_MENU_START), 40, inst_menu_cb, items, di_inst_menu_last); return di == di_none ? 1 : 0; @@ -426,6 +429,7 @@ switch(di) { case di_source_cdrom: + str_copy(&config.serverdir, NULL); error = inst_mount_cdrom(0); if(error) { sprintf(tmp, txt_get(TXT_INSERT_CD), 1); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/linuxrc.c new/linuxrc-2.1.9/linuxrc.c --- old/linuxrc-2.1.8/linuxrc.c 2006-10-19 15:27:42.000000000 +0200 +++ new/linuxrc-2.1.9/linuxrc.c 2006-10-20 14:40:46.000000000 +0200 @@ -836,7 +836,7 @@ if (config.linemode) putchar('\n'); printf( - ">>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2006 SUSE Linux Products GmbH <<<\n", + "\n>>> %s installation program v" LXRC_FULL_VERSION " (c) 1996-2006 SUSE Linux Products GmbH <<<\n", config.product ); if (config.linemode) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/net.c new/linuxrc-2.1.9/net.c --- old/linuxrc-2.1.8/net.c 2006-10-18 16:28:05.000000000 +0200 +++ new/linuxrc-2.1.9/net.c 2006-10-20 14:37:09.000000000 +0200 @@ -81,7 +81,6 @@ #endif static void if_down(char *dev); -static int wlan_setup(void); static int wlan_auth_cb(dia_item_t di); static dia_item_t di_wlan_auth_last = di_none; @@ -2213,6 +2212,7 @@ */ int wlan_setup() { + int win_old = config.win; dia_item_t di; dia_item_t items[] = { di_wlan_open, @@ -2222,7 +2222,35 @@ di_none }; - di = dia_menu2("WLAN Authentication", 40, wlan_auth_cb, items, di_wlan_auth_last); + switch(config.net.wlan.auth) { + case wa_open: + di = di_wlan_open; + break; + + case wa_wep_open: + di = di_wlan_wep_o; + break; + + case wa_wep_resticted: + di = di_wlan_wep_r; + break; + + case wa_wpa: + di = di_wlan_wpa; + break; + + default: + di = di_none; + } + + if(config.manual || di == di_none) { + di = dia_menu2("WLAN Authentication", 40, wlan_auth_cb, items, di_wlan_auth_last); + } + else { + if(wlan_auth_cb(di)) di = di_none; + } + + if(config.win && !win_old) util_disp_done(); return di == di_none ? 1 : 0; } @@ -2259,9 +2287,11 @@ case di_wlan_open: config.net.wlan.auth = wa_open; - if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { - rc = -1; - break; + if(config.manual || !config.net.wlan.essid) { + if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { + rc = -1; + break; + } } strprintf(&buf, "iwconfig %s essid %s'%s'", @@ -2281,43 +2311,47 @@ case di_wlan_wep_r: config.net.wlan.auth = wep_mode ? wa_wep_open : wa_wep_resticted; - if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { - rc = -1; - break; - } - - i = dia_list("WEP Key Type", 30, NULL, wep_key_items, config.net.wlan.key_type + 1, align_left) - 1; - - if(i < 0) { - rc = -1; - break; + if(config.manual || !config.net.wlan.essid) { + if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { + rc = -1; + break; + } } - switch(i) { - case 0: - config.net.wlan.key_type = kt_ascii; - config.net.wlan.key_len = 0; - break; + if(config.manual || !config.net.wlan.key) { + i = dia_list("WEP Key Type", 30, NULL, wep_key_items, config.net.wlan.key_type + 1, align_left) - 1; - case 1: - config.net.wlan.key_type = kt_hex; - config.net.wlan.key_len = 0; + if(i < 0) { + rc = -1; break; + } - case 2: - config.net.wlan.key_type = kt_pass; - config.net.wlan.key_len = 40; - break; + switch(i) { + case 0: + config.net.wlan.key_type = kt_ascii; + config.net.wlan.key_len = 0; + break; + + case 1: + config.net.wlan.key_type = kt_hex; + config.net.wlan.key_len = 0; + break; + + case 2: + config.net.wlan.key_type = kt_pass; + config.net.wlan.key_len = 40; + break; + + case 3: + config.net.wlan.key_type = kt_pass; + config.net.wlan.key_len = 104; + break; + } - case 3: - config.net.wlan.key_type = kt_pass; - config.net.wlan.key_len = 104; + if(dia_input2("WEP Key", &config.net.wlan.key, 30, 0) || !config.net.wlan.key) { + rc = -1; break; - } - - if(dia_input2("WEP Key", &config.net.wlan.key, 30, 0) || !config.net.wlan.key) { - rc = -1; - break; + } } switch(config.net.wlan.key_type) { @@ -2349,7 +2383,6 @@ default: rc = -1; break; - } if(rc == -1) break; @@ -2374,32 +2407,36 @@ break; case di_wlan_wpa: - if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { - rc = -1; - break; + if(config.manual || !config.net.wlan.essid) { + if(dia_input2("ESSID", &config.net.wlan.essid, 30, 0)) { + rc = -1; + break; + } } - j = config.net.wlan.key_type == kt_pass ? 2 : 1; + if(config.manual || !config.net.wlan.key) { + j = config.net.wlan.key_type == kt_pass ? 2 : 1; - i = dia_list("WPA Key Type", 30, NULL, wpa_key_items, j, align_left); + i = dia_list("WPA Key Type", 30, NULL, wpa_key_items, j, align_left); - if(i < 1) { - rc = -1; - break; - } + if(i < 1) { + rc = -1; + break; + } - config.net.wlan.key_type = i == 1 ? kt_hex : kt_pass; - config.net.wlan.key_len = 0; + config.net.wlan.key_type = i == 1 ? kt_hex : kt_pass; + config.net.wlan.key_len = 0; - if(dia_input2("WPA Key", &config.net.wlan.key, 30, 0) || !config.net.wlan.key) { - rc = -1; - break; - } + if(dia_input2("WPA Key", &config.net.wlan.key, 30, 0) || !config.net.wlan.key) { + rc = -1; + break; + } - if(config.net.wlan.key_type == kt_pass && strlen(config.net.wlan.key) < 8) { - dia_message(txt_get(TXT_VNC_PASSWORD_TOO_SHORT), MSGTYPE_ERROR); - rc = -1; - break; + if(config.net.wlan.key_type == kt_pass && strlen(config.net.wlan.key) < 8) { + dia_message(txt_get(TXT_VNC_PASSWORD_TOO_SHORT), MSGTYPE_ERROR); + rc = -1; + break; + } } if(config.net.wlan.key_type == kt_pass) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.8/net.h new/linuxrc-2.1.9/net.h --- old/linuxrc-2.1.8/net.h 2006-02-06 19:48:19.000000000 +0100 +++ new/linuxrc-2.1.9/net.h 2006-10-20 13:02:47.000000000 +0200 @@ -6,29 +6,23 @@ * */ -extern int net_config (void); -extern int net_bootp (void); - -extern void net_ask_password (void); - +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_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); - -extern void net_stop (void); -extern int net_check_address (char *input_tv, struct in_addr *address_prr, int *net_bits); +void net_stop(void); +int net_check_address(char *input_tv, struct in_addr *address_prr, int *net_bits); int net_check_address2(inet_t *inet, int do_dns); -extern int net_setup_localhost (void); - -extern int net_activate_ns (void); -extern int net_activate_s390_devs (void); - +int net_setup_localhost(void); +int net_activate_ns(void); +int net_activate_s390_devs(void); int net_dhcp(void); void net_dhcp_stop(void); - unsigned net_config_mask(void); int net_get_address(char *text, inet_t *inet, int do_dns); 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-2.1.8/util.c new/linuxrc-2.1.9/util.c --- old/linuxrc-2.1.8/util.c 2006-10-19 15:28:16.000000000 +0200 +++ new/linuxrc-2.1.9/util.c 2006-10-20 12:51:55.000000000 +0200 @@ -4349,7 +4349,7 @@ } } - for(hd = hd_usb; hd; hd = hd->next) activate_driver2(hd_data, hd, NULL, 0); + for(hd = hd_usb; hd; hd = hd->next) activate_driver(hd_data, hd, NULL, 0); hd_free_hd_data(hd_data); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org