From 4e4a9c5bb20bf0fd263b3c5e757b0fc229e4f3a3 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Mon, 15 Jul 2024 17:15:19 -0700 Subject: [PATCH] midoritest --- .../multi-user.target.wants/qemu-guest-agent.service | 1 + elda/archiso/packages.x86_64 | 12 ++++++------ .../30-build-the-iso-the-first-time.sh | 4 +++- .../40-build-the-iso-local-again.sh | 4 +++- .../multi-user.target.wants/qemu-guest-agent.service | 1 + emily/archiso/packages.x86_64 | 12 ++++++------ .../30-build-the-iso-the-first-time.sh | 4 +++- .../40-build-the-iso-local-again.sh | 4 +++- .../multi-user.target.wants/qemu-guest-agent.service | 1 + layla/archiso/packages.x86_64 | 12 ++++++------ .../30-build-the-iso-the-first-time.sh | 4 +++- .../40-build-the-iso-local-again.sh | 4 +++- .../multi-user.target.wants/qemu-guest-agent.service | 1 + midori/archiso/packages.x86_64 | 12 ++++++------ .../30-build-the-iso-the-first-time.sh | 4 +++- .../40-build-the-iso-local-again.sh | 4 +++- 16 files changed, 52 insertions(+), 32 deletions(-) create mode 120000 elda/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service create mode 120000 emily/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service create mode 120000 layla/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service create mode 120000 midori/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service diff --git a/elda/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/elda/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/elda/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/elda/archiso/packages.x86_64 b/elda/archiso/packages.x86_64 index 4b6124e..b6dbb88 100644 --- a/elda/archiso/packages.x86_64 +++ b/elda/archiso/packages.x86_64 @@ -119,7 +119,7 @@ usb_modeswitch usbmuxd usbutils vim -virtualbox-guest-utils-nox +#virtualbox-guest-utils-nox vpnc wireless-regdb wireless_tools @@ -187,10 +187,10 @@ xorg-server ##### Drivers for graphical cards #driver for virtualbox - xf86-video-vmware is dependency -systemctl enable vboxservice -systemctl start vboxservice -systemctl enable qemu-guest-agent -systemctl start qemu-guest-agent +#systemctl enable vboxservice +#systemctl start vboxservice +#systemctl enable qemu-guest-agent +#systemctl start qemu-guest-agent qemu-guest-agent spice-vdagent #to have fullscreen @@ -276,7 +276,7 @@ linux-headers timeshift grub-btrfs -timeshift-autosnap +#timeshift-autosnap git #grub theme diff --git a/elda/installation-scripts/30-build-the-iso-the-first-time.sh b/elda/installation-scripts/30-build-the-iso-the-first-time.sh index d777544..aceeb5b 100755 --- a/elda/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/elda/installation-scripts/30-build-the-iso-the-first-time.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-elda-$rename-pkglist.txt + mv $outFolder/kimberly-elda-$rename.iso $outFolder/kimberly-elda-$rename.iso echo diff --git a/elda/installation-scripts/40-build-the-iso-local-again.sh b/elda/installation-scripts/40-build-the-iso-local-again.sh index b96008b..d4ac5a0 100755 --- a/elda/installation-scripts/40-build-the-iso-local-again.sh +++ b/elda/installation-scripts/40-build-the-iso-local-again.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-elda-$rename-pkglist.txt + mv $outFolder/kimberly-elda-$rename.iso $outFolder/kimberly-elda-$rename.iso #echo diff --git a/emily/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/emily/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/emily/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/emily/archiso/packages.x86_64 b/emily/archiso/packages.x86_64 index 4b6124e..b6dbb88 100644 --- a/emily/archiso/packages.x86_64 +++ b/emily/archiso/packages.x86_64 @@ -119,7 +119,7 @@ usb_modeswitch usbmuxd usbutils vim -virtualbox-guest-utils-nox +#virtualbox-guest-utils-nox vpnc wireless-regdb wireless_tools @@ -187,10 +187,10 @@ xorg-server ##### Drivers for graphical cards #driver for virtualbox - xf86-video-vmware is dependency -systemctl enable vboxservice -systemctl start vboxservice -systemctl enable qemu-guest-agent -systemctl start qemu-guest-agent +#systemctl enable vboxservice +#systemctl start vboxservice +#systemctl enable qemu-guest-agent +#systemctl start qemu-guest-agent qemu-guest-agent spice-vdagent #to have fullscreen @@ -276,7 +276,7 @@ linux-headers timeshift grub-btrfs -timeshift-autosnap +#timeshift-autosnap git #grub theme diff --git a/emily/installation-scripts/30-build-the-iso-the-first-time.sh b/emily/installation-scripts/30-build-the-iso-the-first-time.sh index d777544..8d10a9c 100755 --- a/emily/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/emily/installation-scripts/30-build-the-iso-the-first-time.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-emily-$rename-pkglist.txt + mv $outFolder/kimberly-emily-$rename.iso $outFolder/kimberly-emily-$rename.iso echo diff --git a/emily/installation-scripts/40-build-the-iso-local-again.sh b/emily/installation-scripts/40-build-the-iso-local-again.sh index b96008b..05b216f 100755 --- a/emily/installation-scripts/40-build-the-iso-local-again.sh +++ b/emily/installation-scripts/40-build-the-iso-local-again.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-emily-$rename-pkglist.txt + mv $outFolder/kimberly-emily-$rename.iso $outFolder/kimberly-emily-$rename.iso #echo diff --git a/layla/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/layla/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/layla/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/layla/archiso/packages.x86_64 b/layla/archiso/packages.x86_64 index 4b6124e..b6dbb88 100644 --- a/layla/archiso/packages.x86_64 +++ b/layla/archiso/packages.x86_64 @@ -119,7 +119,7 @@ usb_modeswitch usbmuxd usbutils vim -virtualbox-guest-utils-nox +#virtualbox-guest-utils-nox vpnc wireless-regdb wireless_tools @@ -187,10 +187,10 @@ xorg-server ##### Drivers for graphical cards #driver for virtualbox - xf86-video-vmware is dependency -systemctl enable vboxservice -systemctl start vboxservice -systemctl enable qemu-guest-agent -systemctl start qemu-guest-agent +#systemctl enable vboxservice +#systemctl start vboxservice +#systemctl enable qemu-guest-agent +#systemctl start qemu-guest-agent qemu-guest-agent spice-vdagent #to have fullscreen @@ -276,7 +276,7 @@ linux-headers timeshift grub-btrfs -timeshift-autosnap +#timeshift-autosnap git #grub theme diff --git a/layla/installation-scripts/30-build-the-iso-the-first-time.sh b/layla/installation-scripts/30-build-the-iso-the-first-time.sh index d777544..fff1b4c 100755 --- a/layla/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/layla/installation-scripts/30-build-the-iso-the-first-time.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-layla-$rename-pkglist.txt + mv $outFolder/kimberly-layla-$rename.iso $outFolder/kimberly-layla-$rename.iso echo diff --git a/layla/installation-scripts/40-build-the-iso-local-again.sh b/layla/installation-scripts/40-build-the-iso-local-again.sh index b96008b..9566277 100755 --- a/layla/installation-scripts/40-build-the-iso-local-again.sh +++ b/layla/installation-scripts/40-build-the-iso-local-again.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-layla-$rename-pkglist.txt + mv $outFolder/kimberly-layla-$rename.iso $outFolder/kimberly-layla-$rename.iso #echo diff --git a/midori/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service b/midori/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service new file mode 120000 index 0000000..8e3ff80 --- /dev/null +++ b/midori/archiso/airootfs/etc/systemd/system/multi-user.target.wants/qemu-guest-agent.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/qemu-guest-agent.service \ No newline at end of file diff --git a/midori/archiso/packages.x86_64 b/midori/archiso/packages.x86_64 index 4b6124e..b6dbb88 100644 --- a/midori/archiso/packages.x86_64 +++ b/midori/archiso/packages.x86_64 @@ -119,7 +119,7 @@ usb_modeswitch usbmuxd usbutils vim -virtualbox-guest-utils-nox +#virtualbox-guest-utils-nox vpnc wireless-regdb wireless_tools @@ -187,10 +187,10 @@ xorg-server ##### Drivers for graphical cards #driver for virtualbox - xf86-video-vmware is dependency -systemctl enable vboxservice -systemctl start vboxservice -systemctl enable qemu-guest-agent -systemctl start qemu-guest-agent +#systemctl enable vboxservice +#systemctl start vboxservice +#systemctl enable qemu-guest-agent +#systemctl start qemu-guest-agent qemu-guest-agent spice-vdagent #to have fullscreen @@ -276,7 +276,7 @@ linux-headers timeshift grub-btrfs -timeshift-autosnap +#timeshift-autosnap git #grub theme diff --git a/midori/installation-scripts/30-build-the-iso-the-first-time.sh b/midori/installation-scripts/30-build-the-iso-the-first-time.sh index d777544..97e0487 100755 --- a/midori/installation-scripts/30-build-the-iso-the-first-time.sh +++ b/midori/installation-scripts/30-build-the-iso-the-first-time.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-midori-$rename-pkglist.txt + mv $outFolder/kimberly-midori-$rename.iso $outFolder/kimberly-midori-$rename.iso echo diff --git a/midori/installation-scripts/40-build-the-iso-local-again.sh b/midori/installation-scripts/40-build-the-iso-local-again.sh index b96008b..a092f37 100755 --- a/midori/installation-scripts/40-build-the-iso-local-again.sh +++ b/midori/installation-scripts/40-build-the-iso-local-again.sh @@ -274,7 +274,9 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/archiso/packages.x86_64 $buildFolder/archiso/pkglist.x86_64.txt + cp $buildFolder/archiso/pkglist.x86_64.txt $outFolder/kimberly-midori-$rename-pkglist.txt + mv $outFolder/kimberly-midori-$rename.iso $outFolder/kimberly-midori-$rename.iso #echo