atualizar ficheiros do calamares e os scripts de construçao

This commit is contained in:
manuel 2023-11-08 20:16:43 -01:00
parent 857fe0311c
commit 1222c494ea
31 changed files with 321 additions and 27 deletions

View File

@ -16,8 +16,8 @@ defaultGroups:
autologinGroup: autologin
doAutologin: false
sudoersGroup: sudo
setRootPassword: true
doReusePassword: true
setRootPassword: false
doReusePassword: false
allowWeakPasswords: true
allowWeakPasswordsDefault: true
userShell: /bin/bash

View File

@ -252,7 +252,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
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/default
mkdir -p $build/build/config/includes.chroot/boot/grub
mkdir -p $build/build/config/includes.chroot/boot/grub/themes
mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d
mkdir -p $build/build/config/includes.installer//usr/share
mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
@ -280,7 +280,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
#cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
#cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
cp -r $build/packages/* $build/build/config/packages.chroot
cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes
cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates
cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share
cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share

View File

@ -9,7 +9,7 @@ strings:
shortVersion: 1.0
versionedName: My-distro GNU/Linux
shortVersionedName: My-distro GNU/Linux 1.0
bootloaderEntryName: devuan
bootloaderEntryName: debian

View File

@ -43,7 +43,7 @@ efiBootMgr: "efibootmgr"
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
efiBootloaderId: "devuan"
efiBootloaderId: "debian"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on

View File

@ -1,4 +1,4 @@
---
restartNowEnabled: true
restartNowChecked: true
restartNowCommand: "systemctl -i reboot"
restartNowCommand: "reboot"

View File

@ -1,6 +1,6 @@
---
# Whether to create /etc/machine-id for systemd.
systemd: true
systemd: false
# 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

View File

@ -0,0 +1,56 @@
---
# This is the URL that is retrieved to get the netinstall groups-and-packages
# data (which should be in the format described in netinstall.yaml), e.g.:
# groupsUrl: http://example.org/netinstall.php
# or it can be a locally installed file:
# groupsUrl: file:///usr/share/calamares/netinstall.yaml
#
# Note that the contents of the groups file is the **important**
# part of the configuration of this module. It specifies what
# the user may select and what commands are to be run.
#
# The format of the groups file is documented in `README.md`.
#
# As a special case, setting *groupsUrl* to the literal string
# `local` means that the data is obtained from **this** config
# file, under the key *groups*.
#
groupsUrl: file:///etc/calamares/modules/netinstall-packages.yaml
# If the installation can proceed without netinstall (e.g. the Live CD
# can create a working installed system, but netinstall is preferred
# to bring it up-to-date or extend functionality) leave this set to
# false (the default). If set to true, the netinstall data is required.
#
# This only has an effect if the netinstall data cannot be retrieved,
# or is corrupt: having "required" set, means the install cannot proceed.
required: false
# To support multiple instances of this module,
# some strings are configurable and translatable here.
# - *sidebar* This is the name of the module in the progress-tree / sidebar
# in Calamares.
# - *title* This is displayed above the list of packages.
# If no *sidebar* values are provided, defaults to "Package selection"
# and existing translations. If no *title* values are provided, no string
# is displayed.
#
# The following strings are already known to Calamares and can be
# listed here in *untranslated* form (e.g. as value of *sidebar*)
# without bothering with the translations: they are picked up from
# the regular translation framework:
# - "Package selection"
# - "Office software"
# - "Office package"
# - "Browser software"
# - "Browser package"
# - "Web browser"
label:
sidebar: "Packages"
sidebar[nl]: "Package selection"
sidebar[pt]: "Seleção de pacotes"
sidebar[ja]: "パッケージの選択"
title: "Packages"
title[nl]: "Package selection"
title[pt]: "Seleção de pacotes"
title[ja]: "パッケージの選択"

View File

@ -0,0 +1,16 @@
# Auto generated descriptions from netinstall-packages
- name: " SysVinit Init System"
description: " The original sysv-init, the standard and recommended choice."
selected: true
- sysvinit-core
- name: " Runit Init System"
description: " An alternative implementation which provides /sbin/init
(PID 1)."
selected: false
- runit-init
- name: " Openrc Init System"
description: " A dependency-based service and runlevel management system."
selected: false
- openrc

View File

@ -0,0 +1,13 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
# Systemd services manipulation.
#
# This module can enable services, timers and targets for systemd
# (if packaging doesn't already do that). It can also
# disable services and targets as well as mask units.
timers:
- name: "fstrim"
mandatory: false

View File

@ -16,8 +16,8 @@ defaultGroups:
autologinGroup: autologin
doAutologin: false
sudoersGroup: sudo
setRootPassword: true
doReusePassword: true
setRootPassword: false
doReusePassword: false
allowWeakPasswords: true
allowWeakPasswordsDefault: true
userShell: /bin/bash

View File

@ -5,6 +5,18 @@
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
modules-search: [ local, /usr/lib/calamares/modules ]
# YAML: list of maps of string:string key-value pairs.
instances:
- id: packages
module: netinstall
config: netinstall-packages.conf
- id: system
module: netinstall
config: netinstall-system.conf
- id: pkgs
module: netinstall
config: netinstall-pkgs.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.
@ -49,6 +61,7 @@ sequence:
- locale
- keyboard
- partition
- netinstall@packages
- users
- summary

View File

@ -253,7 +253,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
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/default
mkdir -p $build/build/config/includes.chroot/boot/grub
mkdir -p $build/build/config/includes.chroot/boot/grub/themes
mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d
mkdir -p $build/build/config/includes.installer//usr/share
mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
@ -281,8 +281,8 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
#cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
#cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
cp -r $build/packages/* $build/build/config/packages.chroot
cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates
cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes
cp -r $build/devuan/ $build/build/config/includes.chroot/usr/share/python-apt/templates
cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share
cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share

View File

@ -9,7 +9,7 @@ strings:
shortVersion: 1.0
versionedName: My-distro GNU/Linux
shortVersionedName: My-distro GNU/Linux 1.0
bootloaderEntryName: devuan
bootloaderEntryName: debian

View File

@ -43,7 +43,7 @@ efiBootMgr: "efibootmgr"
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
efiBootloaderId: "devuan"
efiBootloaderId: "debian"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on

View File

@ -1,4 +1,4 @@
---
restartNowEnabled: true
restartNowChecked: true
restartNowCommand: "systemctl -i reboot"
restartNowCommand: "reboot"

View File

@ -1,6 +1,6 @@
---
# Whether to create /etc/machine-id for systemd.
systemd: true
systemd: false
# 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

View File

@ -0,0 +1,56 @@
---
# This is the URL that is retrieved to get the netinstall groups-and-packages
# data (which should be in the format described in netinstall.yaml), e.g.:
# groupsUrl: http://example.org/netinstall.php
# or it can be a locally installed file:
# groupsUrl: file:///usr/share/calamares/netinstall.yaml
#
# Note that the contents of the groups file is the **important**
# part of the configuration of this module. It specifies what
# the user may select and what commands are to be run.
#
# The format of the groups file is documented in `README.md`.
#
# As a special case, setting *groupsUrl* to the literal string
# `local` means that the data is obtained from **this** config
# file, under the key *groups*.
#
groupsUrl: file:///etc/calamares/modules/netinstall-packages.yaml
# If the installation can proceed without netinstall (e.g. the Live CD
# can create a working installed system, but netinstall is preferred
# to bring it up-to-date or extend functionality) leave this set to
# false (the default). If set to true, the netinstall data is required.
#
# This only has an effect if the netinstall data cannot be retrieved,
# or is corrupt: having "required" set, means the install cannot proceed.
required: false
# To support multiple instances of this module,
# some strings are configurable and translatable here.
# - *sidebar* This is the name of the module in the progress-tree / sidebar
# in Calamares.
# - *title* This is displayed above the list of packages.
# If no *sidebar* values are provided, defaults to "Package selection"
# and existing translations. If no *title* values are provided, no string
# is displayed.
#
# The following strings are already known to Calamares and can be
# listed here in *untranslated* form (e.g. as value of *sidebar*)
# without bothering with the translations: they are picked up from
# the regular translation framework:
# - "Package selection"
# - "Office software"
# - "Office package"
# - "Browser software"
# - "Browser package"
# - "Web browser"
label:
sidebar: "Packages"
sidebar[nl]: "Package selection"
sidebar[pt]: "Seleção de pacotes"
sidebar[ja]: "パッケージの選択"
title: "Packages"
title[nl]: "Package selection"
title[pt]: "Seleção de pacotes"
title[ja]: "パッケージの選択"

View File

@ -0,0 +1,16 @@
# Auto generated descriptions from netinstall-packages
- name: " SysVinit Init System"
description: " The original sysv-init, the standard and recommended choice."
selected: true
- sysvinit-core
- name: " Runit Init System"
description: " An alternative implementation which provides /sbin/init
(PID 1)."
selected: false
- runit-init
- name: " Openrc Init System"
description: " A dependency-based service and runlevel management system."
selected: false
- openrc

View File

@ -0,0 +1,13 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
# Systemd services manipulation.
#
# This module can enable services, timers and targets for systemd
# (if packaging doesn't already do that). It can also
# disable services and targets as well as mask units.
timers:
- name: "fstrim"
mandatory: false

View File

@ -16,8 +16,8 @@ defaultGroups:
autologinGroup: autologin
doAutologin: false
sudoersGroup: sudo
setRootPassword: true
doReusePassword: true
setRootPassword: false
doReusePassword: false
allowWeakPasswords: true
allowWeakPasswordsDefault: true
userShell: /bin/bash

View File

@ -5,6 +5,18 @@
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
modules-search: [ local, /usr/lib/calamares/modules ]
# YAML: list of maps of string:string key-value pairs.
instances:
- id: packages
module: netinstall
config: netinstall-packages.conf
- id: system
module: netinstall
config: netinstall-system.conf
- id: pkgs
module: netinstall
config: netinstall-pkgs.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.
@ -49,6 +61,7 @@ sequence:
- locale
- keyboard
- partition
- netinstall@packages
- users
- summary

View File

@ -253,7 +253,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
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/default
mkdir -p $build/build/config/includes.chroot/boot/grub
mkdir -p $build/build/config/includes.chroot/boot/grub/themes
mkdir -p $build/build/config/includes.installer/usr/lib/finish-install.d
mkdir -p $build/build/config/includes.installer//usr/share
mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates
@ -280,7 +280,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
#cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
#cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
cp -r $build/packages/* $build/build/config/packages.chroot
cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
cp -r $build/grub/themes/my-distro $build/build/config/includes.chroot/boot/grub/themes
cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates
cp -r $build/deb-installer/graphics $build/build/config/includes.installer/usr/share
cp -r $build/deb-installer/themes $build/build/config/includes.installer/usr/share

View File

@ -9,7 +9,7 @@ strings:
shortVersion: 1.0
versionedName: My-distro GNU/Linux
shortVersionedName: My-distro GNU/Linux 1.0
bootloaderEntryName: devuan
bootloaderEntryName: debian

View File

@ -43,7 +43,7 @@ efiBootMgr: "efibootmgr"
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
efiBootloaderId: "devuan"
efiBootloaderId: "debian"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on

View File

@ -1,4 +1,4 @@
---
restartNowEnabled: true
restartNowChecked: true
restartNowCommand: "systemctl -i reboot"
restartNowCommand: "reboot"

View File

@ -1,6 +1,6 @@
---
# Whether to create /etc/machine-id for systemd.
systemd: true
systemd: false
# 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

View File

@ -0,0 +1,56 @@
---
# This is the URL that is retrieved to get the netinstall groups-and-packages
# data (which should be in the format described in netinstall.yaml), e.g.:
# groupsUrl: http://example.org/netinstall.php
# or it can be a locally installed file:
# groupsUrl: file:///usr/share/calamares/netinstall.yaml
#
# Note that the contents of the groups file is the **important**
# part of the configuration of this module. It specifies what
# the user may select and what commands are to be run.
#
# The format of the groups file is documented in `README.md`.
#
# As a special case, setting *groupsUrl* to the literal string
# `local` means that the data is obtained from **this** config
# file, under the key *groups*.
#
groupsUrl: file:///etc/calamares/modules/netinstall-packages.yaml
# If the installation can proceed without netinstall (e.g. the Live CD
# can create a working installed system, but netinstall is preferred
# to bring it up-to-date or extend functionality) leave this set to
# false (the default). If set to true, the netinstall data is required.
#
# This only has an effect if the netinstall data cannot be retrieved,
# or is corrupt: having "required" set, means the install cannot proceed.
required: false
# To support multiple instances of this module,
# some strings are configurable and translatable here.
# - *sidebar* This is the name of the module in the progress-tree / sidebar
# in Calamares.
# - *title* This is displayed above the list of packages.
# If no *sidebar* values are provided, defaults to "Package selection"
# and existing translations. If no *title* values are provided, no string
# is displayed.
#
# The following strings are already known to Calamares and can be
# listed here in *untranslated* form (e.g. as value of *sidebar*)
# without bothering with the translations: they are picked up from
# the regular translation framework:
# - "Package selection"
# - "Office software"
# - "Office package"
# - "Browser software"
# - "Browser package"
# - "Web browser"
label:
sidebar: "Packages"
sidebar[nl]: "Package selection"
sidebar[pt]: "Seleção de pacotes"
sidebar[ja]: "パッケージの選択"
title: "Packages"
title[nl]: "Package selection"
title[pt]: "Seleção de pacotes"
title[ja]: "パッケージの選択"

View File

@ -0,0 +1,16 @@
# Auto generated descriptions from netinstall-packages
- name: " SysVinit Init System"
description: " The original sysv-init, the standard and recommended choice."
selected: true
- sysvinit-core
- name: " Runit Init System"
description: " An alternative implementation which provides /sbin/init
(PID 1)."
selected: false
- runit-init
- name: " Openrc Init System"
description: " A dependency-based service and runlevel management system."
selected: false
- openrc

View File

@ -0,0 +1,13 @@
# SPDX-FileCopyrightText: no
# SPDX-License-Identifier: CC0-1.0
#
# Systemd services manipulation.
#
# This module can enable services, timers and targets for systemd
# (if packaging doesn't already do that). It can also
# disable services and targets as well as mask units.
timers:
- name: "fstrim"
mandatory: false

View File

@ -16,8 +16,8 @@ defaultGroups:
autologinGroup: autologin
doAutologin: false
sudoersGroup: sudo
setRootPassword: true
doReusePassword: true
setRootPassword: false
doReusePassword: false
allowWeakPasswords: true
allowWeakPasswordsDefault: true
userShell: /bin/bash

View File

@ -5,6 +5,18 @@
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
modules-search: [ local, /usr/lib/calamares/modules ]
# YAML: list of maps of string:string key-value pairs.
instances:
- id: packages
module: netinstall
config: netinstall-packages.conf
- id: system
module: netinstall
config: netinstall-system.conf
- id: pkgs
module: netinstall
config: netinstall-pkgs.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.
@ -49,6 +61,7 @@ sequence:
- locale
- keyboard
- partition
- netinstall@packages
- users
- summary