diff --git a/build.sh b/build.sh index 2df2552..0fffd3d 100755 --- a/build.sh +++ b/build.sh @@ -5,13 +5,20 @@ cd "$(dirname "$(realpath "$0")")" alias log='echo [build.sh]' +VBOX_VERSION=$(VBoxManage --version | cut -d 'r' -f 1) ETH_DEV=$(route | grep '^default' | grep -o '[^ ]*$') VM_NAME="epitls_build" -log "creating iso" - sudo rm -fr tmp/* +log "updating environment" + sudo rm -fr tmp mkdir -p tmp output + if ! [ -f output/guest_add.iso ] + then wget -O output/guest_add.iso "https://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso" + fi + + +log "creating iso" sudo mkarchiso -v -w $PWD/tmp/wdir -r -o $PWD/output $PWD/profile rm -f output/install.iso mv output/archlinux-*.iso output/install.iso @@ -32,16 +39,18 @@ log "creating VM" VBoxManage storageattach $VM_NAME --storagectl=SATA --port=0 --device=0 --type=hdd --medium=$PWD/tmp/drive.vdi VBoxManage storagectl $VM_NAME --name=IDE --add ide VBoxManage storageattach $VM_NAME --storagectl=IDE --port=0 --device=0 --type=dvddrive --medium=$PWD/output/install.iso + VBoxManage storageattach $VM_NAME --storagectl=IDE --port=1 --device=1 --type=dvddrive --medium=$PWD/output/guest_add.iso log "running VM with iso" virtualboxvm --startvm $VM_NAME --dvd $PWD/output/install.iso - VBoxManage storageattach $VM_NAME --storagectl=IDE --port=0 --device=0 --medium=none + VBoxManage storageattach $VM_NAME --storagectl=IDE --port=0 --device=0 --medium=none # removes iso after run + VBoxManage storageattach $VM_NAME --storagectl=IDE --port=1 --device=1 --medium=none # removes iso after run log "exporting VM" rm -f $PWD/output/epitls.ova - VBoxManage export $VM_NAME --output=$PWD/output/epitls.ova --vsys=0 --vmname=epitls --description="VM pour le développement à EPITA Toulouse" + VBoxManage export $VM_NAME --output=$PWD/output/epitls.ova --vsys=0 --vmname=epitls --description="VM pour le développement à EPITA Toulouse." log "disposing VM" diff --git a/profile/airootfs/root/post_install.sh b/profile/airootfs/root/post_install.sh index 050183f..e97fa99 100644 --- a/profile/airootfs/root/post_install.sh +++ b/profile/airootfs/root/post_install.sh @@ -27,6 +27,15 @@ log "configuring network" " | arch-chroot -u user "$ROOT" +log "installing virtualbox guest additions" + mkdir "$ROOT/mnt/cdrom" + mount "/dev/sr1" "$ROOT/mnt/cdrom" + echo " + cd /mnt/cdrom + echo yes | sudo ./VBoxLinuxAdditions.run + " | arch-chroot -u user "$ROOT" + + log "installing paru" echo " cd /tmp diff --git a/profile/airootfs/root/user_configuration.json b/profile/airootfs/root/user_configuration.json index 437df7c..ac53d1b 100644 --- a/profile/airootfs/root/user_configuration.json +++ b/profile/airootfs/root/user_configuration.json @@ -90,35 +90,20 @@ "custom_mirrors": [], "mirror_regions": { "France": [ - "https://mirrors.jtremesay.org/archlinux/$repo/os/$arch", - "https://mirrors.gandi.net/archlinux/$repo/os/$arch", - "https://mirrors.eric.ovh/arch/$repo/os/$arch", - "https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch", - "https://mirror.wormhole.eu/archlinux/$repo/os/$arch", - "https://mirror.theo546.fr/archlinux/$repo/os/$arch", - "https://mirror.thekinrar.fr/archlinux/$repo/os/$arch", - "https://mirror.sysa.tech/archlinux/$repo/os/$arch", - "https://mirror.oldsql.cc/archlinux/$repo/os/$arch", - "https://mirror.its-tps.fr/archlinux/$repo/os/$arch", - "https://mirror.ibakerserver.pt/Arch/$repo/os/$arch", - "https://mirror.cyberbits.eu/archlinux/$repo/os/$arch", - "https://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch", - "https://archlinux.mailtunnel.eu/$repo/os/$arch", - "https://arch.yourlabs.org/$repo/os/$arch", - "http://mirrors.gandi.net/archlinux/$repo/os/$arch", - "http://mirrors.celianvdb.fr/archlinux/$repo/os/$arch", - "http://mirror.theo546.fr/archlinux/$repo/os/$arch", - "http://mirror.oldsql.cc/archlinux/$repo/os/$arch", - "http://mirror.lastmikoi.net/archlinux/$repo/os/$arch", - "http://mirror.its-tps.fr/archlinux/$repo/os/$arch", - "http://mirror.cyberbits.eu/archlinux/$repo/os/$arch", "http://mirror.archlinux.ikoula.com/archlinux/$repo/os/$arch", - "http://mir.archlinux.fr/$repo/os/$arch", - "http://ftp.u-strasbg.fr/linux/distributions/archlinux/$repo/os/$arch", + "http://arch.yourlabs.org/$repo/os/$arch", + "http://mirror.its-tps.fr/archlinux/$repo/os/$arch", + "http://mirroir.wptheme.fr/archlinux/$repo/os/$arch", + "http://archlinux.cu.be/$repo/os/$arch", + "http://mirrors.gandi.net/archlinux/$repo/os/$arch", + "http://mirror.cyberbits.eu/archlinux/$repo/os/$arch", + "https://archlinux.mailtunnel.eu/$repo/os/$arch", + "http://mirror.united-gameserver.de/archlinux/$repo/os/$arch", + "https://mirrors.gandi.net/archlinux/$repo/os/$arch", + "http://archlinux.rezopole.net/$repo/os/$arch", "http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch", - "http://archlinux.mailtunnel.eu/$repo/os/$arch", - "http://archlinux.datagr.am/$repo/os/$arch", - "http://arch.yourlabs.org/$repo/os/$arch" + "https://mirror.cyberbits.eu/archlinux/$repo/os/$arch", + "http://mirror.netweaver.uk/archlinux/$repo/os/$arch" ] } }, @@ -128,6 +113,7 @@ "offline": false, "packages": [ "git", + "linux-headers", "virtualbox-guest-utils", "lightdm-slick-greeter", "cinnamon",