diff --git a/applications/install-debian.desktop b/applications/install-debian.desktop deleted file mode 100755 index d7b8adcd..00000000 --- a/applications/install-debian.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Install My-distro -GenericName=Install My-distro -Exec=install-debian -Comment=Calamares — Installer for My-distro -Keywords=calamares;system;install;debian;installer -Icon=install-debian -Terminal=false -Categories=Qt;System; -StartupWMClass=calamares -StartupNotify=True diff --git a/applications/ubiquity.desktop b/applications/ubiquity.desktop new file mode 100755 index 00000000..942f38ad --- /dev/null +++ b/applications/ubiquity.desktop @@ -0,0 +1,133 @@ +[Desktop Entry] +Type=Application +Version=1.0 +# Do not translate the word "My-distro". It is used as a marker by casper. +Name=Install My-distro +Name[am]=የተለቀቀውን መግጠሚያ +Name[ar]=ثبّت My-distro +Name[ast]=Instalar My-distro +Name[be]=Усталяваць My-distro +Name[bg]=Инсталиране My-distro +Name[bn]=My-distro ইনস্টল করুন +Name[bs]=Instaliraj izdanje +Name[ca]=Instal·la la versió My-distro +Name[cs]=Nainstalovat My-distro +Name[da]=Installér My-distro +Name[de]=My-distro installieren +Name[el]=Εγκατάσταση My-distro +Name[eo]=Instali My-distro +Name[es]=Instalar My-distro +Name[et]=Paigalda My-distro +Name[eu]=Instalatu My-distro +Name[fi]=Asenna My-distro +Name[fr]=Installer My-distro +Name[ga]=Suiteáil My-distro +Name[gl]=Instalar My-distro +Name[gu]=રિલીઝ નું સ્થાપન કરો. +Name[he]=התקנת My-distro +Name[hi]=My-distro को संस्थापित करें। +Name[hr]=Instaliraj My-distro +Name[hu]=My-distro telepítése +Name[id]=Pasang My-distro +Name[it]=Installa My-distro +Name[ja]=My-distro のインストール +Name[ka]=My-distro-ის დაყენება +Name[kk]=My-distro орнату +Name[km]=ដំឡើង My-distro +Name[ko]=My-distro 설치 +Name[ku]=My-distro saz bike +Name[lt]=Įdiegti My-distro į kompiuterį +Name[lv]=Instalēt My-distro +Name[mk]=Инсталирај My-distro +Name[ml]=My-distro സജ്ജമാക്കുക +Name[mr]=स्थापित My-distro +Name[ne]=My-distro लाई स्थापन गर्नुहोस् +Name[nl]=My-distro installeren +Name[pa]=My-distro ਇੰਸਟਾਲ ਕਰੋ +Name[pl]=Zainstaluj My-distro +Name[pt]=Instalar My-distro +Name[pt_BR]=Instalar o My-distro +Name[ro]=Instalare My-distro +Name[ru]=Установить My-distro +Name[sk]=Inštalovať My-distro +Name[sl]=Namesti My-distro +Name[sq]=Instalo My-distro +Name[sr]=Инсталирајте My-distro +Name[sv]=Installera My-distro +Name[ta]=My-distro என்பதை நிறுவு +Name[th]=ติดตั้ง My-distro +Name[tl]=Iluklok ang My-distro +Name[tr]=My-distro Kurulumu +Name[uk]=Встановити My-distro +Name[vi]=Cài đặt My-distro +Name[zh_CN]=安装 My-distro +Name[zh_TW]=安裝 My-distro +Comment=Install this system permanently to your hard disk +Comment[am]=ይኼን ሲስተም ሀርድ ዲስክዎ ላይ በቋሚነት ይጫኑት +Comment[ar]=ثبّت هذا النظام على القرص الصلب +Comment[ast]=Instalar permanentemente esti sistema nel to discu duru +Comment[be]=Усталяваць гэтую сістэму на ваш цвёрды дыск +Comment[bg]=Инсталиране Ubuntu трайно на твърдия диск +Comment[bn]=এই সিস্টেমটি আপনার হার্ডডিস্কে স্থায়ীভাবে ইনস্টল করুন। +Comment[bs]=Instaliraj ovaj sistem trajno na tvrdi disk +Comment[ca]=Instal·la aquest sistema permanentment al disc dur +Comment[cs]=Nainstalovat tento systém natrvalo na váš disk +Comment[da]=Installér systemet permanent på din harddisk +Comment[de]=Dieses System dauerhaft auf der Festplatte installieren +Comment[el]=Εγκαταστήστε μόνιμα το σύστημα στο σκληρό δίσκο +Comment[eo]=Instali ĉi tiun sistemon daŭre en via disko +Comment[es]=Instalar permanentemente este sistema en su disco duro +Comment[et]=Paigalda see süsteem jäädavalt oma kõvakettale +Comment[eu]=Sistema hau betiko instalatu disko gogorrean +Comment[fi]=Asenna tämä järjestelmä pysyvästi kiintolevyllesi +Comment[fr]=Installer ce système de façon permanente sur votre disque dur +Comment[ga]=Suiteáil an córas seo go buan ar do chruadhiosca +Comment[gl]=Instalar o sistema de xeito permanente no disco ríxido +Comment[gu]=આ સિસ્ટમ તમારી હાર્ડ ડિસ્ક પર હંમેશ માટે સ્થાપિત કરો +Comment[he]=התקנת המערכת באופן קבוע על הכונן הקשיח +Comment[hi]=इस तंत्र को आपके हार्ड डिस्क में स्थायी रूप से संस्थापित करें +Comment[hr]=Trajno instaliraj sustav na čvrsti disk +Comment[hu]=A rendszer telepítése merevlemezre +Comment[id]=Memasang sistem ini secara permanen pada diska Anda +Comment[it]=Installa questo sistema in modo permanente sul disco rigido +Comment[ja]=このシステムをハードディスクにインストールします +Comment[ka]=მოცემული სისტემის მყარ დისკზე ჩაყენება +Comment[kk]=Жүйені қатқыл дискіңізге тұрақты орнату +Comment[km]=ដំឡើង​ប្រព័ន្ធ​នេះ​ជា​អចិន្ត្រៃយ៍​ទៅ​កាន់​ថាស​រឹង​របស់​អ្នក +Comment[ko]=이 시스템을 하드 디스크에 설치합니다. +Comment[ku]=Sîstemê di hard dîskê xwe de saz bike +Comment[lt]=Įdiegti Linux operacinę sistemą į kompiuterio (vidinį) diską ar kitą laikmeną +Comment[lv]=Instalēt šo sistēmu cietajā diskā +Comment[mk]=Инсталирајте го системот трајно на Вашиот тврд диск +Comment[ml]=സ്ഥിരമായി ഹാര്‍ഡ് ഡിസ്കിലേക്ക് ഇന്‍സ്റ്റാള്‍ ചെയ്യുക +Comment[mr]=ही प्रणाली कायमची तुमच्या हार्ड डिस्कवर स्थापित करा +Comment[ne]=यो प्रणाली तपाईको हार्ड डिस्कमा थाई रुपमा प्रतिस्थापन गर्नुहोस् +Comment[nl]=Dit systeem definitief op uw harde schijf installeren +Comment[pa]=ਇਹ ਸਿਸਟਮ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਆਪਣੀ ਹਾਰਡ ਡਿਸਕ ਉੱਤੇ ਇੰਸਟਾਲ ਕਰੋ +Comment[pl]=Zainstaluj system na dysku twardym +Comment[pt]=Instalar este sistema permanentemente no seu disco rígido +Comment[pt_BR]=Instalar este sistema de maneira permanente no seu disco rígido +Comment[ro]=Instalați permanent acest sistem pe discul calculatorului +Comment[ru]=Установить эту систему на жёсткий диск +Comment[sk]=Nainštalovať systém natrvalo na pevný disk +Comment[sl]=Trajno namesti sistem na trdi disk +Comment[sq]=Instalo këtë sistem përgjithmonë në Hard Disk +Comment[sr]=Инсталирајте овај систем трајно на ваш чврсти диск +Comment[sv]=Installera detta system permanent på din hårddisk +Comment[ta]=இந்த நிலையை நிரந்தரமாக தங்களது கணினியில் நிறுவுக +Comment[th]=ติดตั้งระบบนี้อย่างถาวรลงบนฮาร์ดดิสก์ของคุณ +Comment[tl]=Iluklok ng permanente ang systema sa iyong hard disk +Comment[tr]=Bu sistemi sabit diskinize kalıcı olarak kurun +Comment[uk]=Встановити цю систему на жорсткий диск +Comment[vi]=Cài hệ thống vào đĩa cứng +Comment[zh_CN]=将这个系统永久安装在您的硬盘上 +Comment[zh_TW]=將此系統安裝到您的硬碟中 +Keywords=ubiquity; +#use sh because pkexec is broken under xfce/lxce http://pad.lv/1193526 +Exec=sudo --preserve-env=DBUS_SESSION_BUS_ADDRESS,XDG_DATA_DIRS,XDG_RUNTIME_DIR sh -c 'ubiquity gtk_ui' +Icon=install-debian +Terminal=false +Categories=GTK;System;Settings; +NotShowIn=KDE; +#X-Ubuntu-Gettext-Domain=ubiquity-desktop +X-Ayatana-Appmenu-Show-Stubs=False diff --git a/build.sh b/build.sh index d076a21a..99555522 100755 --- a/build.sh +++ b/build.sh @@ -188,11 +188,19 @@ ffmpegthumbnailer linux-firmware xterm grub-pc -calamares -calamares-settings-debian +gvpv " > $build/build/config/package-lists/packages.list.chroot +# Install software +echo "# Installer packges to install the system. +ubiquity +ubiquity-frontend-gtk +ubiquity-slideshow-xubuntu +ubiquity-casper + +" > $build/build/config/package-lists/installer.list.chroot + # Packages to be stored in /pool but not installed in the OS . echo "# These packages are available to the installer, for offline use. @@ -216,8 +224,9 @@ shim-signed " > $build/build/config/package-lists/installer.list.binary + + # Setup the chroot structure -mkdir -p $build/build/config/archives mkdir -p $build/build/config/includes.binary mkdir -p $build/build/config/hooks/live mkdir -p $build/build/config/hooks/normal @@ -229,14 +238,10 @@ mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds mkdir -p $build/build/config/includes.chroot/usr/share/icons mkdir -p $build/build/config/includes.chroot/usr/share/themes mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d -mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins -mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps mkdir -p $build/build/config/includes.chroot/usr/share/plymouth -mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop -mkdir -p $build/build/config/includes.chroot/etc/calamares mkdir -p $build/build/config/includes.chroot/etc/default # Add ubuntu gpg to pool in the iso @@ -250,10 +255,8 @@ cp $build/applications/* $build/build/config/includes.chroot/usr/share/applicati cp $build/hooks/live/* $build/build/config/hooks/live cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps -cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/* $build/build/config/includes.chroot/etc/default -cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm cp -r $build/bootloaders/* $build/build/config/bootloaders cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds diff --git a/calamares/branding/my-distro/1.png b/calamares/branding/my-distro/1.png deleted file mode 100644 index c1bb4f94..00000000 Binary files a/calamares/branding/my-distro/1.png and /dev/null differ diff --git a/calamares/branding/my-distro/2.png b/calamares/branding/my-distro/2.png deleted file mode 100644 index f882def0..00000000 Binary files a/calamares/branding/my-distro/2.png and /dev/null differ diff --git a/calamares/branding/my-distro/3.png b/calamares/branding/my-distro/3.png deleted file mode 100644 index 50f0afe1..00000000 Binary files a/calamares/branding/my-distro/3.png and /dev/null differ diff --git a/calamares/branding/my-distro/4.png b/calamares/branding/my-distro/4.png deleted file mode 100644 index 0eb7c7e7..00000000 Binary files a/calamares/branding/my-distro/4.png and /dev/null differ diff --git a/calamares/branding/my-distro/5.png b/calamares/branding/my-distro/5.png deleted file mode 100644 index b4cdc7f0..00000000 Binary files a/calamares/branding/my-distro/5.png and /dev/null differ diff --git a/calamares/branding/my-distro/6.png b/calamares/branding/my-distro/6.png deleted file mode 100644 index f1ed9527..00000000 Binary files a/calamares/branding/my-distro/6.png and /dev/null differ diff --git a/calamares/branding/my-distro/branding.desc b/calamares/branding/my-distro/branding.desc deleted file mode 100644 index 7a053c75..00000000 --- a/calamares/branding/my-distro/branding.desc +++ /dev/null @@ -1,29 +0,0 @@ ---- -componentName: my-distro -welcomeStyleCalamares: true - -strings: - productName: My-distro GNU/Linux - shortProductName: My-distro GNU/Linux - version: 1.0 - shortVersion: 1.0 - versionedName: My-distro GNU/Linux - shortVersionedName: My-distro GNU/Linux 1.0 - bootloaderEntryName: debian - - - -images: - productLogo: "debian-logo.png" - productIcon: "debian-logo.png" - productWelcome: "languages.png" - -slideshow: "show.qml" - -style: - sidebarBackground: "#303030" - sidebarText: "#FFFFFF" - sidebarTextSelect: "#4d7079" - sidebarTextSelect: "#292F34" - -slideshowAPI: 2 diff --git a/calamares/branding/my-distro/debian-logo.png b/calamares/branding/my-distro/debian-logo.png deleted file mode 100644 index cee14198..00000000 Binary files a/calamares/branding/my-distro/debian-logo.png and /dev/null differ diff --git a/calamares/branding/my-distro/languages.png b/calamares/branding/my-distro/languages.png deleted file mode 100644 index 5119ab79..00000000 Binary files a/calamares/branding/my-distro/languages.png and /dev/null differ diff --git a/calamares/branding/my-distro/show.qml b/calamares/branding/my-distro/show.qml deleted file mode 100644 index 6752f346..00000000 --- a/calamares/branding/my-distro/show.qml +++ /dev/null @@ -1,177 +0,0 @@ -/* === 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.centerIn: parent - anchors.verticalCenterOffset: 0 - anchors.horizontalCenterOffset: 250 - font.pixelSize: parent.width *.015 - color: 'white' - text: qsTr("") - wrapMode: Text.WordWrap - width: 450 - horizontalAlignment: Text.Center - } - } - } - - Component.onCompleted: advanceTimer.running = true -} diff --git a/calamares/modules/before_bootloader_context.conf b/calamares/modules/before_bootloader_context.conf deleted file mode 100644 index ee8daebc..00000000 --- a/calamares/modules/before_bootloader_context.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Make sure the correct bootloader package is installed for EFI. -# Also pull in shim so secureboot has a chance at working. -# Because of edge cases, we ignore BIOS, and do the same -# procedure for all EFI types. ---- -firmwareType: - bios: "-/bin/true" - "*": - - command: apt-cdrom -d=/run/live/medium/ add - timeout: 10 - - command: sed -i '/deb http/d' /etc/apt/sources.list - timeout: 10 - - command: apt-get update - timeout: 120 - - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict grub-efi-$(if grep -q 64 /sys/firmware/efi/fw_platform_size; then echo amd64-signed; else echo ia32; fi) - timeout: 300 - - command: apt install -y --no-upgrade -o Acquire::gpgv::Options::=--ignore-time-conflict shim-signed - timeout: 300 diff --git a/calamares/modules/bootloader.conf b/calamares/modules/bootloader.conf deleted file mode 100644 index c6d66e52..00000000 --- a/calamares/modules/bootloader.conf +++ /dev/null @@ -1,54 +0,0 @@ -# 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: "ubuntu" - -# 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/calamares/modules/displaymanager.conf b/calamares/modules/displaymanager.conf deleted file mode 100644 index 8f8e9c70..00000000 --- a/calamares/modules/displaymanager.conf +++ /dev/null @@ -1,28 +0,0 @@ -# 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/calamares/modules/finished.conf b/calamares/modules/finished.conf deleted file mode 100644 index 188edf09..00000000 --- a/calamares/modules/finished.conf +++ /dev/null @@ -1,4 +0,0 @@ ---- -restartNowEnabled: true -restartNowChecked: true -restartNowCommand: "systemctl -i reboot" diff --git a/calamares/modules/fstab.conf b/calamares/modules/fstab.conf deleted file mode 100644 index 29907170..00000000 --- a/calamares/modules/fstab.conf +++ /dev/null @@ -1,11 +0,0 @@ ---- -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/calamares/modules/locale.conf b/calamares/modules/locale.conf deleted file mode 100644 index f5e9096b..00000000 --- a/calamares/modules/locale.conf +++ /dev/null @@ -1,6 +0,0 @@ -localeGenPath: "/etc/locale.gen" -geoip: - style: "json" - url: "https://ipapi.co/json" - selector: "timezone" - diff --git a/calamares/modules/luksopenswaphookcfg.conf b/calamares/modules/luksopenswaphookcfg.conf deleted file mode 100644 index f5610cd7..00000000 --- a/calamares/modules/luksopenswaphookcfg.conf +++ /dev/null @@ -1,4 +0,0 @@ -# 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/calamares/modules/machineid.conf b/calamares/modules/machineid.conf deleted file mode 100644 index fa3527fc..00000000 --- a/calamares/modules/machineid.conf +++ /dev/null @@ -1,15 +0,0 @@ ---- -# 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/calamares/modules/mount.conf b/calamares/modules/mount.conf deleted file mode 100644 index bb28eed6..00000000 --- a/calamares/modules/mount.conf +++ /dev/null @@ -1,36 +0,0 @@ -# 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/calamares/modules/packages.conf b/calamares/modules/packages.conf deleted file mode 100644 index f2ec37ba..00000000 --- a/calamares/modules/packages.conf +++ /dev/null @@ -1,15 +0,0 @@ -update_db: true -backend: apt -operations: - - remove: - - "^live-*" - - calamares-settings-debian - - calamares - - hunspell-en-us - - zram-config - - cifs-utils - - try_install: - - language-pack-$LOCALE - - hunspell-$LOCALE - - libreoffice-help-$LOCALE - - libreoffice-l10n-$LOCALE diff --git a/calamares/modules/partition.conf b/calamares/modules/partition.conf deleted file mode 100644 index a0423714..00000000 --- a/calamares/modules/partition.conf +++ /dev/null @@ -1,12 +0,0 @@ -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 -defaultFileSystemType: "ext4" -availableFileSystemTypes: ["ext4","btrfs", "f2fs","xfs"] - diff --git a/calamares/modules/shellprocess_add386arch.conf b/calamares/modules/shellprocess_add386arch.conf deleted file mode 100644 index 3d8e2fac..00000000 --- a/calamares/modules/shellprocess_add386arch.conf +++ /dev/null @@ -1,5 +0,0 @@ ---- -dontChroot: false -timeout: 30 -script: - - command: "/usr/bin/dpkg --add-architecture i386" diff --git a/calamares/modules/unpackfs.conf b/calamares/modules/unpackfs.conf deleted file mode 100644 index 833a68bb..00000000 --- a/calamares/modules/unpackfs.conf +++ /dev/null @@ -1,5 +0,0 @@ ---- -unpack: - - source: "/run/live/medium/live/filesystem.squashfs" - sourcefs: "squashfs" - destination: "" diff --git a/calamares/modules/users.conf b/calamares/modules/users.conf deleted file mode 100644 index a0ba0821..00000000 --- a/calamares/modules/users.conf +++ /dev/null @@ -1,18 +0,0 @@ ---- -userGroup: users -defaultGroups: - - cdrom - - floppy - - sudo - - audio - - dip - - video - - plugdev - - netdev - - lpadmin - - scanner - - bluetooth - - sambashare -autologinGroup: autologin -sudoersGroup: sudo -setRootPassword: true diff --git a/calamares/modules/welcome.conf b/calamares/modules/welcome.conf deleted file mode 100644 index be58da0f..00000000 --- a/calamares/modules/welcome.conf +++ /dev/null @@ -1,17 +0,0 @@ ---- -showSupportUrl: false -showKnownIssuesUrl: false -showReleaseNotesUrl: false - -requirements: - requiredStorage: 10 - requiredRam: 1.0 - check: - - storage - - ram - - power - - root - required: - - storage - - ram - - root diff --git a/calamares/settings.conf b/calamares/settings.conf deleted file mode 100644 index d091e2dc..00000000 --- a/calamares/settings.conf +++ /dev/null @@ -1,135 +0,0 @@ -# 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 ] - -instances: -- id: before_bootloader - module: contextualprocess - config: before_bootloader_context.conf -- id: add386arch - module: shellprocess - config: shellprocess_add386arch.conf - -# 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 - - sources-media - - machineid - - fstab - - locale - - keyboard - - localecfg - - users - - displaymanager - - networkcfg - - hwclock - - services-systemd - - bootloader-config - - grubcfg - - contextualprocess@before_bootloader - - bootloader - - shellprocess@add386arch - - packages - - luksbootkeyfile - - plymouthcfg - - initramfscfg - - initramfs - - 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: my-distro - -# 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/configs/skel/.config/xfce4/panel/whiskermenu-7.rc b/configs/skel/.config/xfce4/panel/whiskermenu-7.rc index a1554570..97e52753 100644 --- a/configs/skel/.config/xfce4/panel/whiskermenu-7.rc +++ b/configs/skel/.config/xfce4/panel/whiskermenu-7.rc @@ -1,4 +1,4 @@ -favorites=xfce4-web-browser.desktop,xfce4-mail-reader.desktop,xfce4-file-manager.desktop,xfce4-terminal-emulator +favorites=xfce4-web-browser.desktop,xfce4-mail-reader.desktop,xfce4-file-manager.desktop,xfce4-terminal-emulator.desktop recent= button-title=My-distro button-icon=debian-logo diff --git a/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml b/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml index 8cc0da77..c3b514d9 100644 --- a/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml +++ b/configs/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml @@ -6,7 +6,7 @@ - + @@ -25,7 +25,7 @@ - + diff --git a/hooks/normal/0520-applications.hook.chroot b/hooks/normal/0520-applications.hook.chroot index 442455f7..e7a9ce70 100755 --- a/hooks/normal/0520-applications.hook.chroot +++ b/hooks/normal/0520-applications.hook.chroot @@ -16,3 +16,6 @@ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flat #fix network-manager install dpkg-reconfigure network-manager +#add-architecture i386 +dpkg --add-architecture i386 + diff --git a/hooks/normal/0550-remove-installer-recommends.hook.chroot b/hooks/normal/0550-remove-installer-recommends.hook.chroot new file mode 100755 index 00000000..0d5a7ad4 --- /dev/null +++ b/hooks/normal/0550-remove-installer-recommends.hook.chroot @@ -0,0 +1,7 @@ +#!/bin/bash + +### Error checking added to "lint-trap" section. +### Missing files no longer cause builds to fail. + +# Remove installer recommended packages not necessary to save space +apt --purge --yes autoremove plasma* kwin* xwayland kde* diff --git a/hooks/normal/0630-add-user-group-for-autologin.hook.chroot b/hooks/normal/0630-add-user-group-for-autologin.hook.chroot new file mode 100755 index 00000000..c804f6ef --- /dev/null +++ b/hooks/normal/0630-add-user-group-for-autologin.hook.chroot @@ -0,0 +1,6 @@ +#!/bin/bash + +# Create user group for live autologin + +sudo groupadd -r autologin + diff --git a/sources-final/sources-final b/sources-final/sources-final deleted file mode 100755 index 366a7a6b..00000000 --- a/sources-final/sources-final +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Writes the final sources.list file -# - -CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -RELEASE="jammy" - -cat << EOF > $CHROOT/etc/apt/sources.list -# See https://wiki.debian.org/SourcesList for more information. - -deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse - -deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse - -deb http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse -#deb-src http://security.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse - -deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse -#deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse - -EOF - -exit 0 diff --git a/ubuntu-gpg/Release.gpg b/ubuntu-gpg/Release.gpg deleted file mode 100644 index 029e9c82..00000000 --- a/ubuntu-gpg/Release.gpg +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEhDk43yKNIvezdCvA2Uqj8O/iEJIFAmLyTnMACgkQ2Uqj8O/i -EJLLLxAAhY+9SLaFOXNYb1phnsE6UiPHlUS5vhibUTdJprJWEKRmXB/JaS7wgMdo -1iKApOFAqZ/TTC7wQQmiGWcwDNRcHoFmRZYLXdjDflTzw2hwNnBFBta1OQRlH+6U -VR4+7NpX9SBVZwa/bJozOhnRdf5heVtnuZulFcbBOFUtme7n1vajKyJMgOlic+LW -g2xOmf3iAHrSv7/Bbi3QefBXQ8XcivASxuLdiSZhnpM2l/vVsD33qkjbg2VFZnM6 -FZFkjjO2KHm+TBzRvo9SIY0H9yMDdOWbCYE7hJNVPpkvbfTPJ2RTae8CwvYOaEkv -FLzLCGKtXi+0Vu0Lb/vGqBc0OaAPNEltpMziKHmY2NlFyjl2YScKJhgReVpZwU7Z -PdyAnkKUfXzDyu/fkkdk+V5+6xeVkivIDaxGl+oQpoVb6rwtcM/moB9YXH/7GcfE -qm2hZo9nhqeGMv9cuAGSQzvtTD49EeYqEl28Ac8LGa5R04dIyVHPJIga5zQI0kxU -Cf000yEuzuDn09eSJVuIb7PLK6EyobP+QF/BnjsmyX6lP9zBAp41LwNnpNhdAo2s -EnI6lvKkFpfXqCg63v1fRya2p/KDeRazyoB3GoHy/pQyV01fG1BrPiuZKxrISG46 -29K8JwrheG4ujz8KlPYRZDc1wob/q8rTA3bUw32bLDMXuBkZ4o4= -=BDc1 ------END PGP SIGNATURE-----