Merge branch 'master' of 88.198.237.222:/git/m1-debian

[m1-debian] / bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
index f5800105d2be71d3edcbcc51b925cd358b0dcd05..c188a14d2d299c520f7ff699baab3629eb8446e3 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -68,8 +68,7 @@ build_rootfs()
         sudo cp ../../files/resolv.conf etc/resolv.conf
         sudo cp ../../files/fstab etc/fstab
         sudo cp ../../files/quickstart.txt root/
-        sudo cp ../../files/eth0 etc/network/interfaces.d/
-        sudo cp ../../files/wlp1s0f0 etc/network/interfaces.d/
+        sudo cp ../../files/interfaces etc/network/interfaces
         sudo cp ../../files/wpa.conf etc/wpa_supplicant/wpa_supplicant.conf
 
         sudo bash -c 'chroot . apt update'
@@ -100,7 +99,7 @@ build_live_stick()
 )
 }
 
-build_fs()
+build_dd()
 {
 (
         rm -f media
@@ -155,11 +154,11 @@ upload_artefacts()
 mkdir -p build
 cd build
 
+build_linux
 build_m1n1
 build_uboot
-build_linux
 build_rootfs
 build_live_stick
 build_di_stick
-build_fs
+build_dd
 upload_artefacts