Merge branch 'testing' of https://github.com/puppylinux-woof-CE/woof-CE…

… into rationalise

initrd-progs/0initrd/bin/fsck

@@ -4,7 +4,7 @@ dev=$1
 [ "$dev" = "" ] && exit 1
 [ ! -b "$dev" ] && exit 1
 
-fs=$(blkid "$dev" | grep -o 'TYPE=".*' | cut -f 2 -d '"')
+fs=$(blkid "$dev" | grep -o ' TYPE=".*' | cut -f 2 -d '"')
 
 case $fs in
 	ext2|ext3|ext4) e2fsck -y $dev ;;

initrd-progs/0initrd/init

@@ -206,7 +206,7 @@ decode_id() {
   ONE_PART="$1"  #is a real partition
  else
   [ "$BLKIDOUT" ] || BLKIDOUT="$(blkid)"
-  ONE_PART="$(echo "$BLKIDOUT" | grep -m1 -E "LABEL=.${1}|UUID=.${1}" | cut -f1 -d: | cut -f3 -d/)" #is LABEL or UUID
+  ONE_PART="$(echo "$BLKIDOUT" | grep -m1 -E " LABEL=.${1}| UUID=.${1}" | cut -f1 -d: | cut -f3 -d/)" #is LABEL or UUID
  fi
 }
 
@@ -459,7 +459,7 @@ load_ext_file() { #ex: stretchsave.4fs
    losetup $ONE_LOOP $SAVE_FN
  fi
  #--
- SFFS=$(busybox blkid "$SAVE_FN" | grep -o 'TYPE=".*' | cut -f 2 -d '"')
+ SFFS=$(blkid "$SAVE_FN" | grep -o ' TYPE=".*' | cut -f 2 -d '"')
  case $SFFS in #savefile filesystem
    ext2|ext3|ext4) ok=1 ;;
    *) # might be encrypted - unrecognizable..

kernel-kit/build.conf

@@ -10,7 +10,7 @@
 
 ## speed up the process by specifing a DOTconfig file:
 #DOTconfig_file=DOTconfig
-#DOTconfig_file=configs_x86/DOTconfig-3.14.73-i686-4g
+#DOTconfig_file=configs_x86/DOTconfig-3.14.79-i686-4g
 
 ## use this version string with the current ./DOTconfig
 ## (in case it doesn't have usable version info inside)
@@ -65,9 +65,13 @@ LIBRE=0
 ## 'xz' / 'gzip' ..
 COMP="-comp xz"
 
-## Overide the default firmware URL ONLY FOR HUGE build
+## Firmware tarballs repository
 FW_URL=http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/firmware
 
+## Firmware tarball or SFS (fdrv)
+## specify pkg url to automate the process
+#FW_PKG_URL="http://ftp.nluug.nl/ftp/pub/os/Linux/distr/puppylinux/firmware/firmware-140621-big.tar.bz2"
+
 ## Kernel download mirrors
 kernel_mirrors='ftp://www.kernel.org/pub/linux/kernel
 ftp://ftp.ntu.edu.tw/linux/kernel
@@ -86,3 +90,8 @@ ftp://ftp.be.debian.org/pub/linux/kernel'
 ## to the kernel configuration in DOTconfig. 
 ## To set the 'big' variable uncomment the folowing line:
 #fw_flag=big
+
+## -- AUTO --
+## Enforce automation of the process. Also triggered by: ./build.sh auto
+## Every error is fatal, so you must specify all the needed stuff in build.conf first..
+#AUTO=yes