diff options
| author | Juuso Alasuutari | 2007-03-11 14:10:28 +0000 |
|---|---|---|
| committer | Jaka Kranjc | 2007-03-12 17:31:36 +0100 |
| commit | f4b0b15efa384ad329dcab1443a191ff1f5fea81 (patch) | |
| tree | 377d35ab7e0e436f15284ae927012bc4273963fb | |
| parent | deef7fcfbf531dcc585c05b22497dd871e79b687 (diff) | |
module-init-tools: install default modprobe.conf to fix #13446
(cherry picked from commit 8440311ed371bd993b9b1686c83ee17f4e2131ef)
| -rw-r--r-- | kernels/module-init-tools/HISTORY | 6 | ||||
| -rwxr-xr-x | kernels/module-init-tools/INSTALL | 36 | ||||
| -rw-r--r-- | kernels/module-init-tools/modprobe.conf | 1 |
3 files changed, 28 insertions, 15 deletions
diff --git a/kernels/module-init-tools/HISTORY b/kernels/module-init-tools/HISTORY index 5fe23459b7..6f2c764a7a 100644 --- a/kernels/module-init-tools/HISTORY +++ b/kernels/module-init-tools/HISTORY @@ -1,3 +1,9 @@ +2007-03-11 Juuso Alasuutari <iuso@sourcemage.org> + * PREPARE: Deleted (removal was scheduled for during stable-0.7). + * INSTALL: Install default modprobe.conf to include modprobe.d, + fixes #13446. + * modprobe.conf: Added. + 2007-02-22 Treeve Jelbert <treeve@pi.be> * DETAILS: version 3.3-pre10 diff --git a/kernels/module-init-tools/INSTALL b/kernels/module-init-tools/INSTALL index d00f4680fa..8897ff6a7e 100755 --- a/kernels/module-init-tools/INSTALL +++ b/kernels/module-init-tools/INSTALL @@ -1,23 +1,29 @@ -mkdir -p $INSTALL_ROOT/lib/modules && -make_normal && +mkdir -p "$INSTALL_ROOT/lib/modules" && +make_normal && -if [ $OLD_TOO == y ] ; then - cd $SOURCE_DIRECTORY2 && - make install DESTDIR=$INSTALL_ROOT && - mkdir -p ${INSTALL_ROOT}/etc/modules.d && - touch ${INSTALL_ROOT}/etc/modules && - touch ${INSTALL_ROOT}/etc/modules.conf && - cd $SOURCE_DIRECTORY && - rm_source_dir $SOURCE_DIRECTORY2 && - if ! [[ $INSTALL_ROOT ]] ; then +if [[ $OLD_TOO == y ]] +then + cd "$SOURCE_DIRECTORY2" && + make install DESTDIR="$INSTALL_ROOT" && + mkdir -p "$INSTALL_ROOT/etc/modules.d" && + touch "$INSTALL_ROOT/etc/modules" && + touch "$INSTALL_ROOT/etc/modules.conf" && + cd "$SOURCE_DIRECTORY" && + rm_source_dir "$SOURCE_DIRECTORY2" && + if [[ -z $INSTALL_ROOT ]] + then make moveold fi fi && -make install DESTDIR=$INSTALL_ROOT && +make install DESTDIR="$INSTALL_ROOT" && -if [ $OLD_TOO == y ] && ! [[ $INSTALL_ROOT ]] ; then - ./generate-modprobe.conf ${INSTALL_ROOT}/etc/modprobe.conf +if [[ $OLD_TOO == y ]] && [[ -z $INSTALL_ROOT ]] +then + ./generate-modprobe.conf /etc/modprobe.conf fi && -install_config_file modprobe.devfs ${INSTALL_ROOT}/etc/modprobe.devfs +install_config_file "$SCRIPT_DIRECTORY/modprobe.conf" \ + "$INSTALL_ROOT/etc/modprobe.conf" && +install_config_file modprobe.devfs \ + "$INSTALL_ROOT/etc/modprobe.devfs" diff --git a/kernels/module-init-tools/modprobe.conf b/kernels/module-init-tools/modprobe.conf new file mode 100644 index 0000000000..72e3bc9e86 --- /dev/null +++ b/kernels/module-init-tools/modprobe.conf @@ -0,0 +1 @@ +include /etc/modprobe.d/ |