From 488398d5702e60e54a06b0e2053da37e74ef1d77 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Sat, 2 Dec 2023 22:45:14 +0500 Subject: [PATCH] Update --- boot/melawy1-grub2.sh | 25 +++++-- boot/melawy1-refind.sh | 25 +++++-- boot/melawy1-systemd-boot.sh | 25 +++++-- boot/melawy2-grub2-net.sh | 25 +++++-- boot/melawy2-refind-net.sh | 25 +++++-- boot/melawy2-systemd-boot-net.sh | 25 +++++-- make_iso/airootfs/etc/pacman.d/mirrorlist | 88 +++++++++++------------ make_iso/netinstall.yaml | 12 ++-- make_iso/netinstall_min.yaml | 12 ++-- make_iso/packages.x86_64 | 6 +- make_iso/profiledef.sh | 2 +- 11 files changed, 187 insertions(+), 83 deletions(-) diff --git a/boot/melawy1-grub2.sh b/boot/melawy1-grub2.sh index 24acb62..3193607 100755 --- a/boot/melawy1-grub2.sh +++ b/boot/melawy1-grub2.sh @@ -29,7 +29,7 @@ iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1) qcow2="$name.qcow2" if [ ! -f "./qcow2/$qcow2" ]; then - qemu-img create -f qcow2 "./qcow2/$qcow2" 100G + qemu-img create -f qcow2 "./qcow2/$qcow2" 200G fi echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" @@ -38,8 +38,25 @@ random_num=$((1 + $RANDOM % 100)) ssh_port=$(shuf -i 60000-61000 -n 1) + +sys="spice" + +if [ $sys == "gtk" ]; then + display="gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "sdl" ]; then + display="sdl,gl=core,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "spice" ]; then + display="spice-app,show-cursor=on" + audio="spice" +fi + +title="${name}_MelawyLinux_${random_num}_ssh_port_${ssh_port}" + + qemu-system-x86_64 \ --name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \ +-name ${title},process=${title},guest=${title},debug-threads=on \ -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ @@ -55,8 +72,8 @@ qemu-system-x86_64 \ -usb \ -k en-us \ -vga virtio \ --display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ --audiodev pipewire,id=snd0 \ +-display $display \ +-audiodev $audio,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 \ diff --git a/boot/melawy1-refind.sh b/boot/melawy1-refind.sh index 24acb62..3193607 100755 --- a/boot/melawy1-refind.sh +++ b/boot/melawy1-refind.sh @@ -29,7 +29,7 @@ iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1) qcow2="$name.qcow2" if [ ! -f "./qcow2/$qcow2" ]; then - qemu-img create -f qcow2 "./qcow2/$qcow2" 100G + qemu-img create -f qcow2 "./qcow2/$qcow2" 200G fi echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" @@ -38,8 +38,25 @@ random_num=$((1 + $RANDOM % 100)) ssh_port=$(shuf -i 60000-61000 -n 1) + +sys="spice" + +if [ $sys == "gtk" ]; then + display="gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "sdl" ]; then + display="sdl,gl=core,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "spice" ]; then + display="spice-app,show-cursor=on" + audio="spice" +fi + +title="${name}_MelawyLinux_${random_num}_ssh_port_${ssh_port}" + + qemu-system-x86_64 \ --name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \ +-name ${title},process=${title},guest=${title},debug-threads=on \ -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ @@ -55,8 +72,8 @@ qemu-system-x86_64 \ -usb \ -k en-us \ -vga virtio \ --display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ --audiodev pipewire,id=snd0 \ +-display $display \ +-audiodev $audio,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 \ diff --git a/boot/melawy1-systemd-boot.sh b/boot/melawy1-systemd-boot.sh index 24acb62..3193607 100755 --- a/boot/melawy1-systemd-boot.sh +++ b/boot/melawy1-systemd-boot.sh @@ -29,7 +29,7 @@ iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1) qcow2="$name.qcow2" if [ ! -f "./qcow2/$qcow2" ]; then - qemu-img create -f qcow2 "./qcow2/$qcow2" 100G + qemu-img create -f qcow2 "./qcow2/$qcow2" 200G fi echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" @@ -38,8 +38,25 @@ random_num=$((1 + $RANDOM % 100)) ssh_port=$(shuf -i 60000-61000 -n 1) + +sys="spice" + +if [ $sys == "gtk" ]; then + display="gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "sdl" ]; then + display="sdl,gl=core,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "spice" ]; then + display="spice-app,show-cursor=on" + audio="spice" +fi + +title="${name}_MelawyLinux_${random_num}_ssh_port_${ssh_port}" + + qemu-system-x86_64 \ --name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \ +-name ${title},process=${title},guest=${title},debug-threads=on \ -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ @@ -55,8 +72,8 @@ qemu-system-x86_64 \ -usb \ -k en-us \ -vga virtio \ --display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ --audiodev pipewire,id=snd0 \ +-display $display \ +-audiodev $audio,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 \ diff --git a/boot/melawy2-grub2-net.sh b/boot/melawy2-grub2-net.sh index 24acb62..3193607 100755 --- a/boot/melawy2-grub2-net.sh +++ b/boot/melawy2-grub2-net.sh @@ -29,7 +29,7 @@ iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1) qcow2="$name.qcow2" if [ ! -f "./qcow2/$qcow2" ]; then - qemu-img create -f qcow2 "./qcow2/$qcow2" 100G + qemu-img create -f qcow2 "./qcow2/$qcow2" 200G fi echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" @@ -38,8 +38,25 @@ random_num=$((1 + $RANDOM % 100)) ssh_port=$(shuf -i 60000-61000 -n 1) + +sys="spice" + +if [ $sys == "gtk" ]; then + display="gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "sdl" ]; then + display="sdl,gl=core,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "spice" ]; then + display="spice-app,show-cursor=on" + audio="spice" +fi + +title="${name}_MelawyLinux_${random_num}_ssh_port_${ssh_port}" + + qemu-system-x86_64 \ --name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \ +-name ${title},process=${title},guest=${title},debug-threads=on \ -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ @@ -55,8 +72,8 @@ qemu-system-x86_64 \ -usb \ -k en-us \ -vga virtio \ --display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ --audiodev pipewire,id=snd0 \ +-display $display \ +-audiodev $audio,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 \ diff --git a/boot/melawy2-refind-net.sh b/boot/melawy2-refind-net.sh index 24acb62..3193607 100755 --- a/boot/melawy2-refind-net.sh +++ b/boot/melawy2-refind-net.sh @@ -29,7 +29,7 @@ iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1) qcow2="$name.qcow2" if [ ! -f "./qcow2/$qcow2" ]; then - qemu-img create -f qcow2 "./qcow2/$qcow2" 100G + qemu-img create -f qcow2 "./qcow2/$qcow2" 200G fi echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" @@ -38,8 +38,25 @@ random_num=$((1 + $RANDOM % 100)) ssh_port=$(shuf -i 60000-61000 -n 1) + +sys="spice" + +if [ $sys == "gtk" ]; then + display="gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "sdl" ]; then + display="sdl,gl=core,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "spice" ]; then + display="spice-app,show-cursor=on" + audio="spice" +fi + +title="${name}_MelawyLinux_${random_num}_ssh_port_${ssh_port}" + + qemu-system-x86_64 \ --name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \ +-name ${title},process=${title},guest=${title},debug-threads=on \ -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ @@ -55,8 +72,8 @@ qemu-system-x86_64 \ -usb \ -k en-us \ -vga virtio \ --display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ --audiodev pipewire,id=snd0 \ +-display $display \ +-audiodev $audio,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 \ diff --git a/boot/melawy2-systemd-boot-net.sh b/boot/melawy2-systemd-boot-net.sh index 24acb62..3193607 100755 --- a/boot/melawy2-systemd-boot-net.sh +++ b/boot/melawy2-systemd-boot-net.sh @@ -29,7 +29,7 @@ iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1) qcow2="$name.qcow2" if [ ! -f "./qcow2/$qcow2" ]; then - qemu-img create -f qcow2 "./qcow2/$qcow2" 100G + qemu-img create -f qcow2 "./qcow2/$qcow2" 200G fi echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd" @@ -38,8 +38,25 @@ random_num=$((1 + $RANDOM % 100)) ssh_port=$(shuf -i 60000-61000 -n 1) + +sys="spice" + +if [ $sys == "gtk" ]; then + display="gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "sdl" ]; then + display="sdl,gl=core,show-cursor=on,window-close=on" + audio="pipewire" +elif [ $sys == "spice" ]; then + display="spice-app,show-cursor=on" + audio="spice" +fi + +title="${name}_MelawyLinux_${random_num}_ssh_port_${ssh_port}" + + qemu-system-x86_64 \ --name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \ +-name ${title},process=${title},guest=${title},debug-threads=on \ -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \ -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \ -global "driver=cfi.pflash01,property=secure,value=off" \ @@ -55,8 +72,8 @@ qemu-system-x86_64 \ -usb \ -k en-us \ -vga virtio \ --display gtk,full-screen=off,grab-on-hover=on,show-cursor=on,window-close=on \ --audiodev pipewire,id=snd0 \ +-display $display \ +-audiodev $audio,id=snd0 \ -device ich9-intel-hda \ -device hda-output,audiodev=snd0 \ -device virtio-net-pci,romfile=,netdev=net0 \ diff --git a/make_iso/airootfs/etc/pacman.d/mirrorlist b/make_iso/airootfs/etc/pacman.d/mirrorlist index c90752a..68e4e75 100644 --- a/make_iso/airootfs/etc/pacman.d/mirrorlist +++ b/make_iso/airootfs/etc/pacman.d/mirrorlist @@ -3,58 +3,58 @@ ################################################################################ # With: reflector --save /etc/pacman.d/mirrorlist -c 'CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, ' --protocol https --latest 50 --fastest 50 --sort rate -# When: 2023-11-20 14:33:34 UTC +# When: 2023-12-01 19:15:33 UTC # From: https://archlinux.org/mirrors/status/json/ -# Retrieved: 2023-11-20 14:33:34 UTC -# Last Check: 2023-11-20 14:25:53 UTC +# Retrieved: 2023-12-01 19:13:51 UTC +# Last Check: 2023-12-01 19:01:00 UTC -Server = https://mirror.surf/archlinux/$repo/os/$arch Server = https://arch.midov.pl/arch/$repo/os/$arch +Server = https://mirror.neuf.no/archlinux/$repo/os/$arch Server = https://mirror.juniorjpdj.pl/archlinux/$repo/os/$arch -Server = https://mirror.wuki.li/archlinux/$repo/os/$arch +Server = https://archlinux.koyanet.lv/archlinux/$repo/os/$arch Server = https://arch.yhtez.xyz/$repo/os/$arch -Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch -Server = https://mirror.sunred.org/archlinux/$repo/os/$arch -Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch -Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch -Server = https://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch -Server = https://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch -Server = https://mirror.nw-sys.ru/archlinux/$repo/os/$arch -Server = https://mirror.pseudoform.org/$repo/os/$arch -Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch -Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch -Server = https://archlinux.homeinfo.de/$repo/os/$arch -Server = https://mirror.iusearchbtw.nl/$repo/os/$arch -Server = https://arch.mirror.zachlge.org/$repo/os/$arch -Server = https://mirror.archlinux.no/$repo/os/$arch -Server = https://mirror.thekinrar.fr/archlinux/$repo/os/$arch -Server = https://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch -Server = https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch -Server = https://pkg.fef.moe/archlinux/$repo/os/$arch -Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch -Server = https://mirror.srv.fail/archlinux/$repo/os/$arch -Server = https://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch -Server = https://nox.panibrez.com/archlinux/$repo/os/$arch -Server = https://ftp.ludd.ltu.se/mirrors/archlinux/$repo/os/$arch +Server = https://mirror.cmt.de/archlinux/$repo/os/$arch +Server = https://de.arch.mirror.kescher.at/$repo/os/$arch Server = https://mirrors.n-ix.net/archlinux/$repo/os/$arch Server = https://mirror.f4st.host/archlinux/$repo/os/$arch -Server = https://archlinux.thaller.ws/$repo/os/$arch -Server = https://arch.phinau.de/$repo/os/$arch -Server = https://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch -Server = https://archlinux.mailtunnel.eu/$repo/os/$arch -Server = https://arch.jensgutermuth.de/$repo/os/$arch -Server = https://dist-mirror.fem.tu-ilmenau.de/archlinux/$repo/os/$arch -Server = https://mirror.quantum5.ca/archlinux/$repo/os/$arch -Server = https://theswissbay.ch/archlinux/$repo/os/$arch +Server = https://pkg.fef.moe/archlinux/$repo/os/$arch +Server = https://arch.unixpeople.org/$repo/os/$arch +Server = https://mirrors.janbruckner.de/archlinux/$repo/os/$arch +Server = https://mirror.dogado.de/archlinux/$repo/os/$arch +Server = https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch +Server = https://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch +Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch +Server = https://mirror.ps.kz/archlinux/$repo/os/$arch +Server = https://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch +Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch +Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch +Server = https://arch.kyberorg.fi/$repo/os/$arch +Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch +Server = https://mirror.5i.fi/archlinux/$repo/os/$arch +Server = https://ftp.lysator.liu.se/pub/archlinux/$repo/os/$arch +Server = https://mirror.informatik.tu-freiberg.de/arch/$repo/os/$arch Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch -Server = https://mirror.selfnet.de/archlinux/$repo/os/$arch +Server = https://packages.oth-regensburg.de/archlinux/$repo/os/$arch +Server = https://mirror.bahnhof.net/pub/archlinux/$repo/os/$arch +Server = https://arch.yourlabs.org/$repo/os/$arch +Server = https://lysakermoen.com/Software/Linux/Mirrors/ArchLinux/$repo/os/$arch +Server = https://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch +Server = https://arch.phinau.de/$repo/os/$arch +Server = https://ftp.rnl.tecnico.ulisboa.pt/pub/archlinux/$repo/os/$arch +Server = https://arch.jensgutermuth.de/$repo/os/$arch +Server = https://mirror.sunred.org/archlinux/$repo/os/$arch +Server = https://archlinux.mailtunnel.eu/$repo/os/$arch Server = https://ftp.fau.de/archlinux/$repo/os/$arch -Server = https://ftp.psnc.pl/linux/archlinux/$repo/os/$arch -Server = https://arch.sakamoto.pl/$repo/os/$arch -Server = https://mirror.cyberbits.asia/archlinux/$repo/os/$arch -Server = https://mirror.jingk.ai/archlinux/$repo/os/$arch -Server = https://mirror.fsmg.org.nz/archlinux/$repo/os/$arch -Server = https://repo.jing.rocks/archlinux/$repo/os/$arch -Server = https://mirror.2degrees.nz/archlinux/$repo/os/$arch +Server = https://archlinux.homeinfo.de/$repo/os/$arch +Server = https://mirror.quantum5.ca/archlinux/$repo/os/$arch Server = https://mirror.moson.org/arch/$repo/os/$arch +Server = https://archlinux.thaller.ws/$repo/os/$arch +Server = https://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch +Server = https://ftp.psnc.pl/linux/archlinux/$repo/os/$arch +Server = https://mirror.cyberbits.asia/archlinux/$repo/os/$arch +Server = https://mirrors.xtom.de/archlinux/$repo/os/$arch +Server = https://repo.jing.rocks/archlinux/$repo/os/$arch Server = https://archmirror.it/repos/$repo/os/$arch +Server = https://mirror.bethselamin.de/$repo/os/$arch +Server = https://arch.kurdy.org/$repo/os/$arch +Server = https://mirror.worldhotspot.org/archlinux/$repo/os/$arch diff --git a/make_iso/netinstall.yaml b/make_iso/netinstall.yaml index e0b606a..42ee556 100644 --- a/make_iso/netinstall.yaml +++ b/make_iso/netinstall.yaml @@ -661,13 +661,8 @@ selected: true subgroups: - - name: "FreeOffice" - selected: true - packages: - - freeoffice - - name: "LibreOffice" - selected: false + selected: true packages: - libreoffice-fresh - libreoffice-fresh-$LOCALE @@ -678,6 +673,11 @@ packages: - onlyoffice-bin + - name: "FreeOffice" + selected: false + packages: + - freeoffice + - name: "Media players" description: "Add the audio players" selected: true diff --git a/make_iso/netinstall_min.yaml b/make_iso/netinstall_min.yaml index 3fc8c57..5016702 100644 --- a/make_iso/netinstall_min.yaml +++ b/make_iso/netinstall_min.yaml @@ -661,13 +661,8 @@ selected: true subgroups: - - name: "FreeOffice" - selected: true - packages: - - freeoffice - - name: "LibreOffice" - selected: false + selected: true packages: - libreoffice-fresh - libreoffice-fresh-$LOCALE @@ -678,6 +673,11 @@ packages: - onlyoffice-bin + - name: "FreeOffice" + selected: false + packages: + - freeoffice + - name: "Media players" description: "Add the audio players" selected: true diff --git a/make_iso/packages.x86_64 b/make_iso/packages.x86_64 index e4025d5..ae99d37 100644 --- a/make_iso/packages.x86_64 +++ b/make_iso/packages.x86_64 @@ -504,8 +504,10 @@ profile-sync-daemon ## Office -## FreeOffice -freeoffice +## LibreOffice +libreoffice-extension-languagetool +libreoffice-fresh +libreoffice-fresh-ru ## Media players audacious diff --git a/make_iso/profiledef.sh b/make_iso/profiledef.sh index 140da79..e29fa6e 100644 --- a/make_iso/profiledef.sh +++ b/make_iso/profiledef.sh @@ -3,7 +3,7 @@ date_tag=$(date +%Y.%m.%d) iso_name="Melawy-Linux" -iso_label="MelawyOS_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" +iso_label="Me$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d)" iso_publisher="Melawy Linux " iso_application="Melawy Linux Live/Rescue CD" iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"