(old)Puppy Linux Discussion Forum

Code: Select all

diff -r -u sbin/pup_event_backend_modprobe /sbin/pup_event_backend_modprobe
 . . .
+#120823 rerwin: --use-blacklist to apply the blacklist commands in the configuration files (if any) to module names as well.
 . . .
@@ -102,13 +102,12 @@
 
 #note, no longer using /tmp/pup_event_modprobe.conf (which was created in rc.sysinit)...
 #110508 -i to ignore "install" and "remove" commands in /etc/modprobe.d/*.conf...
-MODULE="`/sbin/modprobe -i -b --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #120809
+#120823 rerwin: --use-blacklist (or -b) to apply the blacklist commands in the configuration files (if any) to module names as well...
+MODULE="`/sbin/modprobe -i --use-blacklist --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`"
 if [ "$RULEMODULE" != "" ];then
  if [ "$MODULE" = "" -o "$MODULE" = "usb_storage" -o "$MODULE" = "snd_hda_intel" ];then
   #110508 do not allow argument-module if it is blacklisted (note blacklist.conf created in rc.sysinit)...

@@ -118,7 +117,7 @@
  if [ "`lsmod | grep '^usb_storage '`" != "" ];then
   if [ ! -f /etc/modprobe.d/blacklist-usb_storage.conf ];then
    echo 'blacklist usb_storage' > /etc/modprobe.d/blacklist-usb_storage.conf
-   MODULE="`/sbin/modprobe -i -b --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508 120809
+   MODULE="`/sbin/modprobe -i --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508            <===========================
    [ "$MODULE" = "" ] && exit 1
   fi
  fi

@@ -154,7 +153,7 @@
  for PREFMOD in $PREFMODS #format can have multiple ':', ex: 8139cp:8139too:8139xx (last is most preferred).
  do
   echo "blacklist $MODULE" > /etc/modprobe.d/blacklist-${MODULE}.conf
-  xMODULE="`/sbin/modprobe -i -b --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508 120809
+  xMODULE="`/sbin/modprobe -i --show-depends $MODALIAS 2>/dev/null | tail -n 1 | rev | cut -f 1 -d '/' | rev | cut -f 1 -d '.' | tr '\-' '_'`" #110508            <===========================
   [ "$xMODULE" = "$PREFMOD" ] && MODULE="$xMODULE"
   [ "$xMODULE" = "" ] && rm -f /etc/modprobe.d/blacklist-${MODULE}.conf
  done

Code: Select all

diff -r -u etc/rc.d/functions4puppy4 /etc/rc.d/functions4puppy4
 . . .
-#120729 Add firmware_tarball_func support for firmware directory & set tarball name in firmware.dep.inst regardless of pinstall script - copied from backend_modprobe.
 . . .
     #execute any post-install script...
     if [ -f /pinstall.${FIRMPKG}.sh ];then
-     BRKCNT=0 #120729
+     BRKCNT=0; SLEEPU=$((${$} * 10))
      while [ 1 ];do #serialise execution of pinstall scripts...
       PINSTALLCNT=`find / -maxdepth 1 -type f -name 'pinstall.*.sh' | wc -l`
       [ $PINSTALLCNT -eq 1 ] && break
-      usleep ${SLEEPU}0 #120729
+      usleep $SLEEPU
       BRKCNT=$(($BRKCNT + 1))
       [ $BRKCNT -gt 5 ] && break
      done
+     echo "$MODULE" >> /etc/modules/firmware.dep.inst.${KERNVER}
      cd /
      /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
      rm -f /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
     fi
-    echo "$FIRMPKG" >> /etc/modules/firmware.dep.inst.${KERNVER} #120729
    fi
   fi
  fi

Code: Select all

      done
      cd /
      /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
      rm -f /pinstall.${FIRMPKG}.sh >/dev/null 2>&1
     fi
     echo "$FIRMPKG" >> /etc/modules/firmware.dep.inst.${KERNVER}
    fi
   fi
  fi

Code: Select all

/etc/modprobe.d/nouveau.conf