Browse Source

renamed module-info.sh to module-setup.sh

master
Harald Hoyer 14 years ago
parent
commit
71df3c4329
  1. 2
      NEWS
  2. 16
      dracut-functions
  3. 2
      dracut.xml
  4. 0
      modules.d/00bootchart/module-setup.sh
  5. 0
      modules.d/00dash/module-setup.sh
  6. 0
      modules.d/01fips/module-setup.sh
  7. 0
      modules.d/05busybox/module-setup.sh
  8. 0
      modules.d/10i18n/module-setup.sh
  9. 0
      modules.d/10rpmversion/module-setup.sh
  10. 0
      modules.d/40network/module-setup.sh
  11. 0
      modules.d/45ifcfg/module-setup.sh
  12. 0
      modules.d/50gensplash/module-setup.sh
  13. 0
      modules.d/50plymouth/module-setup.sh
  14. 0
      modules.d/60xen/module-setup.sh
  15. 0
      modules.d/90btrfs/module-setup.sh
  16. 0
      modules.d/90crypt/module-setup.sh
  17. 0
      modules.d/90dm/module-setup.sh
  18. 0
      modules.d/90dmraid/module-setup.sh
  19. 0
      modules.d/90dmsquash-live/module-setup.sh
  20. 0
      modules.d/90kernel-modules/module-setup.sh
  21. 0
      modules.d/90lvm/module-setup.sh
  22. 0
      modules.d/90mdraid/module-setup.sh
  23. 0
      modules.d/90multipath/module-setup.sh
  24. 0
      modules.d/95dasd/module-setup.sh
  25. 0
      modules.d/95dasd_mod/module-setup.sh
  26. 0
      modules.d/95debug/module-setup.sh
  27. 0
      modules.d/95fcoe/module-setup.sh
  28. 0
      modules.d/95fstab-sys/module-setup.sh
  29. 0
      modules.d/95iscsi/module-setup.sh
  30. 0
      modules.d/95nbd/module-setup.sh
  31. 0
      modules.d/95nfs/module-setup.sh
  32. 0
      modules.d/95resume/module-setup.sh
  33. 0
      modules.d/95rootfs-block/module-setup.sh
  34. 0
      modules.d/95terminfo/module-setup.sh
  35. 0
      modules.d/95udev-rules/module-setup.sh
  36. 0
      modules.d/95zfcp/module-setup.sh
  37. 0
      modules.d/95znet/module-setup.sh
  38. 0
      modules.d/96insmodpost/module-setup.sh
  39. 0
      modules.d/97biosdevname/module-setup.sh
  40. 0
      modules.d/98selinux/module-setup.sh
  41. 0
      modules.d/98syslog/module-setup.sh
  42. 0
      modules.d/99base/module-setup.sh

2
NEWS

@ -2,7 +2,7 @@ dracut-008 @@ -2,7 +2,7 @@ dracut-008
==========
- removed --ignore-kernel-modules option (no longer necessary)
- renamed kernel command line arguments to follow the rd. naming scheme
- merged check, install, installkernel to module-info.sh
- merged check, install, installkernel to module-setup.sh
- support for bzip2 and xz compressed initramfs images.
- source code beautification
- lots of documentation

16
dracut-functions

