Revert "update: wait running apt processes"v0.34.2

This reverts commit 31470473f8418a47156545d73e4952ef7edbcc48.

4 files changed, 21 insertions, 14 deletions

diff --git a/build-devel.sh b/build-devel.sh
index c42d6e37..e37bf687 100644
--- a/build-devel.sh
+++ b/build-devel.sh
@@ -17,14 +17,7 @@
 # this is a replica of ncp-update, but from devel branch
 install() 
 {
-  # wait for other apt processes
-  test -f /var/lib/apt/lists/lock && echo "waiting for apt processes to finish..." && \
-  while :; do
-    test -f /var/lib/apt/lists/lock && break
-    sleep 1
-  done
-  rm -f /etc/apt/apt.conf.d/20nextcloudpi-upgrades
-
+  test -f /etc/apt/apt.conf.d/20nextcloudpi-upgrades && { echo "deactivate unattended upgrades first"; return 1; }
   echo -e "Downloading updates"
   rm -rf /tmp/ncp-update-tmp
   git clone --depth 20 -q -b devel https://github.com/nextcloud/nextcloudpi.git /tmp/ncp-update-tmp
diff --git a/buildlib.sh b/buildlib.sh
index 56b2240a..a1d8b20e 100644
--- a/buildlib.sh
+++ b/buildlib.sh
@@ -143,6 +143,22 @@ function copy_to_image()
   rmdir tmpmnt &>/dev/null
 }
 
+function deactivate_unattended_upgrades()
+{
+  local IMG=$1
+  local SECTOR
+  local OFFSET
+  SECTOR=$( fdisk -l "$IMG" | grep Linux | awk '{ print $2 }' )
+  OFFSET=$(( SECTOR * 512 ))
+
+  [ -f "$IMG" ] || { echo "no image"; return 1; }
+  mkdir -p tmpmnt
+  sudo mount "$IMG" -o offset="$OFFSET" tmpmnt || return 1
+  sudo rm -f tmpmnt/etc/apt/apt.conf.d/20nextcloudpi-upgrades
+  sudo umount -l tmpmnt
+  rmdir tmpmnt &>/dev/null
+}
+
 function download_resize_raspbian_img()
 {
   local SIZE=$1
diff --git a/changelog.md b/changelog.md
index 617849d7..b0289090 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,9 @@
 
-[v0.34.1](https://github.com/nextcloud/nextcloudpi/commit/36d2ee5) (2017-11-09) nc-nextcloud: added more logging
+[v0.34.2](https://github.com/nextcloud/nextcloudpi/commit/490c8fb) (2017-11-09) Revert "update: wait running apt processes"
 
-[v0.34.0](https://github.com/nextcloud/nextcloudpi/commit/bdf1b13) (2017-11-07) added NCP custom theme with new logo
+[v0.34.1](https://github.com/nextcloud/nextcloudpi/commit/343c406) (2017-11-09) nc-nextcloud: added more logging
+
+[v0.34.0 ](https://github.com/nextcloud/nextcloudpi/commit/bdf1b13) (2017-11-07) added NCP custom theme with new logo
 
 [v0.33.0 ](https://github.com/nextcloud/nextcloudpi/commit/d478a34) (2017-11-06) added redis
 
diff --git a/update.sh b/update.sh
index 1688a081..4c5e0cf6 100755
--- a/update.sh
+++ b/update.sh
@@ -49,10 +49,6 @@ EXCL_DOCKER+="
 nc-update.sh
 nc-autoupdate-ncp.sh
 "
-
-# wait for other apt processes
-test -f /var/lib/apt/lists/lock && { echo "apt is currently running. Try again later";  exit 1; }
-
 cp etc/library.sh /usr/local/etc/
 
 source /usr/local/etc/library.sh