From 3118fb95f3a7cf4a3bc938a89eb6c588e7d27fc7 Mon Sep 17 00:00:00 2001
From: KatolaZ <katolaz@freaknet.org>
Date: Mon, 7 May 2018 18:27:06 +0100
Subject: [PATCH] setnet is now in the repos -- removed from
 custom_deb_packages

---
 blends/devuan-minimal-live/ascii/config          | 16 +++++-----------
 .../devuan-minimal-live.blend                    | 14 +++++++++++++-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/blends/devuan-minimal-live/ascii/config b/blends/devuan-minimal-live/ascii/config
index d7eb036..a9af903 100644
--- a/blends/devuan-minimal-live/ascii/config
+++ b/blends/devuan-minimal-live/ascii/config
@@ -101,6 +101,7 @@ minimal_net_packages+=(
 	openssh-server
 	procmail
 	rsync
+	setnet
 	telnet
 	tin
 	traceroute
@@ -230,10 +231,7 @@ base_packages+=(
 	$minimal_misc_packages
 )
 
-#### TODO: ADD setnet
 #### TODO: REPLACE twidge (twitter client)
-#### TODO: ADD refractasnapshot
-#### TODO: ADD refractainstaller
 #### ADDED: geoip-bin
 
 extra_packages+=(
@@ -281,13 +279,9 @@ purge_packages=(
 
 
 # yad needs to be first
-#custom_deb_packages+=(yad_0.27.0-1_${arch}.deb)
+#$custom_deb_packages+=(yad_0.27.0-1_${arch}.deb)
 #
 #
-#custom_deb_packages+=(
-#	refractainstaller-base_9.3.0_all.deb
-#	refractainstaller-gui_9.2.2_all.deb
-#	refractasnapshot-base_10.0.2_all.deb
-#	refractasnapshot-gui_9.0.2_all.deb
-#	setnet_0.3.2-1_all.deb
-#)
+##custom_deb_packages+=(
+##	setnet_0.3.2+devuan1.2_all.deb
+##)
diff --git a/blends/devuan-minimal-live/devuan-minimal-live.blend b/blends/devuan-minimal-live/devuan-minimal-live.blend
index 6938647..964a1ab 100644
--- a/blends/devuan-minimal-live/devuan-minimal-live.blend
+++ b/blends/devuan-minimal-live/devuan-minimal-live.blend
@@ -321,6 +321,12 @@ ln -s \${MICRO_INITRD} /initrd.img
 ## rm create_initrd.sh
 ##rm /create_initrd.sh
 
+## install additional packages
+
+cd /custom-packages
+dpkg -i \$(find ./ -type f -name '*.deb')
+
+
 ## package list
 dpkg -l | awk '/^ii/ { print $2 " " $3 }' > /home/${username}/package_list
 
@@ -335,6 +341,11 @@ EOF
 	
 }
 
+## func
+# put_packages(){
+
+# 	sudo cp -a "$R/extra/custom-packages/" ${strapdir} 
+# }
 
 
 blend_finalize() {
@@ -343,7 +354,8 @@ blend_finalize() {
 	ckreq || return 1
 
 	put_create_initrd 
-
+	#put_packages
+	
 	put_finalize
 
 	#chroot-script -d finalize || zerr