@ -518,14 +518,14 @@ inst_opt_decompress() { @@ -518,14 +518,14 @@ inst_opt_decompress() {
module_check() {
local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
[[ -d $moddir ]] || return 1
if [[ ! -f $moddir/module-info.sh ]]; then
if [[ ! -f $moddir/module-setup.sh ]]; then
# if we do not have a check script, we are unconditionally included
[[ -x $moddir/check ]] || return 0
$moddir/check $hostonly
return $?
else
unset check depends install installkernel
. $moddir/module-info.sh
. $moddir/module-setup.sh
is_func check || return 0
check
ret=$?
@ -537,14 +537,14 @@ module_check() { @@ -537,14 +537,14 @@ module_check() {
module_depends() {
local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
[[ -d $moddir ]] || return 1
if [[ ! -f $moddir/module-info.sh ]]; then
if [[ ! -f $moddir/module-setup.sh ]]; then
# if we do not have a check script, we have no deps
[[ -x $moddir/check ]] || return 0
$moddir/check -d
return $?
else
unset check depends install installkernel
. $moddir/module-info.sh
. $moddir/module-setup.sh
is_func depends || return 0
depends
ret=$?
@ -556,12 +556,12 @@ module_depends() { @@ -556,12 +556,12 @@ module_depends() {
module_install() {
local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
[[ -d $moddir ]] || return 1
if [[ ! -f $moddir/module-info.sh ]]; then
if [[ ! -f $moddir/module-setup.sh ]]; then
[[ -x $moddir/install ]] && . "$moddir/install"
return $?
else
unset check depends install installkernel
. $moddir/module-info.sh
. $moddir/module-setup.sh
is_func install || return 0
install
ret=$?
@ -573,12 +573,12 @@ module_install() { @@ -573,12 +573,12 @@ module_install() {
module_installkernel() {
local moddir=$(echo ${dracutbasedir}/modules.d/??${1})
[[ -d $moddir ]] || return 1
if [[ ! -f $moddir/module-info.sh ]]; then
if [[ ! -f $moddir/module-setup.sh ]]; then
[[ -x $moddir/installkernel ]] && . "$moddir/installkernel"
return $?
else
unset check depends install installkernel
. $moddir/module-info.sh
. $moddir/module-setup.sh
is_func installkernel || return 0
installkernel
ret=$?

2
dracut.xml

@ -613,7 +613,7 @@ Common used functions are in <filename>dracut-lib.sh</filename>, which can be so @@ -613,7 +613,7 @@ Common used functions are in <filename>dracut-lib.sh</filename>, which can be so
<section>
<title>Writing a Module</title>
<para>A simple example module is <filename>96insmodpost</filename>, which modprobes a kernel module after udev has settled and the basic device drivers have been loaded.</para>
<para>All module installation information is in the file module-info.sh.</para>
<para>All module installation information is in the file module-setup.sh.</para>
<para>First we create a <function>check()</function> function, which just exits with <errorcode>0</errorcode> indicating that this module should be included by default.</para>
<para><function>check()</function>:</para>
<programlisting>return 0</programlisting>

0
modules.d/00bootchart/module-info.sh → modules.d/00bootchart/module-setup.sh

0
modules.d/00dash/module-info.sh → modules.d/00dash/module-setup.sh

0
modules.d/01fips/module-info.sh → modules.d/01fips/module-setup.sh

0
modules.d/05busybox/module-info.sh → modules.d/05busybox/module-setup.sh

0
modules.d/10i18n/module-info.sh → modules.d/10i18n/module-setup.sh

0
modules.d/10rpmversion/module-info.sh → modules.d/10rpmversion/module-setup.sh

0
modules.d/40network/module-info.sh → modules.d/40network/module-setup.sh

0
modules.d/45ifcfg/module-info.sh → modules.d/45ifcfg/module-setup.sh

0
modules.d/50gensplash/module-info.sh → modules.d/50gensplash/module-setup.sh

0
modules.d/50plymouth/module-info.sh → modules.d/50plymouth/module-setup.sh

0
modules.d/60xen/module-info.sh → modules.d/60xen/module-setup.sh

0
modules.d/90btrfs/module-info.sh → modules.d/90btrfs/module-setup.sh

0
modules.d/90crypt/module-info.sh → modules.d/90crypt/module-setup.sh

0
modules.d/90dm/module-info.sh → modules.d/90dm/module-setup.sh

0
modules.d/90dmraid/module-info.sh → modules.d/90dmraid/module-setup.sh

0
modules.d/90dmsquash-live/module-info.sh → modules.d/90dmsquash-live/module-setup.sh

0
modules.d/90kernel-modules/module-info.sh → modules.d/90kernel-modules/module-setup.sh

0
modules.d/90lvm/module-info.sh → modules.d/90lvm/module-setup.sh

0
modules.d/90mdraid/module-info.sh → modules.d/90mdraid/module-setup.sh

0
modules.d/90multipath/module-info.sh → modules.d/90multipath/module-setup.sh

0
modules.d/95dasd/module-info.sh → modules.d/95dasd/module-setup.sh

0
modules.d/95dasd_mod/module-info.sh → modules.d/95dasd_mod/module-setup.sh

0
modules.d/95debug/module-info.sh → modules.d/95debug/module-setup.sh

0
modules.d/95fcoe/module-info.sh → modules.d/95fcoe/module-setup.sh

0
modules.d/95fstab-sys/module-info.sh → modules.d/95fstab-sys/module-setup.sh

0
modules.d/95iscsi/module-info.sh → modules.d/95iscsi/module-setup.sh

0
modules.d/95nbd/module-info.sh → modules.d/95nbd/module-setup.sh

0
modules.d/95nfs/module-info.sh → modules.d/95nfs/module-setup.sh

0
modules.d/95resume/module-info.sh → modules.d/95resume/module-setup.sh

0
modules.d/95rootfs-block/module-info.sh → modules.d/95rootfs-block/module-setup.sh

0
modules.d/95terminfo/module-info.sh → modules.d/95terminfo/module-setup.sh

0
modules.d/95udev-rules/module-info.sh → modules.d/95udev-rules/module-setup.sh

0
modules.d/95zfcp/module-info.sh → modules.d/95zfcp/module-setup.sh

0
modules.d/95znet/module-info.sh → modules.d/95znet/module-setup.sh

0
modules.d/96insmodpost/module-info.sh → modules.d/96insmodpost/module-setup.sh

0
modules.d/97biosdevname/module-info.sh → modules.d/97biosdevname/module-setup.sh

0
modules.d/98selinux/module-info.sh → modules.d/98selinux/module-setup.sh

0
modules.d/98syslog/module-info.sh → modules.d/98syslog/module-setup.sh

0
modules.d/99base/module-info.sh → modules.d/99base/module-setup.sh

Loading…
Cancel
Save