From 027e76be495911f1ea447d181e0d3bd85543f69d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 23 Jul 2009 13:22:02 -0400 Subject: [PATCH] module-init-tools: moved etc_modprobe.conf within modprobe.d/ - cleaned by using overlay_apply --- base/module-init-tools/module-init-tools.conf | 8 +------- base/module-init-tools/overlay.d/D%sbindir_lsmod.ln | 1 + .../etc_modprobe.d_modprobe.conf.txt} | 0 3 files changed, 2 insertions(+), 7 deletions(-) create mode 100644 base/module-init-tools/overlay.d/D%sbindir_lsmod.ln rename base/module-init-tools/{etc_modprobe.conf.txt => overlay.d/etc_modprobe.d_modprobe.conf.txt} (100%) diff --git a/base/module-init-tools/module-init-tools.conf b/base/module-init-tools/module-init-tools.conf index 497218c11..db3aa01fb 100644 --- a/base/module-init-tools/module-init-tools.conf +++ b/base/module-init-tools/module-init-tools.conf @@ -20,13 +20,7 @@ set_confopt # apply the patches defined in the module-init-tools.desc var_append patchfiles ' ' "`match_source_file -p patch`" -mit_pm() { - ln -fvs $bindir/lsmod $root$sbindir/lsmod - - cp -vf "$confdir/etc_modprobe.conf.txt" "$root/etc/modprobe.conf" -} - -hook_add postmake 5 "mit_pm" +hook_add postmake 5 "overlay_apply -q '$confdir/overlay.d'" #pkginstalled docbook-tools || \ # needs stage filter and proper priorization var_append makeopt ' ' DOCBOOKTOMAN=true diff --git a/base/module-init-tools/overlay.d/D%sbindir_lsmod.ln b/base/module-init-tools/overlay.d/D%sbindir_lsmod.ln new file mode 100644 index 000000000..597ebcc78 --- /dev/null +++ b/base/module-init-tools/overlay.d/D%sbindir_lsmod.ln @@ -0,0 +1 @@ +D_bindir/lsmod diff --git a/base/module-init-tools/etc_modprobe.conf.txt b/base/module-init-tools/overlay.d/etc_modprobe.d_modprobe.conf.txt similarity index 100% rename from base/module-init-tools/etc_modprobe.conf.txt rename to base/module-init-tools/overlay.d/etc_modprobe.d_modprobe.conf.txt