greg/vms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get everything passing the flake checks

Browse Source
This commit is contained in:
Greg Hellings
2024-11-18 23:42:28 -06:00
parent 1864511341
commit 4324f0ce67
56 changed files with 56 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1 -1
View File
@@ -1 +1 @@
* text eol=lf * text eol=lf
.gitlab-ci-build.yml.in
-1
View File
@@ -94,4 +94,3 @@ hyperv-iso.amd64:
description: >- description: >-
Release $CI_COMMIT_TAG, found on [Vagrant Cloud](https://app.vagrantup.com/boxen/) Release $CI_COMMIT_TAG, found on [Vagrant Cloud](https://app.vagrantup.com/boxen/)
as version v${BUILD} as version v${BUILD}
.gitlab-ci.yml
+4
View File
@@ -35,6 +35,10 @@ shellcheck:
stage: generate stage: generate
script: nix run ".#shellcheck" script: nix run ".#shellcheck"
flake-check:
stage: generate
script: nix flake check
validate: validate:
stage: check stage: check
needs: needs:
Vagrantfile.in
+2 -2
View File
@@ -33,12 +33,12 @@ Vagrant.configure("2") do |config|
config.vm.provider "libvirt" do |lv| config.vm.provider "libvirt" do |lv|
end end
config.vm.provider "hyperv" do |hv, over| config.vm.provider "hyperv" do |hv, over|
over.vm.network "private_network", bridge: "packer-amd64" over.vm.network "private_network", bridge: "packer-amd64"
#config.vm.network "private_network", bridge: "packer-amd64" #config.vm.network "private_network", bridge: "packer-amd64"
end end
# #
# View the documentation for the provider you are using for more # View the documentation for the provider you are using for more
# information on available options. # information on available options.
distros/almalinux/9/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
dnf clean all dnf clean all
distros/alpine/3.19.0/finalize.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env sh #!/usr/bin/env sh
set -ex set -ex
distros/alpine/3.19.0/http/answers.cfg.sh
+1 -1
View File
@@ -58,4 +58,4 @@ mv in-chroot.sh /mnt
for fs in proc sys dev sys/firmware/efi/efivars; do mount -o bind /${fs} /mnt/${fs}; done for fs in proc sys dev sys/firmware/efi/efivars; do mount -o bind /${fs} /mnt/${fs}; done
chroot /mnt /bin/ash /in-chroot.sh chroot /mnt /bin/ash /in-chroot.sh
rm /mnt/in-chroot.sh rm /mnt/in-chroot.sh
reboot reboot
distros/alpine/3.19.0/http/in-chroot.sh
+1 -1
View File
@@ -54,4 +54,4 @@ virtualbox*)
;; ;;
esac esac
efibootmgr --bootnext "${target}" efibootmgr --bootnext "${target}"
distros/alpine/3.19.0/qemu.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env sh #!/usr/bin/env sh
set -ex set -ex
distros/alpine/3.20/finalize.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env sh #!/usr/bin/env sh
set -ex set -ex
distros/alpine/3.20/http/answers.cfg.sh
+1 -1
View File
@@ -58,4 +58,4 @@ mv in-chroot.sh /mnt
for fs in proc sys dev sys/firmware/efi/efivars; do mount -o bind /${fs} /mnt/${fs}; done for fs in proc sys dev sys/firmware/efi/efivars; do mount -o bind /${fs} /mnt/${fs}; done
chroot /mnt /bin/ash /in-chroot.sh chroot /mnt /bin/ash /in-chroot.sh
rm /mnt/in-chroot.sh rm /mnt/in-chroot.sh
reboot reboot
distros/alpine/3.20/http/in-chroot.sh
+1 -1
View File
@@ -54,4 +54,4 @@ virtualbox*)
;; ;;
esac esac
efibootmgr --bootnext "${target}" efibootmgr --bootnext "${target}"
distros/alpine/3.20/qemu.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env sh #!/usr/bin/env sh
set -ex set -ex
distros/centos-stream/9/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
dnf clean all dnf clean all
distros/centos/7/disc/ks.cfg
-1
View File
@@ -75,4 +75,3 @@ if [ "${virt}" == "microsoft" ]; then
systemctl enable hypervvssd systemctl enable hypervvssd
fi fi
%end %end
distros/debian/10/finalize.sh
+1 -1
View File
@@ -17,4 +17,4 @@ if [ "${virt}" == "microsoft" ]; then
systemctl enable hyperv-daemons.hv-fcopy-daemon systemctl enable hyperv-daemons.hv-fcopy-daemon
systemctl enable hyperv-daemons.hv-kvp-daemon systemctl enable hyperv-daemons.hv-kvp-daemon
systemctl enable hyperv-daemons.hv-vss-daemon systemctl enable hyperv-daemons.hv-vss-daemon
fi fi
distros/debian/10/http/preseed.cfg
+1 -1
View File
@@ -55,4 +55,4 @@ d-i preseed/late_command string
chmod 440 /target/etc/sudoers.d/vagrant; \ chmod 440 /target/etc/sudoers.d/vagrant; \
in-target apt-get update; \ in-target apt-get update; \
in-target apt-get upgrade -y; \ in-target apt-get upgrade -y; \
in-target bash -c 'if [ "$(systemd-detect-virt)" == "microsoft" ]; then apt-get install -y hyperv-daemons; fi' in-target bash -c 'if [ "$(systemd-detect-virt)" == "microsoft" ]; then apt-get install -y hyperv-daemons; fi'
distros/debian/11/finalize.sh
+1 -1
View File
@@ -19,4 +19,4 @@ if [ "${virt}" == "microsoft" ]; then
systemctl enable hv-fcopy-daemon systemctl enable hv-fcopy-daemon
systemctl enable hv-kvp-daemon systemctl enable hv-kvp-daemon
systemctl enable hv-vss-daemon systemctl enable hv-vss-daemon
fi fi
distros/debian/11/http/preseed.cfg
+1 -1
View File
@@ -49,4 +49,4 @@ d-i preseed/late_command string
chmod 440 /target/etc/sudoers.d/vagrant; \ chmod 440 /target/etc/sudoers.d/vagrant; \
sed -i -e 's/ens3/ens5/g' /target/etc/network/interfaces; \ sed -i -e 's/ens3/ens5/g' /target/etc/network/interfaces; \
in-target apt-get update; \ in-target apt-get update; \
in-target apt-get upgrade -y in-target apt-get upgrade -y
distros/debian/12/finalize.sh
+1 -1
View File
@@ -19,4 +19,4 @@ if [ "${virt}" == "microsoft" ]; then
systemctl enable hv-fcopy-daemon systemctl enable hv-fcopy-daemon
systemctl enable hv-kvp-daemon systemctl enable hv-kvp-daemon
systemctl enable hv-vss-daemon systemctl enable hv-vss-daemon
fi fi
distros/debian/12/http/preseed.cfg
+1 -1
View File
@@ -67,4 +67,4 @@ d-i preseed/late_command string
chmod 440 /target/etc/sudoers.d/vagrant; \ chmod 440 /target/etc/sudoers.d/vagrant; \
sed -i -e 's/ens3/ens5/g' /target/etc/network/interfaces; \ sed -i -e 's/ens3/ens5/g' /target/etc/network/interfaces; \
in-target apt-get update; \ in-target apt-get update; \
in-target apt-get upgrade -y in-target apt-get upgrade -y
distros/fedora/38/amd64-ks.cfg
-1
View File
@@ -168,4 +168,3 @@ ssh-keygen -A
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/39/amd64-ks.cfg
-1
View File
@@ -180,4 +180,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/40/amd64-ks.cfg
-1
View File
@@ -179,4 +179,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/41/amd64-ks.cfg
-1
View File
@@ -179,4 +179,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/fedora/rawhide/amd64-ks.cfg
-1
View File
@@ -181,4 +181,3 @@ chcon -R unconfined_u:object_r:user_home_t:s0 /home/vagrant/.ssh
%end %end
##### end kickstart post ############################################ ##### end kickstart post ############################################
distros/nixos/23.05/http/configuration.nix
-1
View File
@@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
lib, lib,
... ...
distros/nixos/23.05/http/flake.nix
+1 -1
View File
@@ -6,7 +6,7 @@
}; };
outputs = outputs =
{ nixstable, self, ... }@inputs: { nixstable, ... }:
{ {
nixosConfigurations.vagrant = nixstable.lib.nixosSystem { nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
distros/nixos/23.05/http/ga-vmware.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{...}: { ... }:
{ {
virtualisation.vmware.guest = { virtualisation.vmware.guest = {
enable = true; enable = true;
headless = false; headless = false;
} };
} }
distros/nixos/23.05/http/install.sh
+1 -1
View File
@@ -61,4 +61,4 @@ rm /mnt/root/in-chroot.sh
umount /mnt/boot umount /mnt/boot
umount /mnt umount /mnt
efibootmgr --bootnext "$(efibootmgr | grep Linux | awk '{print $1}' | sed -E 's/[^0-9]//g')" efibootmgr --bootnext "$(efibootmgr | grep Linux | awk '{print $1}' | sed -E 's/[^0-9]//g')"
reboot reboot
distros/nixos/23.11/http/configuration.nix
-1
View File
@@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
lib, lib,
... ...
distros/nixos/23.11/http/flake.nix
+1 -1
View File
@@ -6,7 +6,7 @@
}; };
outputs = outputs =
{ nixstable, self, ... }@inputs: { nixstable, ... }:
{ {
nixosConfigurations.vagrant = nixstable.lib.nixosSystem { nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
distros/nixos/23.11/http/ga-vmware.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{...}: { ... }:
{ {
virtualisation.vmware.guest = { virtualisation.vmware.guest = {
enable = true; enable = true;
headless = false; headless = false;
} };
} }
distros/nixos/23.11/http/install.sh
+1 -1
View File
@@ -61,4 +61,4 @@ rm /mnt/root/in-chroot.sh
umount /mnt/boot umount /mnt/boot
umount /mnt umount /mnt
efibootmgr --bootnext "$(efibootmgr | grep Linux | awk '{print $1}' | sed -E 's/[^0-9]//g')" efibootmgr --bootnext "$(efibootmgr | grep Linux | awk '{print $1}' | sed -E 's/[^0-9]//g')"
reboot reboot
distros/nixos/23.11/qemu.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/nixos/23.11/virtualbox.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/nixos/23.11/vmware.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/nixos/24.05/http/configuration.nix
-1
View File
@@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
lib, lib,
... ...
distros/nixos/24.05/http/flake.nix
+1 -1
View File
@@ -6,7 +6,7 @@
}; };
outputs = outputs =
{ nixstable, self, ... }@inputs: { nixstable, ... }:
{ {
nixosConfigurations.vagrant = nixstable.lib.nixosSystem { nixosConfigurations.vagrant = nixstable.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
distros/nixos/24.05/http/ga-vmware.nix
+3 -3
View File
@@ -1,7 +1,7 @@
{...}: { ... }:
{ {
virtualisation.vmware.guest = { virtualisation.vmware.guest = {
enable = true; enable = true;
headless = false; headless = false;
} };
} }
distros/nixos/24.05/http/install.sh
+1 -1
View File
@@ -61,4 +61,4 @@ rm /mnt/root/in-chroot.sh
umount /mnt/boot umount /mnt/boot
umount /mnt umount /mnt
efibootmgr --bootnext "$(efibootmgr | grep Linux | awk '{print $1}' | sed -E 's/[^0-9]//g')" efibootmgr --bootnext "$(efibootmgr | grep Linux | awk '{print $1}' | sed -E 's/[^0-9]//g')"
reboot reboot
distros/nixos/24.05/qemu.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/nixos/24.05/virtualbox.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/nixos/24.05/vmware.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/opensuse/15.5/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
zypper clean -a zypper clean -a
distros/opensuse/15.5/http/autoinst.xml
+1 -1
View File
@@ -122,4 +122,4 @@ root ALL=(ALL) NOPASSWD: ALL
<file_location>https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub</file_location> <file_location>https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub</file_location>
</file> </file>
</files> </files>
</profile> </profile>
distros/opensuse/15.5/virtualbox.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/opensuse/15.6/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
zypper clean -a zypper clean -a
distros/opensuse/15.6/http/autoinst.xml
+1 -1
View File
@@ -122,4 +122,4 @@ root ALL=(ALL) NOPASSWD: ALL
<file_location>https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub</file_location> <file_location>https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub</file_location>
</file> </file>
</files> </files>
</profile> </profile>
distros/opensuse/15.6/virtualbox.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/opensuse/16.0/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
zypper clean -a zypper clean -a
distros/opensuse/16.0/http/autoinst.xml
+1 -1
View File
@@ -122,4 +122,4 @@ root ALL=(ALL) NOPASSWD: ALL
<file_location>https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub</file_location> <file_location>https://raw.githubusercontent.com/hashicorp/vagrant/master/keys/vagrant.pub</file_location>
</file> </file>
</files> </files>
</profile> </profile>
distros/opensuse/16.0/virtualbox.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/opensuse/tumbleweed/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
zypper clean -a zypper clean -a
distros/opensuse/tumbleweed/virtualbox.sh
+1 -1
View File
@@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
distros/rockylinux/9/finalize.sh
+1 -1
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
dnf clean all dnf clean all