From 0baa5c15e3374fb56aefc9473c40cea0bca2443d Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Sun, 19 Jun 2016 13:36:48 +0300
Subject: [PATCH] Remove custom 50unattended-upgrades

---
 distributions.sh              | 17 -----------------
 makeboarddeb.sh               |  8 +++++---
 scripts/50unattended-upgrades |  5 -----
 3 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 scripts/50unattended-upgrades

diff --git a/distributions.sh b/distributions.sh
index 7e4d19ee61..399d2fad61 100644
--- a/distributions.sh
+++ b/distributions.sh
@@ -23,7 +23,6 @@ display_alert "Applying distribution specific tweaks for" "$RELEASE" "info"
 rm $CACHEDIR/sdcard/etc/network/interfaces
 
 # configure the system for unattended upgrades
-cp $SRC/lib/scripts/50unattended-upgrades $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
 cp $SRC/lib/scripts/02periodic $CACHEDIR/sdcard/etc/apt/apt.conf.d/02periodic
 
 # setting window title for remote sessions
@@ -44,10 +43,6 @@ wheezy)
 		sed -e 's/5:23:respawn/#5:23:respawn/g' -i $CACHEDIR/sdcard/etc/inittab
 		sed -e 's/6:23:respawn/#6:23:respawn/g' -i $CACHEDIR/sdcard/etc/inittab
 
-		# auto upgrading
-		sed -e "s/ORIGIN/Debian/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-		sed -e "s/n=CODENAME/a=old-stable/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-
 		# install ramlog
 		cp $SRC/lib/bin/ramlog_2.0.0_all.deb $CACHEDIR/sdcard/tmp
 		chroot $CACHEDIR/sdcard /bin/bash -c "dpkg -i /tmp/ramlog_2.0.0_all.deb >/dev/null 2>&1"
@@ -64,10 +59,6 @@ jessie)
 		# enable root login for latest ssh on jessie
 		sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' $CACHEDIR/sdcard/etc/ssh/sshd_config
 
-		# auto upgrading
-		sed -e "s/ORIGIN/Debian/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-		sed -e "s/CODENAME/$RELEASE/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-
 		# mount 256Mb tmpfs to /tmp
 		echo "tmpfs   /tmp         tmpfs   nodev,nosuid,size=256M          0  0" >> $CACHEDIR/sdcard/etc/fstab
 
@@ -121,10 +112,6 @@ trusty)
 			mv $CACHEDIR/sdcard/etc/update-motd.d $CACHEDIR/sdcard/etc/update-motd.d-backup
 		fi
 
-		# auto upgrading
-		sed -e "s/ORIGIN/Ubuntu/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-		sed -e "s/CODENAME/$RELEASE/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-
 		# remove what's anyway not working
 		#chroot $CACHEDIR/sdcard /bin/bash -c "apt-get remove --auto-remove ureadahead"
 		rm $CACHEDIR/sdcard/etc/init/ureadahead*
@@ -135,10 +122,6 @@ xenial)
 		# enable root login for latest ssh on jessie
 		sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' $CACHEDIR/sdcard/etc/ssh/sshd_config
 
-		# auto upgrading (disabled while testing)
-		sed -e "s/ORIGIN/Ubuntu/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-		sed -e "s/CODENAME/$RELEASE/g" -i $CACHEDIR/sdcard/etc/apt/apt.conf.d/50unattended-upgrades
-
 		# fix selinux error
 		mkdir $CACHEDIR/sdcard/selinux
 		
diff --git a/makeboarddeb.sh b/makeboarddeb.sh
index 7de88b51a7..4804000f83 100644
--- a/makeboarddeb.sh
+++ b/makeboarddeb.sh
@@ -23,7 +23,8 @@ create_board_package()
 	mkdir -p $destination/DEBIAN
 
 	# Replaces: base-files is needed to replace /etc/update-motd.d/ files on Xenial
-	# Replaces: unattended-upgrades is needed to replace /etc/apt/apt.conf.d/50unattended-upgrades on wheezy, jessie and trusty
+	# Replaces: unattended-upgrades may be needed to replace /etc/apt/apt.conf.d/50unattended-upgrades
+	# (distributions provide good defaults, so this is not needed currently)
 	cat <<-EOF > $destination/DEBIAN/control
 	Package: linux-${RELEASE}-root-${DEB_BRANCH}${BOARD}
 	Version: $REVISION
@@ -32,10 +33,11 @@ create_board_package()
 	Installed-Size: 1
 	Section: kernel
 	Priority: optional
+	Depends: bash, python3-apt
 	Provides: armbian-bsp
 	Conflicts: armbian-bsp
-	Replaces: base-files, unattended-upgrades
-	Recommends: fake-hwclock, initramfs-tools, python3-apt
+	Replaces: base-files
+	Recommends: fake-hwclock, initramfs-tools
 	Description: Armbian tweaks for $RELEASE on $BOARD ($BRANCH branch)
 	EOF
 
diff --git a/scripts/50unattended-upgrades b/scripts/50unattended-upgrades
deleted file mode 100644
index 9779d0dc2b..0000000000
--- a/scripts/50unattended-upgrades
+++ /dev/null
@@ -1,5 +0,0 @@
-Unattended-Upgrade::Origins-Pattern {
-      "o=ORIGIN,n=CODENAME";
-      "o=ORIGIN,n=CODENAME-updates";
-      "o=ORIGIN,n=CODENAME,l=CODENAME-Security";
-};
\ No newline at end of file