From cce9ee9123d584341917929d8e14dbe38da411f6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Tue, 27 Sep 2016 22:45:59 +0100
Subject: [PATCH] Testing different install

---
 Makefile                        | 26 +++++++++++++-------------
 src/freedombone-image-customise | 29 +++++++++++++++--------------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index 083ca626..a5681f08 100644
--- a/Makefile
+++ b/Makefile
@@ -24,16 +24,16 @@ install:
 	mkdir -p ${DESTDIR}/usr/share/${APP}/avatars
 	mkdir -p ${DESTDIR}/etc/${APP}
 	cp -r image_build/* ${DESTDIR}/etc/${APP}
-	install -m 755 img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share
-	install -m 755 img/avatars/* ${DESTDIR}/usr/share/${APP}/avatars
-	install -m 755 src/* ${DESTDIR}${PREFIX}/bin
-	install -m 755 src/${APP}-meshweb ${DESTDIR}${PREFIX}/bin/meshweb
-	install -m 755 src/${APP}-controlpanel ${DESTDIR}${PREFIX}/bin/control
-	install -m 755 src/${APP}-mesh-batman ${DESTDIR}${PREFIX}/bin/batman
-	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup
-	install -m 755 src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
-	install -m 755 src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
-	install -m 755 src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
+	cp img/backgrounds/${APP}_*.png ${DESTDIR}${PREFIX}/share
+	cp img/avatars/* ${DESTDIR}/usr/share/${APP}/avatars
+	cp src/* ${DESTDIR}${PREFIX}/bin
+	cp src/${APP}-meshweb ${DESTDIR}${PREFIX}/bin/meshweb
+	cp src/${APP}-controlpanel ${DESTDIR}${PREFIX}/bin/control
+	cp src/${APP}-mesh-batman ${DESTDIR}${PREFIX}/bin/batman
+	cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup
+	cp src/${APP}-backup-local ${DESTDIR}${PREFIX}/bin/backup2friends
+	cp src/${APP}-restore-local ${DESTDIR}${PREFIX}/bin/restore
+	cp src/${APP}-restore-remote ${DESTDIR}${PREFIX}/bin/restorefromfriend
 	rm -f ${DESTDIR}/usr/share/${APP}/base/*
 	rm -f ${DESTDIR}/usr/share/${APP}/apps/*
 	rm -f ${DESTDIR}/usr/share/${APP}/utils/*
@@ -41,9 +41,9 @@ install:
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-app-* ${DESTDIR}/usr/share/${APP}/apps
 	mv ${DESTDIR}${PREFIX}/bin/${APP}-utils-* ${DESTDIR}/usr/share/${APP}/utils
 	mkdir -m 755 -p ${DESTDIR}${PREFIX}/share/man/man1
-	install -m 644 man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
-	install -m 644 man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz
-	install -m 644 man/${APP}-restore-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/restore.1.gz
+	cp man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
+	cp man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz
+	cp man/${APP}-restore-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/restore.1.gz
 	bash -c "./translate install"
 uninstall:
 	rm -f ${PREFIX}/share/${APP}_*.png
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 2b9b37a4..4bf9d857 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -958,18 +958,18 @@ chroot "$rootdir" adduser --gecos $username --disabled-password $username
 echo $username:$password | chroot "$rootdir" /usr/sbin/chpasswd
 chroot "$rootdir" adduser $username sudo
 
-#case "$MACHINE" in
-#    virtualbox)
-#        # hide irrelevant console keyboard messages.
-#        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
-#             >> /etc/init.d/rc.local
-#        ;;
-#    qemu)
-#        # hide irrelevant console keyboard messages.
-#        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
-#             >> /etc/init.d/rc.local
-#        ;;
-#esac
+case "$MACHINE" in
+    virtualbox)
+        # hide irrelevant console keyboard messages.
+        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
+             >> /etc/init.d/rc.local
+        ;;
+    qemu)
+        # hide irrelevant console keyboard messages.
+        echo "echo \"4 4 1 7\" > /proc/sys/kernel/printk" \
+             >> /etc/init.d/rc.local
+        ;;
+esac
 
 if [ ! $DEBIAN_REPO ]; then
     DEBIAN_REPO='ftp.de.debian.org'
@@ -986,6 +986,7 @@ set_apt_sources $MIRROR
 configure_backports
 configure_contrib_repo
 chroot "$rootdir" apt-get update
+chroot "$rootdir" apt-get install -y apt-utils
 
 cat > $rootdir/usr/sbin/policy-rc.d <<EOF
 #!/bin/sh
@@ -1010,9 +1011,9 @@ chroot "$rootdir" apt-get install -y sudo git dialog toilet build-essential
 chroot "$rootdir" apt-get install -y avahi-daemon avahi-utils avahi-discover avahi-autoipd
 chroot "$rootdir" apt-get install -y iptables dnsutils net-tools network-manager iputils-ping
 chroot "$rootdir" apt-get install -y libnss-mdns libnss-myhostname libnss-gw-name nano man ntp
-chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant
-chroot "$rootdir" apt-get install -y usbutils cryptsetup zsh pinentry-curses iotop bc
+chroot "$rootdir" apt-get install -y locales locales-all debconf wireless-tools wpasupplicant usbutils
 if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'i386' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' ]]; then
+    chroot "$rootdir" apt-get install -y cryptsetup zsh pinentry-curses iotop bc
     chroot "$rootdir" apt-get install -y grub2
 fi