From a57bbb3b79d5bf52ae060612584e75fc82c236e5 Mon Sep 17 00:00:00 2001
From: Dimitri Lizzi <dimitri.lizzi@etu.hesge.ch>
Date: Wed, 17 Jun 2020 16:27:59 +0200
Subject: [PATCH] deploy with debian (WIP)
---
Makefile | 1 +
Vagrantfile | 4 ++--
deployer/Dockerfile | 2 +-
deployer/multistrap.config | 4 +++-
dhcp/dhcpd.conf | 3 ---
doc/trimstart.py | 2 +-
nfs/nfsroot.tar.xz | 4 ++--
tftp/tftpboot/boot/deployer/initrd.img | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index d58f036..ad1dcd4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+SHELL := /bin/bash
MAKEFLAGS += "-j 4"
DOCKER_BUILDKIT_BUILD = DOCKER_BUILDKIT=1 docker build --progress=plain
diff --git a/Vagrantfile b/Vagrantfile
index 394f34d..ebbc9c3 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -47,12 +47,12 @@ Vagrant.configure("2") do |config|
mv /vagrant/tftp/tftpboot /tftpboot
systemctl restart tftpd-hpa
- # Install and configure DHCP server
+ # Install and configure NFS server
apt-get install -y nfs-kernel-server
cp /vagrant/nfs/exports /etc/exports
rm -rf /nfsroot
mkdir /nfsroot
- tar -xJvf /vagrant/nfs/nfsroot.tar.xz -C /nfsroot --strip-components=1
+ tar -xJf /vagrant/nfs/nfsroot.tar.xz -C /nfsroot --strip-components=1
systemctl restart nfs-server
SHELL
diff --git a/deployer/Dockerfile b/deployer/Dockerfile
index 22f45b4..54f37dc 100644
--- a/deployer/Dockerfile
+++ b/deployer/Dockerfile
@@ -10,7 +10,7 @@ ADD ./hostname ./rootfs/etc/hostname
ADD ./hosts ./rootfs/etc/hosts
ADD ./fstab ./rootfs/etc/fstab
ADD ./initramfs.conf ./rootfs/etc/initramfs-tools/initramfs.conf
-ADD ./init ./rootfs/sbin/init
+#ADD ./init ./rootfs/sbin/init
ADD ./bootiful-deploy ./rootfs/usr/bin
ADD ./bootiful-deploy-log ./rootfs/usr/bin
diff --git a/deployer/multistrap.config b/deployer/multistrap.config
index 39b8763..3d8e194 100644
--- a/deployer/multistrap.config
+++ b/deployer/multistrap.config
@@ -2,10 +2,12 @@
unpack=true
bootstrap=Debian
aptsources=Debian
+addimportant=true
[Debian]
-packages=nfs-common clonezilla linux-image-amd64
+packages=nfs-common clonezilla linux-image-amd64 parted systemd udev
source=http://http.debian.net/debian
keyring=debian-archive-keyring
suite=buster
+components=main contrib non-free
diff --git a/dhcp/dhcpd.conf b/dhcp/dhcpd.conf
index 0592976..6e8a8fa 100755
--- a/dhcp/dhcpd.conf
+++ b/dhcp/dhcpd.conf
@@ -16,9 +16,6 @@ subnet 192.168.56.0 netmask 255.255.255.0 {
if substring (option vendor-class-identifier, 15, 5) = "00000" {
option bootfile-name "/boot/grub/i386-pc/core.0";
}
- elsif substring (option vendor-class-identifier, 15, 5) = "00002" {
- option bootfile-name "/boot/grub/i386-efi/core.efi";
- }
elsif substring (option vendor-class-identifier, 15, 5) = "00006" {
option bootfile-name "/boot/grub/i386-efi/core.efi";
}
diff --git a/doc/trimstart.py b/doc/trimstart.py
index 1e88784..1da3fdc 100755
--- a/doc/trimstart.py
+++ b/doc/trimstart.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
import sys
diff --git a/nfs/nfsroot.tar.xz b/nfs/nfsroot.tar.xz
index c3ac79a..de6e3cc 100644
--- a/nfs/nfsroot.tar.xz
+++ b/nfs/nfsroot.tar.xz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:65f62898013bc8bfd86350be16a12d086a97565e8a8c277fac098db6cf92d7c8
-size 89274896
+oid sha256:c7c1bb87f6f4a8be3985bc6f2f8286bffda09e3ae47178a919ddf574b1eb27a8
+size 101508908
diff --git a/tftp/tftpboot/boot/deployer/initrd.img b/tftp/tftpboot/boot/deployer/initrd.img
index 2181e6c..68e9eb4 100644
--- a/tftp/tftpboot/boot/deployer/initrd.img
+++ b/tftp/tftpboot/boot/deployer/initrd.img
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:28ea68228a915fc07e9a962eb4c27aad6ff266b8bfba8712dfbfa38214a427be
-size 17973101
+oid sha256:de41897060c1cfe00bb6cfe43195b145b83be8180d041a2cacc7c2c7a8a53040
+size 17974794
--
GitLab