Hello community, here is the log from the commit of package linuxrc checked in at Thu Oct 19 19:19:50 CEST 2006. -------- --- linuxrc/linuxrc.changes 2006-10-18 17:06:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2006-10-19 18:07:25.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Oct 19 18:07:22 CEST 2006 - snwint@suse.de + +- extend $PATH for busybox +- better active driver detection + +------------------------------------------------------------------- Old: ---- linuxrc-2.1.7.tar.bz2 New: ---- linuxrc-2.1.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.U1oOct/_old 2006-10-19 19:19:17.000000000 +0200 +++ /var/tmp/diff_new_pack.U1oOct/_new 2006-10-19 19:19:17.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 2.1.7) +# spec file for package linuxrc (Version 2.1.8) # # 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.7 +Version: 2.1.8 Release: 1 -Source: linuxrc-2.1.7.tar.bz2 +Source: linuxrc-2.1.8.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,9 @@ %doc linuxrc.html %changelog -n linuxrc +* Thu Oct 19 2006 - snwint@suse.de +- extend $PATH for busybox +- better active driver detection * Wed Oct 18 2006 - snwint@suse.de - better wlan support - removed ancient ide-scsi/hwcheck code ++++++ linuxrc-2.1.7.tar.bz2 -> linuxrc-2.1.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/Changelog new/linuxrc-2.1.8/Changelog --- old/linuxrc-2.1.7/Changelog 2006-10-18 17:06:00.000000000 +0200 +++ new/linuxrc-2.1.8/Changelog 2006-10-19 18:06:44.000000000 +0200 @@ -1,3 +1,7 @@ +19/10/2006: v2.1.8 + - extend $PATH for busybox + - better active driver detection + 17/10/2006: v2.1.7 - better wlan support - removed ancient ide-scsi/hwcheck code diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/VERSION new/linuxrc-2.1.8/VERSION --- old/linuxrc-2.1.7/VERSION 2006-10-17 17:25:57.000000000 +0200 +++ new/linuxrc-2.1.8/VERSION 2006-10-19 18:05:34.000000000 +0200 @@ -1 +1 @@ -2.1.7 +2.1.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/auto2.c new/linuxrc-2.1.8/auto2.c --- old/linuxrc-2.1.7/auto2.c 2006-10-18 16:46:06.000000000 +0200 +++ new/linuxrc-2.1.8/auto2.c 2006-10-19 15:27:02.000000000 +0200 @@ -1221,9 +1221,10 @@ { hd_t *hd; driver_info_t *di; - int i; + int i, active; for(hd = hd_list(hd_data, hw_item, 0, NULL); hd; hd = hd->next) { + hd_add_driver_data(hd_data, hd); i = 0; if((di = hd->driver_info)) { for(di = hd->driver_info; di; di = di->next) { @@ -1233,10 +1234,16 @@ di->module.names->str ) { if(!i) printf("%s\n", hd->model); + if(hd->driver_module) { + active = !mod_cmp(hd->driver_module, di->module.names->str); + } + else { + active = di->module.active || hd_module_is_active(hd_data, di->module.names->str); + } printf("%s %s%s", i++ ? "," : " drivers:", di->module.names->str, - di->module.active || hd_module_is_active(hd_data, di->module.names->str) ? "*" : "" + active ? "*" : "" ); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/linuxrc.c new/linuxrc-2.1.8/linuxrc.c --- old/linuxrc-2.1.7/linuxrc.c 2006-10-18 16:12:35.000000000 +0200 +++ new/linuxrc-2.1.8/linuxrc.c 2006-10-19 15:27:42.000000000 +0200 @@ -239,7 +239,7 @@ } } - setenv("PATH", "/lbin:/bin:/sbin:/usr/bin:/usr/sbin", 1); + setenv("PATH", "/lbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin", 1); lxrc_init(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/module.c new/linuxrc-2.1.8/module.c --- old/linuxrc-2.1.7/module.c 2006-10-17 17:44:24.000000000 +0200 +++ new/linuxrc-2.1.8/module.c 2006-10-19 12:11:55.000000000 +0200 @@ -57,8 +57,6 @@ static void mod_load_module_manual(char *module, int show); static int mod_list_loaded_modules(char ***list, module_t ***mod_list, dia_align_t align); static void mod_delete_module(void); - -static int mod_cmp(char *str1, char *str2); static void mod_auto_detect(void); /* @@ -891,6 +889,8 @@ char *s; int i; + if(!str1 || !str2) return 1; + str1 = strdup(str1); str2 = strdup(str2); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/module.h new/linuxrc-2.1.8/module.h --- old/linuxrc-2.1.7/module.h 2006-10-17 17:42:27.000000000 +0200 +++ new/linuxrc-2.1.8/module.h 2006-10-19 12:10:16.000000000 +0200 @@ -21,3 +21,4 @@ void mod_show_modules(void); void mod_disk_text(char *buf, int type); int mod_copy_modules(char *src_dir, int doit); +int mod_cmp(char *str1, char *str2); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-2.1.7/util.c new/linuxrc-2.1.8/util.c --- old/linuxrc-2.1.7/util.c 2006-10-18 15:40:37.000000000 +0200 +++ new/linuxrc-2.1.8/util.c 2006-10-19 15:28:16.000000000 +0200 @@ -1963,7 +1963,7 @@ "LANG=en_US.UTF-8", "PS1=\\w # ", "HOME=/", - "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/lbin", + "PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/lbin", NULL }; extern char **environ; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org