diff --git a/tests/packer/init/archlinux-gnome.user-data.yml b/tests/packer/init/archlinux-gnome.user-data.yml index 3fa13b169..855bc58ea 100644 --- a/tests/packer/init/archlinux-gnome.user-data.yml +++ b/tests/packer/init/archlinux-gnome.user-data.yml @@ -45,7 +45,7 @@ packages: # Install Graphical Interface - gnome - - gnome-extra + - gnome-extra - seahorse - alacarte @@ -55,25 +55,24 @@ packages: - terminator runcmd: - # Regenerate grub.cfg - - [ grub-mkconfig, -o, /boot/grub/grub.cfg ] + - grub-mkconfig -o /boot/grub/grub.cfg # Remove swapfile - - [ swapoff, -a ] - - [ rm, -rf, /swap/ ] - - [ sed, -e, "/swap/d", -i, /etc/fstab ] + - swapoff -a + - rm -rf /swap/ + - sed -e "/swap/d" -i /etc/fstab # Enable core services - - [ systemctl, enable, apparmor ] - - [ systemctl, enable, auditd ] - - [ systemctl, enable, gdm ] - - [ systemctl, enable, NetworkManager ] - - [ systemctl, enable, rngd ] - - [ systemctl, enable, systemd-timesyncd.service ] + - systemctl enable apparmor + - systemctl enable auditd + - systemctl enable gdm + - systemctl enable NetworkManager + - systemctl enable rngd + - systemctl enable avahi-daemon + - systemctl enable systemd-timesyncd.service write_files: - # Enable AppArmor in kernel parameters - path: /etc/default/grub append: true diff --git a/tests/packer/init/archlinux-kde.user-data.yml b/tests/packer/init/archlinux-kde.user-data.yml index 923533bd1..a85ca16d4 100644 --- a/tests/packer/init/archlinux-kde.user-data.yml +++ b/tests/packer/init/archlinux-kde.user-data.yml @@ -46,9 +46,10 @@ packages: # Install Graphical Interface - plasma-meta - sddm + - ark - dolphin - konsole - - ark + - okular # Install Applications - firefox @@ -56,25 +57,24 @@ packages: - terminator runcmd: - # Regenerate grub.cfg - - [ grub-mkconfig, -o, /boot/grub/grub.cfg ] + - grub-mkconfig -o /boot/grub/grub.cfg # Remove swapfile - - [ swapoff, -a ] - - [ rm, -rf, /swap/ ] - - [ sed, -e, "/swap/d", -i, /etc/fstab ] + - swapoff -a + - rm -rf /swap/ + - sed -e "/swap/d" -i /etc/fstab # Enable core services - - [ systemctl, enable, apparmor ] - - [ systemctl, enable, auditd ] - - [ systemctl, enable, sddm ] - - [ systemctl, enable, NetworkManager ] - - [ systemctl, enable, rngd ] - - [ systemctl, enable, systemd-timesyncd.service ] + - systemctl enable apparmor + - systemctl enable auditd + - systemctl enable sddm + - systemctl enable NetworkManager + - systemctl enable rngd + - systemctl enable avahi-daemon + - systemctl enable systemd-timesyncd.service write_files: - # Enable AppArmor in kernel parameters - path: /etc/default/grub append: true diff --git a/tests/packer/init/archlinux-server.user-data.yml b/tests/packer/init/archlinux-server.user-data.yml index 2d23c67b3..034cd22d6 100644 --- a/tests/packer/init/archlinux-server.user-data.yml +++ b/tests/packer/init/archlinux-server.user-data.yml @@ -37,37 +37,21 @@ packages: - wget runcmd: - # Regenerate grub.cfg - - [ grub-mkconfig, -o, /boot/grub/grub.cfg ] + - grub-mkconfig -o /boot/grub/grub.cfg # Remove swapfile - - [ swapoff, -a ] - - [ rm, -rf, /swap/ ] - - [ sed, -e, "/swap/d", -i, /etc/fstab ] + - swapoff -a + - rm -rf /swap/ + - sed -e "/swap/d" -i /etc/fstab # Enable core services - - [ systemctl, enable, apparmor ] - - [ systemctl, enable, auditd ] - - [ systemctl, enable, rngd ] - - [ systemctl, enable, systemd-timesyncd.service ] + - systemctl enable apparmor + - systemctl enable auditd + - systemctl enable rngd + - systemctl enable systemd-timesyncd.service write_files: - - # Network configuration - - path: /etc/systemd/network/20-wired.network - owner: 'root:root' - permissions: '0644' - content: | - [Match] - Name=en* - - [Network] - DHCP=yes - - [DHCPv4] - RouteMetric=10 - # Enable AppArmor in kernel parameters - path: /etc/default/grub append: true @@ -79,3 +63,23 @@ write_files: append: true content: | [[ -f ~/.bash_aliases ]] && source ~/.bash_aliases + + # Setup shared directory + - path: /etc/fstab + append: true + content: | + 0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d virtiofs defaults 0 1 + + # Network configuration + - path: /etc/systemd/network/20-wired.network + owner: "root:root" + permissions: "0644" + content: | + [Match] + Name=en* + + [Network] + DHCP=yes + + [DHCPv4] + RouteMetric=10 diff --git a/tests/packer/init/clean.sh b/tests/packer/init/clean.sh index 79b8f0577..2e1e7b551 100644 --- a/tests/packer/init/clean.sh +++ b/tests/packer/init/clean.sh @@ -145,9 +145,9 @@ trim() { truncate --size=0 /swap/swapfile fi - _msg "Fill root filesystem with 0 to reduce box size" - dd if=/dev/zero of=/EMPTY bs=1M || true - rm -f /EMPTY + # _msg "Fill root filesystem with 0 to reduce box size" + # dd if=/dev/zero of=/EMPTY bs=1M || true + # rm -f /EMPTY # Block until the empty file has been removed, otherwise, Packer will # try to kill the box while the disk is still full and that is bad. diff --git a/tests/packer/init/debian-gnome.user-data.yml b/tests/packer/init/debian-gnome.user-data.yml index 2aff5a8c2..0e2571883 100644 --- a/tests/packer/init/debian-gnome.user-data.yml +++ b/tests/packer/init/debian-gnome.user-data.yml @@ -37,15 +37,21 @@ runcmd: - apt-get install -y -t bookworm-backports golang-go write_files: - + # Add backports repository - path: /etc/apt/sources.list append: true content: deb http://deb.debian.org/debian bookworm-backports main contrib non-free + # Setup shared directory + - path: /etc/fstab + append: true + content: | + 0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d virtiofs defaults 0 1 + # Network configuration - path: /etc/systemd/network/20-wired.network - owner: 'root:root' - permissions: '0644' + owner: "root:root" + permissions: "0644" content: | [Match] Name=en* diff --git a/tests/packer/init/debian-kde.user-data.yml b/tests/packer/init/debian-kde.user-data.yml index 84524fde1..a608e9b0b 100644 --- a/tests/packer/init/debian-kde.user-data.yml +++ b/tests/packer/init/debian-kde.user-data.yml @@ -37,7 +37,7 @@ runcmd: - apt-get install -y -t bookworm-backports golang-go write_files: - + # Add backports repository - path: /etc/apt/sources.list append: true content: deb http://deb.debian.org/debian bookworm-backports main contrib non-free diff --git a/tests/packer/init/debian-server.user-data.yml b/tests/packer/init/debian-server.user-data.yml index 2f4a86ef6..5f4fe526e 100644 --- a/tests/packer/init/debian-server.user-data.yml +++ b/tests/packer/init/debian-server.user-data.yml @@ -35,7 +35,7 @@ runcmd: - apt-get install -y -t bookworm-backports golang-go write_files: - + # Add backports repository - path: /etc/apt/sources.list append: true content: deb http://deb.debian.org/debian bookworm-backports main contrib non-free @@ -48,8 +48,8 @@ write_files: # Network configuration - path: /etc/systemd/network/20-wired.network - owner: 'root:root' - permissions: '0644' + owner: "root:root" + permissions: "0644" content: | [Match] Name=en* diff --git a/tests/packer/init/init.sh b/tests/packer/init/init.sh index 66b49f38a..6a80b1993 100644 --- a/tests/packer/init/init.sh +++ b/tests/packer/init/init.sh @@ -22,7 +22,7 @@ main() { install -Dm0644 $SRC/site.local /etc/apparmor.d/tunables/multiarch.d/site.local install -Dm0755 $SRC/aa-update /usr/bin/aa-update install -Dm0755 $SRC/aa-log-clean /usr/bin/aa-log-clean - cat $SRC/parser.conf >> /etc/apparmor/parser.conf + cat $SRC/parser.conf >>/etc/apparmor/parser.conf chown -R "$SUDO_USER:$SUDO_USER" "/home/$SUDO_USER/.config/" case "$DISTRIBUTION" in arch) pacman --noconfirm -U $SRC/*.pkg.tar.zst ;; diff --git a/tests/packer/init/opensuse-kde.user-data.yml b/tests/packer/init/opensuse-kde.user-data.yml index 4e39bab2a..6c1c7cfff 100644 --- a/tests/packer/init/opensuse-kde.user-data.yml +++ b/tests/packer/init/opensuse-kde.user-data.yml @@ -23,12 +23,11 @@ packages: - git - go - htop - - make + - make - rsync - vim write_files: - # Set some bash aliases - path: /home/${username}/.bashrc append: true diff --git a/tests/packer/init/ubuntu-desktop.user-data.yml b/tests/packer/init/ubuntu-desktop.user-data.yml index d0a691d8f..30a82279a 100644 --- a/tests/packer/init/ubuntu-desktop.user-data.yml +++ b/tests/packer/init/ubuntu-desktop.user-data.yml @@ -27,7 +27,7 @@ packages: - spice-vdagent - terminator - apparmor-profiles - - build-essential + - build-essential - config-package-dev - debhelper - devscripts @@ -42,7 +42,6 @@ snap: - install snapd-desktop-integration runcmd: - # Remove default filesystem and related tools not used with the suggested # storage layout. These may yet be required if different partitioning schemes # are used. @@ -64,7 +63,6 @@ runcmd: - apt-get -y autoremove write_files: - # Setup shared directory - path: /etc/fstab append: true @@ -72,8 +70,8 @@ write_files: 0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d virtiofs defaults 0 1 - path: /etc/systemd/network/20-wired.network - owner: 'root:root' - permissions: '0644' + owner: "root:root" + permissions: "0644" content: | [Match] Name=en* diff --git a/tests/packer/init/ubuntu-desktop24.user-data.yml b/tests/packer/init/ubuntu-desktop24.user-data.yml index d0a691d8f..30a82279a 100644 --- a/tests/packer/init/ubuntu-desktop24.user-data.yml +++ b/tests/packer/init/ubuntu-desktop24.user-data.yml @@ -27,7 +27,7 @@ packages: - spice-vdagent - terminator - apparmor-profiles - - build-essential + - build-essential - config-package-dev - debhelper - devscripts @@ -42,7 +42,6 @@ snap: - install snapd-desktop-integration runcmd: - # Remove default filesystem and related tools not used with the suggested # storage layout. These may yet be required if different partitioning schemes # are used. @@ -64,7 +63,6 @@ runcmd: - apt-get -y autoremove write_files: - # Setup shared directory - path: /etc/fstab append: true @@ -72,8 +70,8 @@ write_files: 0a31bc478ef8e2461a4b1cc10a24cc4 /home/user/Projects/apparmor.d virtiofs defaults 0 1 - path: /etc/systemd/network/20-wired.network - owner: 'root:root' - permissions: '0644' + owner: "root:root" + permissions: "0644" content: | [Match] Name=en* diff --git a/tests/packer/init/ubuntu-server.user-data.yml b/tests/packer/init/ubuntu-server.user-data.yml index 851399069..5e6d853ba 100644 --- a/tests/packer/init/ubuntu-server.user-data.yml +++ b/tests/packer/init/ubuntu-server.user-data.yml @@ -32,7 +32,6 @@ packages: - vim write_files: - # Setup shared directory - path: /etc/fstab append: true @@ -41,8 +40,8 @@ write_files: # Network configuration - path: /etc/systemd/network/20-wired.network - owner: 'root:root' - permissions: '0644' + owner: "root:root" + permissions: "0644" content: | [Match] Name=en*