diff --git a/README.md b/README.md index 51beda4..982ab87 100644 --- a/README.md +++ b/README.md @@ -8,14 +8,6 @@ ## Contribuer -### Dépendances - -- pacman -- wget -- net-tools -- archiso -- virtualbox - ### Fabrication La fabrication de la machine virtuelle est assez farfelue mais ça marche assez bien. diff --git a/build.sh b/build.sh index 12b80b9..0fffd3d 100755 --- a/build.sh +++ b/build.sh @@ -18,21 +18,6 @@ log "updating environment" fi -AURS="zerofree" - - -log "creating package db" - rm -fr /tmp/custom-db - mkdir /tmp/custom-db - for aur in $AURS - do - git clone "https://aur.archlinux.org/$aur.git" "/tmp/custom-db/$aur" - ( cd "/tmp/custom-db/$aur" && makepkg; ) - mv /tmp/custom-db/$aur/$aur-* /tmp/custom-db/ - repo-add /tmp/custom-db/custom.db.tar.gz /tmp/custom-db/$aur-*.pkg.tar.zst - done - - log "creating iso" sudo mkarchiso -v -w $PWD/tmp/wdir -r -o $PWD/output $PWD/profile rm -f output/install.iso @@ -59,12 +44,11 @@ log "creating VM" 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 # removes iso after run + VBoxManage storageattach $VM_NAME --storagectl=IDE --port=1 --device=1 --medium=none # removes iso after run log "exporting VM" - 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 - VBoxManage modifyhd $PWD/tmp/drive.vdi -compact 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." diff --git a/profile/airootfs/root/post_install.sh b/profile/airootfs/root/post_install.sh index 2b3a7e7..6345e66 100644 --- a/profile/airootfs/root/post_install.sh +++ b/profile/airootfs/root/post_install.sh @@ -33,7 +33,7 @@ log "installing virtualbox guest additions" echo " cd /mnt/cdrom echo yes | sudo ./VBoxLinuxAdditions.run - " | arch-chroot -u user "$ROOT" || true # will fail to reload modules since running in a chroot, but installation still successful + " | arch-chroot -u user "$ROOT" log "installing paru" @@ -94,10 +94,3 @@ log "configuring home" do code --install-extension $ext done ' | arch-chroot -u user "$ROOT" - - -log "optimizing drive" - umount "$ROOT/mnt/crdom" - umount "$ROOT/boot" - umount "$ROOT" - zerofree -v /dev/sda2 # note : sda2 is the 20Gb drive, sda1 is the boot partition diff --git a/profile/packages.x86_64 b/profile/packages.x86_64 index 7d099d9..7fc9dff 100644 --- a/profile/packages.x86_64 +++ b/profile/packages.x86_64 @@ -132,4 +132,3 @@ xl2tpd zsh # mb packages -zerofree diff --git a/profile/pacman.conf b/profile/pacman.conf index 8962416..48b05be 100644 --- a/profile/pacman.conf +++ b/profile/pacman.conf @@ -94,6 +94,6 @@ Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. -[custom] -SigLevel = Optional TrustAll -Server = file:///tmp/custom-db +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs