diff --git a/Budgie/acorhooks/normal/0520-applications.hook.chroot b/Budgie/acorhooks/normal/0520-applications.hook.chroot index c21cf4e..8237772 100755 --- a/Budgie/acorhooks/normal/0520-applications.hook.chroot +++ b/Budgie/acorhooks/normal/0520-applications.hook.chroot @@ -9,7 +9,8 @@ apt --purge --yes autoremove murrine-themes hv3 libsqlite3-tcl libtcl8.6 libtk-img libtk8.6 tcl tcl-tls tcl8.6 tcllib tk tk-html3 tk8.6 konsole evolution termit raspi-firmware systemsettings nvidia* # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; # Enables the use of lightdm with budgie-desktop update-alternatives --install /usr/bin/x-session-manager x-session-manager /usr/bin/budgie-desktop 60 diff --git a/Budgie/acorinstaller b/Budgie/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Budgie/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Budgie/build.sh b/Budgie/build.sh index 139e0f4..9f2d909 100755 --- a/Budgie/build.sh +++ b/Budgie/build.sh @@ -84,13 +84,9 @@ network-manager-gnome bluez gufw acoros-icons -blue-papirus-icons -brown-papirus-icons -darc-aurora-gtk-theme -orchis-gtk-theme -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme +teja-gtk-theme +tela-circle-icon-theme +tela-icon-theme plymouth plymouth-themes cups @@ -173,7 +169,7 @@ guvcview vlc qt5-style-plugins qt5ct -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -220,7 +216,10 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default -mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share +mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/Desktop +mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.config # Copy Configs to the chroot cp $acorbuild/acoruserconfig/* $acorbuild/build/config/includes.chroot/etc/live/config.conf.d @@ -229,11 +228,16 @@ cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Cinnamon/acorhooks/normal/0520-applications.hook.chroot b/Cinnamon/acorhooks/normal/0520-applications.hook.chroot index 5a1c34a..422bd23 100755 --- a/Cinnamon/acorhooks/normal/0520-applications.hook.chroot +++ b/Cinnamon/acorhooks/normal/0520-applications.hook.chroot @@ -9,7 +9,8 @@ apt --purge --yes autoremove vim vim-tiny nautilus murrine-themes hv3 inkscape gnome-control-center gnome-control-center-data gnome-system-monitor malcontent konsole termit raspi-firmware systemsettings nvidia* # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Cinnamon/acorinstaller b/Cinnamon/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Cinnamon/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Cinnamon/build.sh b/Cinnamon/build.sh index 8cf3de3..71a879a 100755 --- a/Cinnamon/build.sh +++ b/Cinnamon/build.sh @@ -154,7 +154,7 @@ guvcview vlc qt5-style-plugins qt5ct -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -203,6 +203,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.config mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.cinnamon mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.themes @@ -217,6 +219,9 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives @@ -224,6 +229,8 @@ cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/dis cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub cp -r $acorbuild/acorconfigs/cinnamon/cinnamon/* $acorbuild/build/config/includes.chroot/etc/skel/.cinnamon cp -r $acorbuild/acorconfigs/cinnamon/config/* $acorbuild/build/config/includes.chroot/etc/skel/.config +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Gnome/acorhooks/normal/0520-applications.hook.chroot b/Gnome/acorhooks/normal/0520-applications.hook.chroot index d66186e..b7f7183 100755 --- a/Gnome/acorhooks/normal/0520-applications.hook.chroot +++ b/Gnome/acorhooks/normal/0520-applications.hook.chroot @@ -9,7 +9,8 @@ apt --purge --yes autoremove murrine-themes hv3 libsqlite3-tcl libtcl8.6 libtk-img libtk8.6 tcl tcl-tls tcl8.6 tcllib tk tk-html3 tk8.6 konsole evolution termit raspi-firmware systemsettings nvidia* # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Gnome/acorinstaller b/Gnome/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Gnome/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Gnome/build.sh b/Gnome/build.sh index c3496a0..626a62b 100755 --- a/Gnome/build.sh +++ b/Gnome/build.sh @@ -80,19 +80,14 @@ gnome-packagekit gvfs-backends samba gnome-packagekit -iso-flag-png network-manager network-manager-gnome bluez gufw acoros-icons -orchis-gtk-theme -blue-papirus-icons -brown-papirus-icons -darc-aurora-gtk-theme -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme +teja-gtk-theme +tela-circle-icon-theme +tela-icon-theme plymouth plymouth-themes cups @@ -157,7 +152,7 @@ vlc brasero qt5-style-plugins qt5ct -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -204,6 +199,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/boot/grub # Copy Configs to the chroot @@ -213,12 +210,16 @@ cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub - +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Kde/acorhooks/normal/0520-applications.hook.chroot b/Kde/acorhooks/normal/0520-applications.hook.chroot index cca8950..1a687f2 100755 --- a/Kde/acorhooks/normal/0520-applications.hook.chroot +++ b/Kde/acorhooks/normal/0520-applications.hook.chroot @@ -36,7 +36,8 @@ for i in \ done # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Kde/acorinstaller b/Kde/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Kde/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Kde/build.sh b/Kde/build.sh index 0d178e1..6ad8572 100755 --- a/Kde/build.sh +++ b/Kde/build.sh @@ -83,18 +83,12 @@ python3-gi-cairo gvfs-backends samba gnome-packagekit -iso-flag-png network-manager gufw acoros-icons -blue-papirus-icons -brown-papirus-icons -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme -materia-gtk-theme -materia-kde -orchis-gtk-theme +teja-gtk-theme +tela-circle-icon-theme +tela-icon-theme cups system-config-printer plymouth @@ -173,7 +167,7 @@ ksudoku dreamchess guvcview vlc -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -220,6 +214,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/sddm.conf.d @@ -230,11 +226,16 @@ cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp $acorbuild/acorsddm/* $acorbuild/build/config/includes.chroot/etc/sddm.conf.d +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Lxqt/acorhooks/normal/0520-applications.hook.chroot b/Lxqt/acorhooks/normal/0520-applications.hook.chroot index 8da5a4a..1b526c6 100755 --- a/Lxqt/acorhooks/normal/0520-applications.hook.chroot +++ b/Lxqt/acorhooks/normal/0520-applications.hook.chroot @@ -23,7 +23,8 @@ for i in \ # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Lxqt/acorinstaller b/Lxqt/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Lxqt/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Lxqt/build.sh b/Lxqt/build.sh index fcb8eee..98e6c53 100755 --- a/Lxqt/build.sh +++ b/Lxqt/build.sh @@ -158,7 +158,7 @@ gnome-sudoku guvcview vlc xfburn -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -208,6 +208,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/Desktop mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.config @@ -218,6 +220,9 @@ cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel cp $acorbuild/acorconfigs/.gtkrc-2.0 $acorbuild/build/config/includes.chroot/etc/skel @@ -226,6 +231,8 @@ cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub cp -r $acorbuild/acorconfigs/lxqt/* $acorbuild/build/config/includes.chroot/etc/skel/.config +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot diff --git a/Lxqt32/acorhooks/normal/0520-applications.hook.chroot b/Lxqt32/acorhooks/normal/0520-applications.hook.chroot index 67cf40c..76c96c6 100755 --- a/Lxqt32/acorhooks/normal/0520-applications.hook.chroot +++ b/Lxqt32/acorhooks/normal/0520-applications.hook.chroot @@ -22,7 +22,8 @@ for i in \ done # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Lxqt32/acorinstaller b/Lxqt32/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Lxqt32/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Lxqt32/build.sh b/Lxqt32/build.sh index 1e0e26d..cbeb02f 100755 --- a/Lxqt32/build.sh +++ b/Lxqt32/build.sh @@ -158,7 +158,7 @@ gnome-sudoku guvcview vlc xfburn -calamares-settings-acoros-32 +calamares-settings-debian calamares gdebi f2fs-tools @@ -206,6 +206,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/Desktop mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.config @@ -218,12 +220,17 @@ cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel cp $acorbuild/acorconfigs/.gtkrc-2.0 $acorbuild/build/config/includes.chroot/etc/skel +cp $acorbuild/acorinstaller/bootloader-config-32/* $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub cp -r $acorbuild/acorconfigs/lxqt/* $acorbuild/build/config/includes.chroot/etc/skel/.config +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Mate/acorhooks/normal/0520-applications.hook.chroot b/Mate/acorhooks/normal/0520-applications.hook.chroot index b9a8836..82206c1 100755 --- a/Mate/acorhooks/normal/0520-applications.hook.chroot +++ b/Mate/acorhooks/normal/0520-applications.hook.chroot @@ -9,7 +9,8 @@ apt --purge --yes autoremove vim vim-tiny gnome-system-monitor hv3 mpv murrine-themes konsole malcontent termit raspi-firmware systemsettings nvidia* # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Mate/acorinstaller b/Mate/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Mate/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Mate/build.sh b/Mate/build.sh index 52eb91d..87df9a4 100755 --- a/Mate/build.sh +++ b/Mate/build.sh @@ -81,20 +81,15 @@ gnome-packagekit python3-gi-cairo gvfs-backends samba -iso-flag-png network-manager network-manager-gnome bluez blueman gufw acoros-icons -orchis-gtk-theme -blue-papirus-icons -brown-papirus-icons -papirus-cyan-icons -papirus-dark-grey -papirus-icon-theme -gtk2-engines-aurora +teja-gtk-theme +tela-circle-icon-theme +tela-icon-theme gtk2-engines acoros-backgrounds gnome-themes-extra @@ -172,7 +167,7 @@ vlc brasero qt5-style-plugins qt5ct -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -220,6 +215,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/usr/local/bin mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/boot/grub # Copy Configs to the chroot @@ -229,11 +226,16 @@ cp $acorbuild/acorhooks/live/* $acorbuild/build/config/hooks/live cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Xfce/acorhooks/normal/0520-applications.hook.chroot b/Xfce/acorhooks/normal/0520-applications.hook.chroot index 3d33f45..c4d59c4 100755 --- a/Xfce/acorhooks/normal/0520-applications.hook.chroot +++ b/Xfce/acorhooks/normal/0520-applications.hook.chroot @@ -9,7 +9,8 @@ apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit raspi-firmware systemsettings nvidia* # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Xfce/acorinstaller b/Xfce/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Xfce/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Xfce/build.sh b/Xfce/build.sh index 489dc43..ef06e20 100755 --- a/Xfce/build.sh +++ b/Xfce/build.sh @@ -154,7 +154,7 @@ guvcview vlc qt5-style-plugins qt5ct -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -207,6 +207,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/Desktop mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.config @@ -218,12 +220,17 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel +cp $acorbuild/acorinstaller/bootloader-config $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives cp -r $acorbuild/acorcsv/* $acorbuild/build/config/includes.chroot/usr/share/distro-info cp -r $acorbuild/acorgrub/themes $acorbuild/build/config/includes.chroot/boot/grub cp -r $acorbuild/acorconfigs/xfce/* $acorbuild/build/config/includes.chroot/etc/skel/.config +cp -r $acorbuild/acorinstaller/calamares $acorbuild/build/config/includes.chroot/etc +cp -r $acorbuild/acorinstaller/pixmaps $acorbuild/build/config/includes.chroot/usr/share #symlinks chroot ln -s Debian.info $acorbuild/build/config/includes.chroot/usr/share/python-apt/templates/Acoros.info diff --git a/Xfce32/acorhooks/normal/0520-applications.hook.chroot b/Xfce32/acorhooks/normal/0520-applications.hook.chroot index 6ea93eb..e9b0ccc 100755 --- a/Xfce32/acorhooks/normal/0520-applications.hook.chroot +++ b/Xfce32/acorhooks/normal/0520-applications.hook.chroot @@ -9,7 +9,8 @@ apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit raspi-firmware systemsettings nvidia* # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/Xfce32/acorinstaller b/Xfce32/acorinstaller new file mode 120000 index 0000000..497b744 --- /dev/null +++ b/Xfce32/acorinstaller @@ -0,0 +1 @@ +../acorinstaller \ No newline at end of file diff --git a/Xfce32/build.sh b/Xfce32/build.sh index 2cbfff4..45b4f7a 100755 --- a/Xfce32/build.sh +++ b/Xfce32/build.sh @@ -154,7 +154,7 @@ guvcview vlc qt5-style-plugins qt5ct -calamares-settings-acoros +calamares-settings-debian calamares gdebi f2fs-tools @@ -204,6 +204,8 @@ mkdir -p $acorbuild/build/config/includes.chroot/etc/lightdm mkdir -p $acorbuild/build/config/includes.chroot/boot/grub mkdir -p $acorbuild/build/config/includes.chroot/etc/default mkdir -p $acorbuild/build/config/includes.chroot/boot/grub +mkdir -p $acorbuild/build/config/includes.chroot/usr/sbin +mkdir -p $acorbuild/build/config/includes.chroot/usr/share mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/Desktop mkdir -p $acorbuild/build/config/includes.chroot/etc/skel/.config @@ -215,6 +217,9 @@ cp $acorbuild/acorhooks/normal/* $acorbuild/build/config/hooks/normal cp $acorbuild/acorlightdm/* $acorbuild/build/config/includes.chroot/etc/lightdm cp $acorbuild/acorgrub/grub $acorbuild/build/config/includes.chroot/etc/default cp $acorbuild/acorconfigs/.face $acorbuild/build/config/includes.chroot/etc/skel +cp $acorbuild/acorinstaller/bootloader-config-32/* $acorbuild/build/config/includes.chroot/usr/sbin +cp $acorbuild/acorinstaller/add-calamares-desktop-icon $acorbuild/build/config/includes.chroot/usr/bin +cp $acorbuild/acorinstaller/sources-final $acorbuild/build/config/includes.chroot/usr/sbin cp -r $acorbuild/acorbootloaders/* $acorbuild/build/config/includes.binary cp -r $acorbuild/acorrepos/* $acorbuild/build/config/archives diff --git a/acorapplication/install-debian.desktop b/acorapplication/install-debian.desktop new file mode 100644 index 0000000..ce840dd --- /dev/null +++ b/acorapplication/install-debian.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Version=2.0 +Name=AcorOS 6.0 Install +GenericName=Calamares Installer +Exec=install-debian +Comment=Calamares — Installer for Debian Live +Keywords=calamares;system;install;debian;installer +Icon=install-debian +Terminal=false +Categories=Qt;System; +StartupWMClass=calamares +StartupNotify=True diff --git a/acorinstaller/add-calamares-desktop-icon b/acorinstaller/add-calamares-desktop-icon new file mode 100644 index 0000000..092343c --- /dev/null +++ b/acorinstaller/add-calamares-desktop-icon @@ -0,0 +1,28 @@ +#!/bin/sh +# Creates an "Install Debian" icon on the live session tested with: +# Xfce, LXDE, LXqt, Gnome, KDE, Mate, Cinnamon + +# We query xdg-user-dir because the Desktop directory has different +# names for different languages +DESKTOP=$(xdg-user-dir DESKTOP) + +# Create ~/Desktop just in case this runs before the xdg folder +# creation script. +mkdir -p $DESKTOP + +# Among the Debian desktop environments, LXDE is the only one +# that behaves completely different. +if [ -f /usr/bin/lxsession ]; then + echo "[Desktop Entry]" > $DESKTOP/install-debian.desktop + echo "Type=Link" >> $DESKTOP/install-debian.desktop + echo "Name=Install Debian" >> $DESKTOP/install-debian.desktop + echo "Icon=install-debian" >> $DESKTOP/install-debian.desktop + echo "URL=/usr/share/applications/install-debian.desktop" \ + >> $DESKTOP/install-debian.desktop +else + cp /usr/share/applications/install-debian.desktop $DESKTOP + # Xfce needs this executable otherwise it complains, everything + # else doesn't seem to care either way. + chmod +x $DESKTOP/install-debian.desktop + f=$DESKTOP/install-debian.desktop ; gio set $f metadata::xfce-exe-checksum "$(sha256sum $f | awk '{print $1}')" +fi diff --git a/acorinstaller/bootloader-config b/acorinstaller/bootloader-config new file mode 100755 index 0000000..fa06ccc --- /dev/null +++ b/acorinstaller/bootloader-config @@ -0,0 +1,27 @@ +#!/bin/bash + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +# Install luks utilities if needed. +# Also, set secure permissions for the initramfs if we're configuring +# full-disk-encryption. The initramfs is re-generated later in the +# installation process so we only set the permissions snippet without +# regenerating the initramfs right now: +if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then + echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions + chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils +fi + +echo "Running bootloader-config..." + +if [ -d /sys/firmware/efi/efivars ]; then + echo " * Installing grub-efi (uefi)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-amd64 +else + echo " * install grub... (bios)" + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc +fi + +# Re-enable os-prober: +sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub +chroot $CHROOT /usr/sbin/update-grub diff --git a/acorinstaller/bootloader-config-32/bootloader-config b/acorinstaller/bootloader-config-32/bootloader-config new file mode 100755 index 0000000..9da5861 --- /dev/null +++ b/acorinstaller/bootloader-config-32/bootloader-config @@ -0,0 +1,27 @@ +#!/bin/bash + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +# Install luks utilities if needed. +# Also, set secure permissions for the initramfs if we're configuring +# full-disk-encryption. The initramfs is re-generated later in the +# installation process so we only set the permissions snippet without +# regenerating the initramfs right now: +if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then + echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions + chroot $CHROOT apt-get -y install cryptsetup-initramfs cryptsetup keyutils +fi + +echo "Running bootloader-config..." + +if [ -d /sys/firmware/efi/efivars ]; then + echo " * Installing grub-efi (uefi)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 +else + echo " * install grub... (bios)" + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc +fi + +# Re-enable os-prober: +sed -i "s/#GRUB_DISABLE_OS_PROBER=false/# OS_PROBER re-enabled by Debian Calamares installation:\nGRUB_DISABLE_OS_PROBER=false/g" $CHROOT/etc/default/grub +chroot $CHROOT /usr/sbin/update-grub diff --git a/acorinstaller/calamares/branding/acoros/1.png b/acorinstaller/calamares/branding/acoros/1.png new file mode 100644 index 0000000..8807b03 Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/1.png differ diff --git a/acorinstaller/calamares/branding/acoros/2.png b/acorinstaller/calamares/branding/acoros/2.png new file mode 100644 index 0000000..1acf2c1 Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/2.png differ diff --git a/acorinstaller/calamares/branding/acoros/3.png b/acorinstaller/calamares/branding/acoros/3.png new file mode 100644 index 0000000..abffea0 Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/3.png differ diff --git a/acorinstaller/calamares/branding/acoros/4.png b/acorinstaller/calamares/branding/acoros/4.png new file mode 100644 index 0000000..72c3b05 Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/4.png differ diff --git a/acorinstaller/calamares/branding/acoros/5.png b/acorinstaller/calamares/branding/acoros/5.png new file mode 100644 index 0000000..879c7fa Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/5.png differ diff --git a/acorinstaller/calamares/branding/acoros/6.png b/acorinstaller/calamares/branding/acoros/6.png new file mode 100644 index 0000000..effd454 Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/6.png differ diff --git a/acorinstaller/calamares/branding/acoros/branding.desc b/acorinstaller/calamares/branding/acoros/branding.desc new file mode 100644 index 0000000..ca11e0c --- /dev/null +++ b/acorinstaller/calamares/branding/acoros/branding.desc @@ -0,0 +1,29 @@ +--- +componentName: acoros +welcomeStyleCalamares: true + +strings: + productName: AcorOS + shortProductName: AcorOS + version: 6.0 + shortVersion: 6.0 + versionedName: AcorOS + shortVersionedName: AcorOS 6.0 + bootloaderEntryName: debian + supportUrl: https://sourceforge.net/p/acor-os/discussion/ + + +images: + productLogo: "debian-logo.png" + productIcon: "debian-logo.png" + productWelcome: "languages.png" + +slideshow: "show.qml" + +style: + sidebarBackground: "#2c3133" + sidebarText: "#FFFFFF" + sidebarTextSelect: "#4d7079" + sidebarTextSelect: "#292F34" + +slideshowAPI: 2 diff --git a/acorinstaller/calamares/branding/acoros/debian-logo.png b/acorinstaller/calamares/branding/acoros/debian-logo.png new file mode 100644 index 0000000..7dac30a Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/debian-logo.png differ diff --git a/acorinstaller/calamares/branding/acoros/languages.png b/acorinstaller/calamares/branding/acoros/languages.png new file mode 100644 index 0000000..c6baa53 Binary files /dev/null and b/acorinstaller/calamares/branding/acoros/languages.png differ diff --git a/acorinstaller/calamares/branding/acoros/show.qml b/acorinstaller/calamares/branding/acoros/show.qml new file mode 100644 index 0000000..e183202 --- /dev/null +++ b/acorinstaller/calamares/branding/acoros/show.qml @@ -0,0 +1,175 @@ +/* === This file is part of Calamares - === + * + * Copyright 2015, Teo Mrnjavac + * + * Calamares is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Calamares is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Calamares. If not, see . + */ + +import QtQuick 2.0; +import calamares.slideshow 1.0; + +Presentation +{ + id: presentation + + Timer { + id: advanceTimer + interval: 15000 + running: false + repeat: true + onTriggered: presentation.goToNextSlide() + } + + Slide { + anchors.fill: parent + + Image { + id: background + source: "1.png" + anchors.fill: parent + + Text { + anchors.centerIn: parent + anchors.verticalCenterOffset: 0 + anchors.horizontalCenterOffset: -125 + font.pixelSize: parent.width *.015 + color: 'white' + text: qsTr(""+ + ""+ + ""+ + ""+ + "") + wrapMode: Text.WordWrap + width: 500 + horizontalAlignment: Text.AlignLeft + } + } + } + + Slide { + anchors.fill: parent + + Image { + id: background1 + source: "2.png" + anchors.fill: parent + + Text { + anchors.centerIn: parent + anchors.verticalCenterOffset: 0 + anchors.horizontalCenterOffset: 250 + font.pixelSize: parent.width *.015 + color: 'white' + text: qsTr(""+ + ""+ + ""+ + "") + wrapMode: Text.WordWrap + width: 450 + horizontalAlignment: Text.AlignLeft + } + } + } + + Slide { + anchors.fill: parent + + Image { + id: background2 + source: "3.png" + anchors.fill: parent + + Text { + anchors.centerIn: parent + anchors.verticalCenterOffset: 0 + anchors.horizontalCenterOffset: -100 + font.pixelSize: parent.width *.015 + color: 'white' + text: qsTr(""+ + ">") + wrapMode: Text.WordWrap + width: 450 + horizontalAlignment: Text.AlignLeft + } + } + } + + Slide { + anchors.fill: parent + + Image { + id: background3 + source: "4.png" + anchors.fill: parent + + Text { + anchors.centerIn: parent + anchors.verticalCenterOffset: 0 + anchors.horizontalCenterOffset: 250 + font.pixelSize: parent.width *.015 + color: 'white' + text: qsTr(""+ + ""+ + "") + wrapMode: Text.WordWrap + width: 450 + horizontalAlignment: Text.AlignLeft + } + } + } + + Slide { + anchors.fill: parent + + Image { + id: background4 + source: "5.png" + anchors.fill: parent + + Text { + anchors.centerIn: parent + anchors.verticalCenterOffset: 0 + anchors.horizontalCenterOffset: -200 + font.pixelSize: parent.width *.015 + color: 'white' + text: qsTr("") + wrapMode: Text.WordWrap + width: 450 + horizontalAlignment: Text.Center + } + } + } + + Slide { + anchors.fill: parent + + Image { + id: background5 + source: "6.png" + anchors.fill: parent + + Text { + anchors.horizontalCenter: background1.horizontalCenter + anchors.top: background1.bottom + text: qsTr("") + wrapMode: Text.WordWrap + width: 600 + horizontalAlignment: Text.Center + } + } + +} + + Component.onCompleted: advanceTimer.running = true +} diff --git a/acorinstaller/calamares/modules/bootloader.conf b/acorinstaller/calamares/modules/bootloader.conf new file mode 100644 index 0000000..b6d8448 --- /dev/null +++ b/acorinstaller/calamares/modules/bootloader.conf @@ -0,0 +1,54 @@ +# Bootloader configuration. The bootloader is installed to allow +# the system to start (and pick one of the installed operating +# systems to run). +--- +# Define which bootloader you want to use for EFI installations +# Possible options are 'grub', 'sb-shim' and 'systemd-boot'. +efiBootLoader: "grub" + +# systemd-boot configuration files settings, set kernel and initramfs file names +# and amount of time before default selection boots +kernel: "/vmlinuz-linux" +img: "/initramfs-linux.img" +fallback: "/initramfs-linux-fallback.img" +timeout: "10" + +# Optionally set the menu entry name and kernel name to use in systemd-boot. +# If not specified here, these settings will be taken from branding.desc. +# +# bootloaderEntryName: "Generic GNU/Linux" +# kernelLine: ", with Stable-Kernel" +# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)" + +# GRUB 2 binary names and boot directory +# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. +# These names are also used when using sb-shim, since that needs some +# GRUB functionality (notably grub-probe) to work. As needed, you may use +# complete paths like `/usr/bin/efibootmgr` for the executables. +# +grubInstall: "grub-install" +grubMkconfig: "grub-mkconfig" +grubCfg: "/boot/grub/grub.cfg" +grubProbe: "grub-probe" +efiBootMgr: "efibootmgr" + +# Optionally set the bootloader ID to use for EFI. This is passed to +# grub-install --bootloader-id. +# +# If not set here, the value from bootloaderEntryName from branding.desc +# is used, with problematic characters (space and slash) replaced. +# +# The ID is also used as a directory name within the EFI environment, +# and the bootloader is copied from /boot/efi/EFI// . When +# setting the option here, keep in mind that the name is sanitized +# (problematic characters, see above, are replaced). +# +# efiBootloaderId: "dirname" + +# Optionally install a copy of the GRUB EFI bootloader as the EFI +# fallback loader (either bootia32.efi or bootx64.efi depending on +# the system). This may be needed on certain systems (Intel DH87MC +# seems to be the only one). If you set this to false, take care +# to add another module to optionally install the fallback on those +# boards that need it. +installEFIFallback: false diff --git a/acorinstaller/calamares/modules/displaymanager.conf b/acorinstaller/calamares/modules/displaymanager.conf new file mode 100644 index 0000000..8f8e9c7 --- /dev/null +++ b/acorinstaller/calamares/modules/displaymanager.conf @@ -0,0 +1,28 @@ +# Configure one or more display managers (e.g. SDDM) +# with a "best effort" approach. +--- +#The DM module attempts to set up all the DMs found in this list, in that precise order. +#It also sets up autologin, if the feature is enabled in globalstorage. +#The displaymanagers list can also be set in globalstorage, and in that case it overrides anything set up here. +displaymanagers: + - slim + - sddm + - lightdm + - gdm + - mdm + - lxdm + - kdm + +#Enable the following settings to force a desktop environment in your displaymanager configuration file: +#defaultDesktopEnvironment: +# executable: "startkde" +# desktopFile: "plasma" + +#If true, try to ensure that the user, group, /var directory etc. for the +#display manager are set up correctly. This is normally done by the distribution +#packages, and best left to them. Therefore, it is disabled by default. +basicSetup: false + +#If true, setup autologin for openSUSE. This only makes sense on openSUSE +#derivatives or other systems where /etc/sysconfig/displaymanager exists. +sysconfigSetup: false diff --git a/acorinstaller/calamares/modules/finished.conf b/acorinstaller/calamares/modules/finished.conf new file mode 100644 index 0000000..188edf0 --- /dev/null +++ b/acorinstaller/calamares/modules/finished.conf @@ -0,0 +1,4 @@ +--- +restartNowEnabled: true +restartNowChecked: true +restartNowCommand: "systemctl -i reboot" diff --git a/acorinstaller/calamares/modules/fstab.conf b/acorinstaller/calamares/modules/fstab.conf new file mode 100644 index 0000000..2990717 --- /dev/null +++ b/acorinstaller/calamares/modules/fstab.conf @@ -0,0 +1,11 @@ +--- +mountOptions: + default: defaults,noatime + btrfs: defaults,noatime,space_cache,autodefrag +ssdExtraMountOptions: + ext4: discard + jfs: discard + xfs: discard + swap: discard + btrfs: discard,compress=lzo +crypttabOptions: luks,keyscript=/bin/cat diff --git a/acorinstaller/calamares/modules/locale.conf b/acorinstaller/calamares/modules/locale.conf new file mode 100644 index 0000000..f5e9096 --- /dev/null +++ b/acorinstaller/calamares/modules/locale.conf @@ -0,0 +1,6 @@ +localeGenPath: "/etc/locale.gen" +geoip: + style: "json" + url: "https://ipapi.co/json" + selector: "timezone" + diff --git a/acorinstaller/calamares/modules/luksopenswaphookcfg.conf b/acorinstaller/calamares/modules/luksopenswaphookcfg.conf new file mode 100644 index 0000000..f5610cd --- /dev/null +++ b/acorinstaller/calamares/modules/luksopenswaphookcfg.conf @@ -0,0 +1,4 @@ +# Writes an openswap configuration with LUKS settings to the given path +--- +# Path of the configuration file to write (in the target system) +configFilePath: /etc/openswap.conf diff --git a/acorinstaller/calamares/modules/machineid.conf b/acorinstaller/calamares/modules/machineid.conf new file mode 100644 index 0000000..fa3527f --- /dev/null +++ b/acorinstaller/calamares/modules/machineid.conf @@ -0,0 +1,15 @@ +--- +# Whether to create /etc/machine-id for systemd. +systemd: true +# Whether to create /var/lib/dbus/machine-id for D-Bus. +dbus: true +# Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id +# (ignored if dbus is false, or if there is no /etc/machine-id to point to). +symlink: true +# Whether to copy entropy from the host +entropy-copy: true +# Which files to write (paths in the target) +entropy-files: + - /var/lib/urandom/random-seed + - /var/lib/systemd/random-seed + diff --git a/acorinstaller/calamares/modules/mount.conf b/acorinstaller/calamares/modules/mount.conf new file mode 100644 index 0000000..bb28eed --- /dev/null +++ b/acorinstaller/calamares/modules/mount.conf @@ -0,0 +1,36 @@ +# Mount filesystems in the target (generally, before treating the +# target as a usable chroot / "live" system). Filesystems are +# automatically mounted from the partitioning module. Filesystems +# listed here are **extra**. The filesystems listed in *extraMounts* +# are mounted in all target systems. The filesystems listed in +# *extraMountsEfi* are mounted in the target system **only** if +# the host machine uses UEFI. +--- +# Extra filesystems to mount. The key's value is a list of entries; each +# entry has four keys: +# - device The device node to mount +# - fs The filesystem type to use +# - mountPoint Where to mount the filesystem +# - options (optional) Extra options to pass to mount(8) +# +extraMounts: + - device: proc + fs: proc + mountPoint: /proc + - device: sys + fs: sysfs + mountPoint: /sys + - device: /dev + mountPoint: /dev + options: bind + - device: tmpfs + fs: tmpfs + mountPoint: /run + - device: /run/udev + mountPoint: /run/udev + options: bind + +extraMountsEfi: + - device: efivarfs + fs: efivarfs + mountPoint: /sys/firmware/efi/efivars diff --git a/acorinstaller/calamares/modules/packages.conf b/acorinstaller/calamares/modules/packages.conf new file mode 100644 index 0000000..d41c24d --- /dev/null +++ b/acorinstaller/calamares/modules/packages.conf @@ -0,0 +1,15 @@ +backend: apt + +operations: + - remove: + - 'live-boot' + - 'live-boot-doc' + - 'live-config' + - 'live-config-doc' + - 'live-config-systemd' + - 'live-config-systemd' + - 'live-tools' + - 'live-task-localisation' + - 'live-task-recommended' + - 'calamares-settings-debian' + - 'calamares' diff --git a/acorinstaller/calamares/modules/partition.conf b/acorinstaller/calamares/modules/partition.conf new file mode 100644 index 0000000..e4ca53e --- /dev/null +++ b/acorinstaller/calamares/modules/partition.conf @@ -0,0 +1,13 @@ +efiSystemPartition: "/boot/efi" +userSwapChoices: + - none # Create no swap, use no swap + - small # Up to 4GB + - suspend # At least main memory size + - file # To swap file instead of partition +alwaysShowPartitionLabels: true +initialPartitioningChoice: erase +initialSwapChoice: none +drawNestedPartitions: true +defaultFileSystemType: "ext4" +availableFileSystemTypes: ["ext4","btrfs", "f2fs","xfs"] + diff --git a/acorinstaller/calamares/modules/unpackfs.conf b/acorinstaller/calamares/modules/unpackfs.conf new file mode 100644 index 0000000..833a68b --- /dev/null +++ b/acorinstaller/calamares/modules/unpackfs.conf @@ -0,0 +1,5 @@ +--- +unpack: + - source: "/run/live/medium/live/filesystem.squashfs" + sourcefs: "squashfs" + destination: "" diff --git a/acorinstaller/calamares/modules/users.conf b/acorinstaller/calamares/modules/users.conf new file mode 100644 index 0000000..0f2082a --- /dev/null +++ b/acorinstaller/calamares/modules/users.conf @@ -0,0 +1,17 @@ +--- +userGroup: users +defaultGroups: + - cdrom + - floppy + - sudo + - audio + - dip + - video + - plugdev + - netdev + - lpadmin + - scanner + - bluetooth +autologinGroup: autologin +sudoersGroup: sudo +setRootPassword: false diff --git a/acorinstaller/calamares/modules/welcome.conf b/acorinstaller/calamares/modules/welcome.conf new file mode 100644 index 0000000..dcc76b2 --- /dev/null +++ b/acorinstaller/calamares/modules/welcome.conf @@ -0,0 +1,17 @@ +--- +showSupportUrl: true +showKnownIssuesUrl: true +showReleaseNotesUrl: true + +requirements: + requiredStorage: 10 + requiredRam: 1.0 + check: + - storage + - ram + - power + - root + required: + - storage + - ram + - root diff --git a/acorinstaller/calamares/settings.conf b/acorinstaller/calamares/settings.conf new file mode 100644 index 0000000..a310f55 --- /dev/null +++ b/acorinstaller/calamares/settings.conf @@ -0,0 +1,127 @@ +# Configuration file for Calamares +# Syntax is YAML 1.2 +--- + +# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules +modules-search: [ local, /usr/lib/calamares/modules ] + +# If this is set to true, Calamares refers to itself as a "setup program" +# rather than an "installer". Defaults to the value of dont-chroot, but +# Calamares will complain if this is not explicitly set. +oem-setup: false + +# If this is set to true, the "Cancel" button will be disabled entirely. +# The button is also hidden from view. +# +# This can be useful if when e.g. Calamares is used as a post-install +# configuration tool and you require the user to go through all the +# configuration steps. +# +# Default is false, but Calamares will complain if this is not explicitly set. +# +# YAML: boolean. +disable-cancel: false + +# If this is set to true, the "Cancel" button will be disabled once +# you start the 'Installation', meaning there won't be a way to cancel +# the Installation until it has finished or installation has failed. +# +# Default is false, but Calamares will complain if this is not explicitly set. +# +# YAML: boolean. +disable-cancel-during-exec: false + +# If this is set to true, then once the end of the sequence has +# been reached, the quit (done) button is clicked automatically +# and Calamares will close. Default is false: the user will see +# that the end of installation has been reached, and that things are ok. +# +# +quit-at-end: false + +sequence: +# Phase 1 - prepare. +# View modules are shown as UI pages, jobs from job modules +# are executed immediately in the background. +# Jobs should be executed sparingly (if at all) in this phase. +- show: + - welcome + - locale + - keyboard + - partition + - users + - summary + +# Phase 2 - install. +# View modules are not shown. Only the view modules shown +# in the previous phase are allowed, their names should be +# added here as placeholders to specify the order in which +# view module jobs should be enqueued. Job modules are +# also allowed. +- exec: + - partition + - mount + - unpackfs + - dpkg-unsafe-io + - sources-media + - machineid + - fstab + - locale + - keyboard + - localecfg + - users + - displaymanager + - networkcfg + - hwclock + - services-systemd + - bootloader-config + - grubcfg + - bootloader + - packages + - luksbootkeyfile + - plymouthcfg + - initramfscfg + - initramfs + - dpkg-unsafe-io-undo + - sources-media-unmount + - sources-final + - umount + +# Phase 3 - postinstall. +# View modules are shown as UI pages, jobs from job modules are +# executed immediately in the background. +# Jobs should be executed sparingly (if at all) in this phase. +- show: + - finished + +# A branding component is a directory, either in +# SHARE/calamares/branding or in /etc/calamares/branding +# (the latter takes precedence). The directory must contain a +# YAML file branding.desc which may reference additional resources +# (such as images) as paths relative to the current directory. +# Only the name of the branding component (directory) should be +# specified here, Calamares then takes care of finding it and +# loading the contents. +branding: acoros + +# If this is set to true, Calamares will show an "Are you sure?" prompt right +# before each execution phase, i.e. at points of no return. If this is set to +# false, no prompt is shown. Default is false. +# +# YAML: boolean. +prompt-install: false + +# If this is set to true, Calamares will execute all target environment +# commands in the current environment, without chroot. This setting should +# only be used when setting up Calamares as a post-install configuration tool, +# as opposed to a full operating system installer. +# +# Some official Calamares modules are not expected to function with this +# setting. (e.g. partitioning seems like a bad idea, since that is expected to +# have been done already) +# +# Default is false (for a normal installer). +# +# YAML: boolean. +dont-chroot: false + diff --git a/acorinstaller/pixmaps/install-debian.png b/acorinstaller/pixmaps/install-debian.png new file mode 100644 index 0000000..7dac30a Binary files /dev/null and b/acorinstaller/pixmaps/install-debian.png differ diff --git a/acorinstaller/sources-final b/acorinstaller/sources-final new file mode 100755 index 0000000..6c3f0e4 --- /dev/null +++ b/acorinstaller/sources-final @@ -0,0 +1,25 @@ +#!/bin/sh +# +# Writes the final sources.list file +# + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") +RELEASE="bookworm" + +cat << EOF > $CHROOT/etc/apt/sources.list +# See https://wiki.debian.org/SourcesList for more information. +deb http://deb.debian.org/debian $RELEASE main contrib non-free non-free-firmware +deb-src http://deb.debian.org/debian $RELEASE main contrib non-free non-free-firmware + +deb http://deb.debian.org/debian $RELEASE-updates main contrib non-free non-free-firmware +deb-src http://deb.debian.org/debian $RELEASE-updates main contrib non-free non-free-firmware + +deb http://security.debian.org/debian-security/ $RELEASE-security main contrib non-free non-free-firmware +deb-src http://security.debian.org/debian-security/ $RELEASE-security main contrib non-free non-free-firmware + +# Backports allow you to install newer versions of software made available for this release +deb http://deb.debian.org/debian $RELEASE-backports main contrib non-free non-free-firmware +deb-src http://deb.debian.org/debian $RELEASE-backports main contrib non-free non-free-firmware +EOF + +exit 0