~ubuntu-branches/ubuntu/raring/kmod/raring-proposed

Viewing changes to .pc/blacklist_aliased/tools/modprobe.c

Committer: Package Import Robot
Author(s): Adam Conrad
Date: 2013-04-18 13:16:44 UTC
mfrom: (4.1.8 sid)
Revision ID: package-import@ubuntu.com-20130418131644-r9zy91dgcydczbmw

Tags: 9-3ubuntu1

Merge with Debian unstable, bringing in a backport of upstream's
comprehensive fix for the bad alias assertion bug (LP: #1073062)

files added:
.pc/bad_alias_assertion

.pc/bad_alias_assertion/tools

.pc/bad_alias_assertion/tools/modprobe.c

.pc/dot_kcmdline

.pc/dot_kcmdline/libkmod

.pc/dot_kcmdline/libkmod/libkmod-config.c

debian/patches/bad_alias_assertion

debian/patches/dot_kcmdline

files removed:
.pc/allow_dots_in_params

.pc/allow_dots_in_params/libkmod

.pc/allow_dots_in_params/libkmod/libkmod-config.c

.pc/do_not_raise_on_null_alias

.pc/do_not_raise_on_null_alias/tools

.pc/do_not_raise_on_null_alias/tools/modprobe.c

debian/patches/allow_dots_in_params

debian/patches/do_not_raise_on_null_alias

files modified:
.pc/applied-patches

.pc/blacklist_aliased/tools/modprobe.c

debian/changelog

debian/patches/aliases_conf

debian/patches/series

extra/aliases.conf

tools/modprobe.c

Show diffs side-by-side

added added

removed removed

.pc/blacklist_aliased/tools/modprobe.c

547

path = kmod_module_get_path(m);

548

549

if (path == NULL) {

550

assert(kmod_module_get_initstate(m) == KMOD_MODULE_BUILTIN);

551

printf("builtin %s\n", kmod_module_get_name(m));

550

551

* Either a builtin module, or an alias, print only for

552

* builtin

553

554

if (kmod_module_get_initstate(m) == KMOD_MODULE_BUILTIN)

555

printf("builtin %s\n", kmod_module_get_name(m));

552

556

} else

553

557

printf("insmod %s %s\n", kmod_module_get_path(m), options);

554

558

}

Older »