f-m git-diff-nickdaly-master

gistfile1.txt

diff --git a/Makefile b/Makefile
index 24d2d9a..a12cd41 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ ARCHIVE = $(NAME).tar.bz2
 SIGNATURE = $(ARCHIVE).sig
 SUITE = sid
 SOURCE = false
-OWNER = 1000
 
 # build DreamPlug USB or SD card image
 dreamplug: prep
@@ -24,7 +23,7 @@ dreamplug: prep
 	$(eval DESTINATION = card)
 
 	ARCHITECTURE=$(ARCHITECTURE) DESTINATION=$(DESTINATION) MACHINE=$(MACHINE) \
-	  SOURCE=$(SOURCE) SUITE=$(SUITE) OWNER=$(OWNER) \
+	  SOURCE=$(SOURCE) SUITE=$(SUITE) \
 	  bin/mk_freedombox_image $(NAME)
 
 	tar -cjvf $(ARCHIVE) $(IMAGE)
@@ -38,7 +37,7 @@ raspberry: prep
 	$(eval DESTINATION = card)
 
 	ARCHITECTURE=$(ARCHITECTURE) DESTINATION=$(DESTINATION) MACHINE=$(MACHINE) \
-	  SOURCE=$(SOURCE) SUITE=$(SUITE) OWNER=$(OWNER) \
+	  SOURCE=$(SOURCE) SUITE=$(SUITE) \
 	  bin/mk_freedombox_image $(NAME)
 
 	tar -cjvf $(ARCHIVE) $(IMAGE)
@@ -52,7 +51,7 @@ beaglebone: prep
 	$(eval DESTINATION = card)
 
 	ARCHITECTURE=$(ARCHITECTURE) DESTINATION=$(DESTINATION) MACHINE=$(MACHINE) \
-	  SOURCE=$(SOURCE) SUITE=$(SUITE) OWNER=$(OWNER) \
+	  SOURCE=$(SOURCE) SUITE=$(SUITE) \
 	  bin/mk_freedombox_image $(NAME)
 
 	tar -cjvf $(ARCHIVE) $(IMAGE)
@@ -66,7 +65,7 @@ virtualbox: prep
 	$(eval DESTINATION = hdd)
 
 	ARCHITECTURE=$(ARCHITECTURE) DESTINATION=$(DESTINATION) MACHINE=$(MACHINE) \
-	  SOURCE=$(SOURCE) SUITE=$(SUITE) OWNER=$(OWNER) \
+	  SOURCE=$(SOURCE) SUITE=$(SUITE) \
 	  bin/mk_freedombox_image $(NAME)
 
 # Convert image to vdi hard drive
diff --git a/bin/freedombox-customize b/bin/freedombox-customize
index 665cb01..c5ccc69 100755
--- a/bin/freedombox-customize
+++ b/bin/freedombox-customize
@@ -50,9 +50,12 @@ exit 101
 EOF
 chmod a+rx $rootdir/usr/sbin/policy-rc.d
 
-chroot $rootdir apt-get install -y freedombox-setup
+#chroot $rootdir apt-get install -y freedombox-setup
+cp /home/jvalleroy/fbx/freedombox-setup_* $rootdir/tmp
+chroot $rootdir apt-get install -y apache2 augeas-tools avahi-daemon avahi-utils bridge-utils devio dialog dnsmasq dnsutils dosfstools etckeeper firewalld haveged hostname how-can-i-help htop iftop iptables iputils-ping isc-dhcp-client libnss-gw-name libnss-mdns libnss-myhostname locales locales-all lsof macchanger monkeysphere net-tools ntp openssh-server parted plinth psmisc resolvconf ssl-cert sudo tcpdump uaputl unattended-upgrades vim-tiny wget curl zile batctl rfkill wireless-tools pagekite
+chroot $rootdir dpkg -i /tmp/freedombox-setup_0.0.45_all.deb
 
 rm $rootdir/usr/sbin/policy-rc.d
 
-chroot $rootdir /usr/lib/freedombox/setup | tee >  \
+chroot $rootdir /usr/lib/freedombox/setup | tee > \
     $rootdir/var/log/freedombox-setup.log
diff --git a/bin/mk_freedombox_image b/bin/mk_freedombox_image
index fe08b16..7be189a 100755
--- a/bin/mk_freedombox_image
+++ b/bin/mk_freedombox_image
@@ -109,7 +109,7 @@ sudo -H \
     vmdebootstrap \
     --log $(dirname $IMAGE)/freedombox.log \
     --log-level debug \
-    --size 4G \
+    --size 3.5G \
     --image $IMAGE.img \
     --hostname freedombox \
     --verbose \
@@ -118,6 +118,5 @@ sudo -H \
     --root-password freedom \
     --arch $ARCHITECTURE \
     --distribution $SUITE \
-    --owner $OWNER \
     $extra_opts \
     $pkgopts