atualizar os scripts BldHelper
This commit is contained in:
parent
11aa740e85
commit
fccc0cda82
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-debian-32-pae"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -266,11 +266,9 @@ cp -r $build/repos/* $build/build/config/archives
|
|||
cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
|
||||
cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
|
||||
cp -r $build/configs/* $build/build/config/includes.chroot/etc/
|
||||
#cp -r $build/packages/* $build/build/config/packages.chroot
|
||||
cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
|
||||
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
|
||||
|
||||
# build the ISO #
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-debian-32"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -269,8 +269,6 @@ cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
|
|||
cp -r $build/configs/* $build/build/config/includes.chroot/etc/
|
||||
cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-debian-64"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -265,10 +265,9 @@ cp -r $build/repos/* $build/build/config/archives
|
|||
cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds
|
||||
cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
|
||||
cp -r $build/configs/* $build/build/config/includes.chroot/etc/
|
||||
cp -r $build/packages/* $build/build/config/packages.chroot
|
||||
cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-devuan-32-pae"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -269,8 +269,6 @@ cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
|
|||
cp -r $build/configs/* $build/build/config/includes.chroot/etc/
|
||||
cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
restartNowEnabled: true
|
||||
restartNowChecked: true
|
||||
restartNowCommand: "systemctl -i reboot"
|
||||
restartNowCommand: "reboot"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]: "パッケージの選択"
|
||||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-devuan-32"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -270,8 +270,6 @@ cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
|
|||
cp -r $build/configs/* $build/build/config/includes.chroot/etc/
|
||||
cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
restartNowEnabled: true
|
||||
restartNowChecked: true
|
||||
restartNowCommand: "systemctl -i reboot"
|
||||
restartNowCommand: "reboot"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]: "パッケージの選択"
|
||||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-devuan-64"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -270,8 +270,6 @@ cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares
|
|||
cp -r $build/configs/* $build/build/config/includes.chroot/etc/
|
||||
cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
---
|
||||
restartNowEnabled: true
|
||||
restartNowChecked: true
|
||||
restartNowCommand: "systemctl -i reboot"
|
||||
restartNowCommand: "reboot"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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]: "パッケージの選択"
|
||||
|
|
@ -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
|
||||
|
||||
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ WorkingDir="/home/$SUDO_USER/My-distro-configs/my-distro-ubuntu-64"
|
|||
|
||||
# Execute the ISO building script
|
||||
cd ${WorkingDir}
|
||||
./build.sh
|
||||
./build.sh 2>&1 | tee /tmp/build_log.txt
|
||||
|
||||
# Move and rename the ISO file
|
||||
cd build
|
||||
|
|
@ -38,8 +38,9 @@ mv ${FileName}-${TODAY}.iso ${LOCATION}
|
|||
mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION}
|
||||
|
||||
# Move the log file to the log directory (if it exists)
|
||||
if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then
|
||||
mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log
|
||||
if [ -f /tmp/build_log.txt ]; then
|
||||
LogFileName="${PREFIX}-${SUFFIX}-${BUILD}.log"
|
||||
mv /tmp/build_log.txt ${LogDir}/${LogFileName}
|
||||
fi
|
||||
|
||||
# Clean the build folder
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ backend: apt
|
|||
operations:
|
||||
- remove:
|
||||
- "^live-*"
|
||||
- calamares-settings-lubuntu
|
||||
- calamares-settings-debian
|
||||
- calamares
|
||||
- hunspell-en-us
|
||||
- zram-config
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue