Hello community,
here is the log from the commit of package linuxrc
checked in at Mon Oct 16 19:15:52 CEST 2006.
--------
--- linuxrc/linuxrc.changes 2006-10-02 13:17:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2006-10-16 18:41:18.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Oct 16 18:41:15 CEST 2006 - snwint@suse.de
+
+- mark loaded/loadable modules differently in module selection dialog
+- fixed drawing bug in too small windows
+- better network device selection
+- basic wlan support
+
+-------------------------------------------------------------------
Old:
----
linuxrc-2.1.5.tar.bz2
New:
----
linuxrc-2.1.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linuxrc.spec ++++++
--- /var/tmp/diff_new_pack.YWrQs9/_old 2006-10-16 19:15:42.000000000 +0200
+++ /var/tmp/diff_new_pack.YWrQs9/_new 2006-10-16 19:15:42.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package linuxrc (Version 2.1.5)
+# spec file for package linuxrc (Version 2.1.6)
#
# 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.5
+Version: 2.1.6
Release: 1
-Source: linuxrc-2.1.5.tar.bz2
+Source: linuxrc-2.1.6.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -53,6 +53,11 @@
%doc linuxrc.html
%changelog -n linuxrc
+* Mon Oct 16 2006 - snwint@suse.de
+- mark loaded/loadable modules differently in module selection dialog
+- fixed drawing bug in too small windows
+- better network device selection
+- basic wlan support
* Mon Oct 02 2006 - snwint@suse.de
- cdrom install works again
- allow network config in 'exec' scheme
++++++ linuxrc-2.1.5.tar.bz2 -> linuxrc-2.1.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/Changelog new/linuxrc-2.1.6/Changelog
--- old/linuxrc-2.1.5/Changelog 2006-10-02 13:17:09.000000000 +0200
+++ new/linuxrc-2.1.6/Changelog 2006-10-13 17:11:48.000000000 +0200
@@ -1,3 +1,9 @@
+13/10/2006: v2.1.6
+ - mark loaded/loadable modules differently in module selection dialog
+ - fixed drawing bug in too small windows
+ - better network device selection
+ - basic wlan support
+
2/10/2006: v2.1.5
- cdrom install works again
- allow network config in 'exec' scheme
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/VERSION new/linuxrc-2.1.6/VERSION
--- old/linuxrc-2.1.5/VERSION 2006-10-02 12:50:37.000000000 +0200
+++ new/linuxrc-2.1.6/VERSION 2006-10-11 16:44:51.000000000 +0200
@@ -1 +1 @@
-2.1.5
+2.1.6
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/dialog.c new/linuxrc-2.1.6/dialog.c
--- old/linuxrc-2.1.5/dialog.c 2006-03-10 17:45:27.000000000 +0100
+++ new/linuxrc-2.1.6/dialog.c 2006-10-13 14:41:04.000000000 +0200
@@ -118,6 +118,11 @@
{ di_osa_lcs, TXT_OSA_LCS },
{ di_osa_qdio, TXT_OSA_QDIO },
+ { di_wlan_open, 0, "No Authentication" },
+ { di_wlan_wep_o, 0, "WEP - Open" },
+ { di_wlan_wep_r, 0, "WEP - Shared Key" },
+ { di_wlan_wpa, 0, "WPA-PSK" },
+
};
@@ -1619,7 +1624,7 @@
s++;
item_list[i].tag.head = 1;
}
- utf8_strwcpy(item_list[i].text, s, width);
+ utf8_strwcpy(item_list[i].text, s, width - 1);
item_list[i].func = func;
if(align == align_center) {
util_center_text(item_list[i].text, width);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/dialog.h new/linuxrc-2.1.6/dialog.h
--- old/linuxrc-2.1.5/dialog.h 2006-02-03 12:46:22.000000000 +0100
+++ new/linuxrc-2.1.6/dialog.h 2006-10-13 14:34:47.000000000 +0200
@@ -102,6 +102,11 @@
di_osa_lcs,
di_osa_qdio,
+ di_wlan_open,
+ di_wlan_wep_o,
+ di_wlan_wep_r,
+ di_wlan_wpa,
+
} dia_item_t;
typedef enum {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/file.c new/linuxrc-2.1.6/file.c
--- old/linuxrc-2.1.5/file.c 2006-09-25 14:38:15.000000000 +0200
+++ new/linuxrc-2.1.6/file.c 2006-10-12 13:58:42.000000000 +0200
@@ -340,8 +340,10 @@
return "";
}
-/* compare strings, ignoring '-' and '_' characters in strings not starting
- with '_' */
+/*
+ * Compare strings, ignoring '-', '_', and '.' characters in strings not
+ * starting with '_'.
+ */
static int strcasecmpignorestrich(const char* s1, const char* s2)
{
char* str1 = strdup(s1);
@@ -352,7 +354,7 @@
/* remove all '-' and '_' */
if(*str1 != '_') {
for(i = 0, s = str1; str1[i]; i++) {
- if(str1[i] != '_' && str1[i] != '-') {
+ if(str1[i] != '_' && str1[i] != '-' && str1[i] != '.') {
*s++ = str1[i];
}
}
@@ -362,7 +364,7 @@
/* remove all '-' and '_' */
if(*str2 != '_') {
for(i = 0, s = str2; str2[i]; i++) {
- if(str2[i] != '_' && str2[i] != '-') {
+ if(str2[i] != '_' && str2[i] != '-' && str2[i] != '.') {
*s++ = str2[i];
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/global.h new/linuxrc-2.1.6/global.h
--- old/linuxrc-2.1.5/global.h 2006-09-25 14:37:38.000000000 +0200
+++ new/linuxrc-2.1.6/global.h 2006-10-13 15:05:40.000000000 +0200
@@ -180,6 +180,7 @@
unsigned exists:1; /* module really exists */
unsigned dontask:1; /* don't ask for module params */
unsigned detected:1; /* auto-detected */
+ unsigned active:1; /* module loaded */
} module_t;
@@ -202,6 +203,17 @@
nc_none, nc_static, nc_bootp, nc_dhcp
} net_config_t;
+typedef enum {
+ wa_none, wa_open, wa_wep_open, wa_wep_resticted, wa_wpa
+} wlan_auth_t;
+
+/*
+ * keep the values - see wlan_auth_cb()
+ */
+typedef enum {
+ kt_ascii, kt_hex, kt_pass_40, kt_pass_104, kt_pass_wpa
+} key_type_t;
+
/* > 100 and <= 1000 */
#define MAX_UPDATES 1000
@@ -506,6 +518,12 @@
char *module; /* cifs/smb kernel module */
} cifs;
char *dhcpcd; /* dhcpcd parameters (if any) */
+ struct {
+ wlan_auth_t auth; /* open, wep, wpa */
+ char *essid; /* ESSID */
+ char *key; /* wep/wpa key */
+ key_type_t key_type; /* ascii, hex, passphrase */
+ } wlan;
} net;
struct {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/linuxrc.c new/linuxrc-2.1.6/linuxrc.c
--- old/linuxrc-2.1.5/linuxrc.c 2006-05-11 11:03:10.000000000 +0200
+++ new/linuxrc-2.1.6/linuxrc.c 2006-10-12 13:56:59.000000000 +0200
@@ -778,6 +778,7 @@
config.net.ifconfig = 1;
config.net.setup = NS_DEFAULT;
config.net.nameservers = 1;
+ config.net.nfs_tcp = 1;
config.explode_win = 1;
config.color = 2;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/module.c new/linuxrc-2.1.6/module.c
--- old/linuxrc-2.1.5/module.c 2006-01-31 17:05:56.000000000 +0100
+++ new/linuxrc-2.1.6/module.c 2006-10-12 12:04:05.000000000 +0200
@@ -291,7 +291,7 @@
static char **items = NULL;
static module_t **mod_items = NULL;
static int mods = 0;
- int i;
+ int i, width;
char buf[256];
if(items) {
@@ -309,11 +309,19 @@
items = calloc(mods + 1, sizeof *items);
mod_items = calloc(mods + 1, sizeof *mod_items);
+ for(width = 0, ml = config.module.list; ml; ml = ml->next) {
+ if(ml->type == type && ml->exists && ml->descr) {
+ i = strlen(ml->name);
+ if(i > width) width = i;
+ }
+ }
+
for(i = 0, ml = config.module.list; ml; ml = ml->next) {
if(ml->type == type && ml->exists && ml->descr) {
- sprintf(buf, "%14s%s%s",
+ sprintf(buf, "%*s%s%s",
+ width,
ml->name,
- *ml->descr ? ml->detected ? " * " : " : " : "", ml->descr
+ *ml->descr ? ml->detected ? ml->active ? " * " : " + " : " : " : "", ml->descr
);
items[i] = strdup(buf);
mod_items[i++] = ml;
@@ -1037,13 +1045,15 @@
hd = hd_list2(hd_data, hw_items, 1);
for(; hd; hd = hd->next) {
- if(
- (di = hd->driver_info) &&
- di->any.type == di_module
- ) {
+ for(di = hd->driver_info; di; di = di->next) {
+ if(di->any.type != di_module) continue;
+
for(sl = di->module.names; sl; sl = sl->next) {
for(ml = config.module.list; ml; ml = ml->next) {
- if(!mod_cmp(ml->name, sl->str)) ml->detected = 1;
+ if(!mod_cmp(ml->name, sl->str)) {
+ ml->detected = 1;
+ ml->active = di->module.active ? 1 : 0;
+ }
}
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.5/net.c new/linuxrc-2.1.6/net.c
--- old/linuxrc-2.1.5/net.c 2006-08-30 15:35:29.000000000 +0200
+++ new/linuxrc-2.1.6/net.c 2006-10-16 12:51:33.000000000 +0200
@@ -44,6 +44,8 @@
#define NFS_PORT 2049
#endif
+#include
participants (1)
-
root@suse.de