Merge pull request #727 from gyrog/testing

initmodules - look in zdrv partition first
puppylinux-woof-CE · Jan 14, 2016 · 267adaf · 267adaf
2 parents e10b5e4 + b1b304e
commit 267adaf
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/woof-code/huge_extras/init b/woof-code/huge_extras/init
@@ -523,19 +523,19 @@ search_func() { #110425
 
   if [ "$ZDRV" != "" -a "`echo "$ZDRV" | cut -f 1 -d ','`" = "$ONEDEV" ];then
    if [ "$PIMOD" = "" ];then
-    if [ "$PSAVEMARK" != "" -a "$BOOTDRV" != "" ];then
-     PIMODDEV="${BOOTDRV}${PSAVEMARK}"
-     PIMODFS="`echo "$LESSPARTS0" | grep "$PIMODDEV" | cut -f 2 -d '|'`"
+     PIMODFILE="/mnt/data${PSUBDIR}/${DISTRO_FILE_PREFIX}initmodules.txt"
+     [ -f "$PIMODFILE" ] && PIMOD="`head -n1 "$PIMODFILE"`" 
+   fi
+   if [ "$PIMOD" = ""  -a "$SAVEPART" != "" ];then
+    PIMODFS="`echo "$LESSPARTS0" | grep "$SAVEPART" | cut -f 2 -d '|'`"
+    if [ "$PIMODFS" ];then
      [ -d /mnt/dataSMARK ] || mkdir /mnt/dataSMARK
-     mntfunc $PIMODFS /dev/$PIMODDEV /mnt/dataSMARK
+     mntfunc $PIMODFS /dev/$SAVEPART /mnt/dataSMARK
      if [ $? -eq 0 ];then
       PIMODFILE="/mnt/dataSMARK${PSUBDIR}/${DISTRO_FILE_PREFIX}initmodules.txt"
       [ -f "$PIMODFILE" ] && PIMOD="`head -n1 "$PIMODFILE"`" 
       umount /mnt/dataSMARK
      fi
-    else
-     PIMODFILE="/mnt/data${PSUBDIR}/${DISTRO_FILE_PREFIX}initmodules.txt"
-     [ -f "$PIMODFILE" ] && PIMOD="`head -n1 "$PIMODFILE"`" 
     fi
    fi
    if [ "$PIMOD" != "" ];then