Hello community, here is the log from the commit of package linuxrc checked in at Mon Sep 3 23:19:11 CEST 2007. -------- --- linuxrc/linuxrc.changes 2007-08-31 16:30:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/linuxrc/linuxrc.changes 2007-09-03 19:22:06.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Sep 3 19:22:02 CEST 2007 - snwint@suse.de + +- enable modprobe all the time (#303728) +- write blacklist for modprobe + +------------------------------------------------------------------- Old: ---- linuxrc-3.0.13.tar.bz2 New: ---- linuxrc-3.0.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.kY8825/_old 2007-09-03 23:18:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kY8825/_new 2007-09-03 23:18:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package linuxrc (Version 3.0.13) +# spec file for package linuxrc (Version 3.0.14) # # 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.13 +Version: 3.0.14 Release: 1 -Source: linuxrc-3.0.13.tar.bz2 +Source: linuxrc-3.0.14.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +53,9 @@ %doc linuxrc.html %changelog +* Mon Sep 03 2007 - snwint@suse.de +- enable modprobe all the time (#303728) +- write blacklist for modprobe * Fri Aug 31 2007 - snwint@suse.de - get nisdomain via dhcp (#303844) - store wlan config in install.inf (#223570) ++++++ linuxrc-3.0.13.tar.bz2 -> linuxrc-3.0.14.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.13/Changelog new/linuxrc-3.0.14/Changelog --- old/linuxrc-3.0.13/Changelog 2007-08-31 16:30:31.000000000 +0200 +++ new/linuxrc-3.0.14/Changelog 2007-09-03 16:32:05.000000000 +0200 @@ -1,3 +1,7 @@ +3/9/2007: v3.0.14 + - enable modprobe all the time (#303728) + - write blacklist for modprobe + 31/8/2007: v3.0.13 - get nisdomain via dhcp (#303844) - store wlan config in install.inf (#223570) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.13/file.c new/linuxrc-3.0.14/file.c --- old/linuxrc-3.0.13/file.c 2007-08-31 16:22:30.000000000 +0200 +++ new/linuxrc-3.0.14/file.c 2007-09-03 16:17:09.000000000 +0200 @@ -268,6 +268,7 @@ { key_insecure, "Insecure", kf_cfg + kf_cmd + kf_cmd_early }, { key_kexec, "kexec", kf_cfg + kf_cmd }, { key_nisdomain, "NISDomain", kf_dhcp }, + { key_nomodprobe, "nomodprobe", kf_cfg + kf_cmd_early }, }; static struct { @@ -567,6 +568,7 @@ char buf[256], *s, *t; slist_t *sl, *sl0; unsigned u; + FILE *w; /* maybe it's an AutoYaST XML file */ for(f = f0; f; f = f->next) { @@ -955,6 +957,14 @@ case key_brokenmodules: slist_free(config.module.broken); config.module.broken = slist_split(',', f->value); + if(config.module.broken && !config.test) { + if((w = fopen("/etc/modprobe.d/blacklist", "w"))) { + for(sl = config.module.broken; sl; sl = sl->next) { + if(sl->key) fprintf(w, "blacklist %s\n", sl->key); + } + fclose(w); + } + } break; case key_initrdmodules: @@ -1330,6 +1340,10 @@ str_copy(&config.net.nisdomain, f->value); break; + case key_nomodprobe: + if(f->is.numeric) config.nomodprobe = f->nvalue; + break; + default: break; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.13/file.h new/linuxrc-3.0.14/file.h --- old/linuxrc-3.0.13/file.h 2007-08-31 15:21:46.000000000 +0200 +++ new/linuxrc-3.0.14/file.h 2007-09-03 16:14:41.000000000 +0200 @@ -46,7 +46,7 @@ key_wlan_key_hex, key_wlan_key_pass, key_wlan_key_len, key_netcardname, key_ibft_hwaddr, key_ibft_ipaddr, key_ibft_netmask, key_ibft_gateway, key_ibft_dns, key_net_retry, key_bootif, key_swap_size, key_ntfs_3g, - key_sha1, key_insecure, key_kexec, key_nisdomain + key_sha1, key_insecure, key_kexec, key_nisdomain, key_nomodprobe } file_key_t; typedef enum { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.13/global.h new/linuxrc-3.0.14/global.h --- old/linuxrc-3.0.13/global.h 2007-08-31 16:02:22.000000000 +0200 +++ new/linuxrc-3.0.14/global.h 2007-09-03 16:18:12.000000000 +0200 @@ -335,6 +335,7 @@ unsigned sha1_failed:1; /* sha1 check failed */ unsigned sig_failed:1; /* 'content' signature check failed */ unsigned kexec:1; /* kexec to kernel & initrd from repo */ + unsigned nomodprobe:1; /* disable modprobe */ unsigned withiscsi; /* iSCSI parameter */ char *instsys_id; /* instsys id */ char *initrd_id; /* initrd id */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.13/linuxrc.c new/linuxrc-3.0.14/linuxrc.c --- old/linuxrc-3.0.13/linuxrc.c 2007-08-16 17:39:38.000000000 +0200 +++ new/linuxrc-3.0.14/linuxrc.c 2007-09-03 16:17:40.000000000 +0200 @@ -1130,7 +1130,7 @@ FILE *f; /* do nothing if we have a modprobe */ - if(config.test) return; + if(config.test || !config.nomodprobe) return; if((f = fopen("/proc/sys/kernel/modprobe", "w"))) { fprintf(f, "%s\n", prog); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/linuxrc-3.0.13/VERSION new/linuxrc-3.0.14/VERSION --- old/linuxrc-3.0.13/VERSION 2007-08-31 15:25:47.000000000 +0200 +++ new/linuxrc-3.0.14/VERSION 2007-09-03 15:56:31.000000000 +0200 @@ -1 +1 @@ -3.0.13 +3.0.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org