Merge pull request #98 from netzint/update-zeroing-pv

Update zeroing pv

build/conf.d/8_pv

@@ -0,0 +1,6 @@
+# pv build environment
+
+PVNAME="pv"
+PVURL="https://github.com/icetee/$PVNAME"
+PVSRCDIR="$SRC/$PVNAME"
+PVBIN="$PVSRCDIR/$PVNAME"

build/initramfs.d/18_pv

@@ -0,0 +1,3 @@
+# ctorrent
+
+file /usr/bin/pv @@PVBIN@@ 755 0 0

build/run.d/7_linbofs

@@ -15,6 +15,8 @@ echo "# static entries" > "$INITRAMFS_BUILD"
 for i in "$BUILDINITD"/*; do
   sed -e "s|@@BBBIN@@|$BBBIN|g
           s|@@CHNTPWBIN@@|$CHNTPWBIN|g
+          s|@@CTORRENTBIN@@|$CTORRENTBIN|g
+          s|@@PVBIN@@|$PVBIN|g
           s|@@KXBIN@@|$KXBIN|g
           s|@@LINBOFS@@|$LINBOFS|g
           s|@@SERVERFS@@|$SERVERFS|g" "$i" >> "$INITRAMFS_BUILD" || exit 1

build/run.d/7_pv

@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# download and build ctorrent
+
+# read build environment
+for i in build/conf.d/*; do source "$i" || exit 1; done
+
+# check for binary
+if [ -s "$PVBIN" -a -x "$PVBIN" ]; then
+  echo "pv binary exists, skipping build."
+
+else
+  # download
+  echo "Cloning $PVNAME source ..."
+  [ -d "$PVSRCDIR" ] && rm -rf "$PVSRCDIR"
+  cd "$SRC"
+  git clone "$PVURL" || exit 1
+  # compile
+  echo "Configuring $PVNAME ..."
+  cd "$PVSRCDIR" || exit 1
+
+  ./configure || exit 1
+  echo "Compiling $PVNAME ..."
+  cd "$PVSRCDIR" || exit 1
+  make || exit 1
+  strip "$PVBIN" || exit 1
+fi

linbofs/linbo.sh

@@ -61,6 +61,7 @@ else # handle missing gui problem
     echo "Console boot menue of group $HOSTGROUP"
     echo "----------------------------------------"
     count=0
+    if [ -d "/conf/" ]; then
     for item in /conf/os.*; do
       [ -s "$item" ] || continue
       name=""
@@ -71,6 +72,7 @@ else # handle missing gui problem
       count=$(( count + 1 ))
       echo "[$count] Sync & start $name"
     done
+    fi
     echo "----------------------------------------"
     echo "[R] Reboot"
     echo "[S] Shutdown"

linbofs/usr/bin/linbo_create_image

@@ -118,18 +118,22 @@ mk_baseimage(){
   local rootdev="$1"
   local imagefile="$2"
   echo "Filling up partition with zeroes..." | tee -a /tmp/image.log
+  freespace=$(df -kP $rootdev | awk 'NR==2 {print $4}')k
+  interruptible pv -s $freespace -tprebf /dev/zero | dd of=/mnt/zero.tmp bs=1024k 2>/tmp/image.log
+
+
   # Create nulled files of size 1GB, should work on any FS.
-  local count=0
-  while true; do
-    # tschmitt: log errors to image.log
-    interruptible dd if=/dev/zero of="/mnt/zero$count.tmp" bs=1024k count=1000 2>>/tmp/image.log || break
-    [ -s "/mnt/zero$count.tmp" ] || break
-    let count++
-    echo "$(du -ch /mnt/zero*.tmp | tail -1 | awk '{ print $1 }') zeroed ... " | tee -a /tmp/image.log
-  done
+  #local count=0
+  #while true; do
+  #  # tschmitt: log errors to image.log
+  #  interruptible dd if=/dev/zero of="/mnt/zero$count.tmp" bs=1024k count=1000 2>>/tmp/image.log || break
+  #  [ -s "/mnt/zero$count.tmp" ] || break
+  #  let count++
+  #  echo "$(du -ch /mnt/zero*.tmp | tail -1 | awk '{ print $1 }') zeroed ... " | tee -a /tmp/image.log
+  #done
   # Sync is asynchronous, unless started twice at least.
   sync ; sync ; sync
-  rm -f /mnt/zero*.tmp
+  rm -f /mnt/zero.tmp
   umount /mnt || umount -l /mnt
   echo "Starting compression of $rootdev -> $imagefile (full partition, ${size}K)."
   echo "qemu-img convert -p -c -f raw -O qcow2 $rootdev $imagefile"