Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0bb7342e32 | |||
| 1cb140df49 | |||
| 6d8fd9ed93 | |||
| 68ca4cadfb | |||
| 1457f700d0 | |||
| f1eaade778 | |||
| 1812e99279 | |||
| 939d291d4d | |||
| dbd5ea6632 | |||
| c620eda931 | |||
| 2b4012a6cd | |||
| 739cba6c49 | |||
| 86b6ea8f4f | |||
| ad0aeffc52 | |||
| 77d2a2c381 | |||
| 291444b863 | |||
| 64a2ef74ec | |||
| c14e3710e8 |
@@ -1,3 +1,96 @@
|
||||
[ 13.0.11 ]
|
||||
|
||||
* Fix typo in filename
|
||||
* Move scripts to helpers
|
||||
|
||||
[ 13.0.10 ]
|
||||
|
||||
* Make script names less generic and namespace under /usr/share/calamare
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021156
|
||||
|
||||
[ 13.0.9 ]
|
||||
|
||||
* Bump minimum storage required to 15G
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=#1037123
|
||||
* Update copyright years
|
||||
* Fix dconf entry for calamares launcher (fixes launcher on GNOME)
|
||||
* Use trim by default for encrypted media
|
||||
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001192
|
||||
* Use idle cycles to preload calamares binary and libraries
|
||||
for faster startup
|
||||
|
||||
[ 13.0.8 ]
|
||||
|
||||
* Move lukskeyconfig further up the task chain
|
||||
|
||||
[ 13.0.7 ]
|
||||
|
||||
* Move lukskeyconfig action before fstab
|
||||
(fstab now depends on it being configured)
|
||||
|
||||
[ 13.0.6 ]
|
||||
|
||||
* Merge MR!3
|
||||
- Add missing mountpoints
|
||||
* Merge MR!2
|
||||
- Install more generic grub-efi package to allow installation on
|
||||
non-amd64 architectures
|
||||
* Remove space_cache from fstab module (space_cache=v2 is now default)
|
||||
and also autodefrag which isn't useful on modern storage
|
||||
|
||||
[ 13.0.5 ]
|
||||
|
||||
* Add pesky missing delimiter for Calamares desktop icon setup
|
||||
(thanks Roland Clobus, #1037299)
|
||||
|
||||
[ 13.0.4 ]
|
||||
|
||||
* Update config in mount module so that /dev is properly mounted
|
||||
in target
|
||||
|
||||
[ 13.0.3 ]
|
||||
|
||||
* Update branding elements for Calamares 3.3 series
|
||||
* Fix desktop file launcher
|
||||
* Set installEFIFallback: true
|
||||
* Don't allow empty passwords
|
||||
|
||||
[ 13.0.2 ]
|
||||
|
||||
* Fix desktop icon path in add-calamares-desktop-icon
|
||||
|
||||
[ 13.0.1 ]
|
||||
|
||||
* Initial release for trixie
|
||||
- Update sources.list writer and media sources
|
||||
* Update copyright years
|
||||
* Update installer artwork (egg theme)
|
||||
* Rename launchers (partial fix towards #1021156)
|
||||
* Mark desktop launchers as trusted for xfce/gnome (#1037299)
|
||||
|
||||
[ 12.0.9 ]
|
||||
|
||||
* Fix typos in version numbers for last two changelog entries
|
||||
* Install cryptsetup-initramfs, cryptsetup and keyutils (only) when needed
|
||||
(required due to these packages only now existing on package pool,
|
||||
not on the squashfs filesystem)
|
||||
|
||||
[ 12.0.8 ]
|
||||
|
||||
* Do grub work within the chroot
|
||||
|
||||
[ 12.0.7 ]
|
||||
|
||||
* Enable os-prober /after/ grub has been installed.
|
||||
|
||||
[ 12.0.6 ]
|
||||
|
||||
* Enable os-prober
|
||||
|
||||
[ 12.0.5 ]
|
||||
|
||||
* Update sources.list to include non-free-firmware and backports
|
||||
|
||||
[ 12.0.4 ]
|
||||
|
||||
* Update artwork for Debian 12 (emerald theme)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
ISC License
|
||||
|
||||
Copyright (c) 2016-2020, Jonathan Carter <jcc@debian.org>
|
||||
Copyright (c) 2016-2024, Jonathan Carter <jcc@debian.org>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
|
||||
|
||||
|
||||
@@ -13,15 +13,32 @@ 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
|
||||
echo "[Desktop Entry]" > $DESKTOP/calamares-install-debian.desktop
|
||||
echo "Type=Link" >> $DESKTOP/calamares-install-debian.desktop
|
||||
echo "Name=Install Debian" >> $DESKTOP/calamares-install-debian.desktop
|
||||
echo "Icon=install-debian" >> $DESKTOP/calamares-install-debian.desktop
|
||||
echo "URL=/usr/share/applications/calamares-install-debian.desktop" \
|
||||
>> $DESKTOP/calamares-install-debian.desktop
|
||||
else
|
||||
cp /usr/share/applications/install-debian.desktop $DESKTOP
|
||||
cp /usr/share/applications/calamares-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
|
||||
chmod +x $DESKTOP/calamares-install-debian.desktop
|
||||
fi
|
||||
|
||||
# Set desktop launcher as trusted under Xfce (See: #1037299)
|
||||
if [ "$XDG_CURRENT_DESKTOP" = "XFCE" ]; then
|
||||
gio set --type=string ~/Desktop/calamares-install-debian.desktop \
|
||||
metadata::trusted true
|
||||
gio set --type=string ~/Desktop/calamares-install-debian.desktop \
|
||||
metadata::xfce-exe-checksum \
|
||||
"$(sha256sum ~/Desktop/calamares-install-debian.desktop | cut -f1 -d' ')"
|
||||
touch ~/Desktop/calamares-install-debian.desktop
|
||||
fi
|
||||
|
||||
# Preload calamares binaries and libraries using idle disk cycles
|
||||
# so that it launches faster
|
||||
ionice -C Idle cat /usr/bin/calamares > /dev/null
|
||||
for file in $(ldd /usr/bin/calamares | awk '{print $3}'): do
|
||||
ionice -C Idle cat $file > /dev/null
|
||||
done
|
||||
|
||||
@@ -3,7 +3,7 @@ Type=Application
|
||||
Version=1.0
|
||||
Name=Install Debian
|
||||
GenericName=Calamares Installer
|
||||
Exec=install-debian
|
||||
Exec=calamares-install-debian
|
||||
Comment=Calamares — Installer for Debian Live
|
||||
Keywords=calamares;system;install;debian;installer
|
||||
Icon=install-debian
|
||||
@@ -2,5 +2,5 @@
|
||||
type: "job"
|
||||
name: "bootloader-config"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/bootloader-config"
|
||||
command: "/usr/share/calamares/helpers/calamares-bootloader-config"
|
||||
timeout: 600
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
type: "job"
|
||||
name: "dpkg-unsafe-io-undo"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/dpkg-unsafe-io -u"
|
||||
command: "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io -u"
|
||||
timeout: 600
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
type: "job"
|
||||
name: "dpkg-unsafe-io"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/dpkg-unsafe-io"
|
||||
command: "/usr/share/calamares/helpers/calamares-dpkg-unsafe-io"
|
||||
timeout: 600
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
type: "job"
|
||||
name: "sources-final"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/sources-final"
|
||||
command: "/usr/share/calamares/helpers/calamares-sources-final"
|
||||
timeout: 600
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
type: "job"
|
||||
name: "sources-media-unmount"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/sources-media -u"
|
||||
command: "/usr/share/calamares/helpers/calamares-sources-media -u"
|
||||
timeout: 600
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
type: "job"
|
||||
name: "sources-media"
|
||||
interface: "process"
|
||||
command: "/usr/sbin/sources-media"
|
||||
command: "/usr/share/calamares/helpers/calamares-sources-media"
|
||||
timeout: 600
|
||||
|
||||
@@ -3,16 +3,16 @@ componentName: debian
|
||||
welcomeStyleCalamares: true
|
||||
welcomeExpandingLogo: true
|
||||
windowExpanding: normal
|
||||
windowSize: 800px,520px
|
||||
windowSize: 800px,580px
|
||||
windowPlacement: center
|
||||
|
||||
strings:
|
||||
productName: Debian GNU/Linux
|
||||
shortProductName: Debian
|
||||
version: 12 (bookworm)
|
||||
shortVersion: 12
|
||||
versionedName: Debian 12 (bookworm)
|
||||
shortVersionedName: Debian 12
|
||||
version: 13
|
||||
shortVersion: 13
|
||||
versionedName: Debian 13
|
||||
shortVersionedName: Debian 13
|
||||
bootloaderEntryName: Debian
|
||||
productUrl: https://debian.org
|
||||
supportUrl: https://www.debian.org/support
|
||||
@@ -20,18 +20,22 @@ strings:
|
||||
releaseNotesUrl: https://www.debian.org/releases/bookworm/releasenotes
|
||||
donateUrl: https://www.debian.org
|
||||
|
||||
sidebar: widget
|
||||
navigation: widget
|
||||
|
||||
images:
|
||||
# productBanner: "/usr/share/desktop-base/emerald-theme/grub/grub-16x9.png"
|
||||
productLogo: "debian-logo.png"
|
||||
productIcon: "debian-logo.png"
|
||||
productWelcome: "welcome.png"
|
||||
# productWallpaper: "wallpaper.png"
|
||||
# productWallpaper: ""
|
||||
|
||||
slideshow: "show.qml"
|
||||
|
||||
style:
|
||||
sidebarBackground: "#2c3133"
|
||||
sidebarText: "#FFFFFF"
|
||||
sidebarTextSelect: "#4d7079"
|
||||
sidebarTextSelect: "#292F34"
|
||||
SidebarBackground: "#010027"
|
||||
SidebarText: "#FFFFFF"
|
||||
SidebarTextCurrent: "#fbfbfb"
|
||||
SidebarBackgroundCurrent: "#017877"
|
||||
|
||||
slideshowAPI: 2
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 86 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 71 KiB |
@@ -51,4 +51,4 @@ efiBootMgr: "efibootmgr"
|
||||
# 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
|
||||
installEFIFallback: true
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
---
|
||||
mountOptions:
|
||||
default: defaults,noatime
|
||||
btrfs: defaults,noatime,space_cache,autodefrag
|
||||
btrfs: defaults,noatime
|
||||
ssdExtraMountOptions:
|
||||
ext4: discard
|
||||
jfs: discard
|
||||
xfs: discard
|
||||
swap: discard
|
||||
btrfs: discard,compress=lzo
|
||||
crypttabOptions: luks,keyscript=/bin/cat
|
||||
crypttabOptions: luks,discard,keyscript=/bin/cat
|
||||
|
||||
@@ -1,17 +1,22 @@
|
||||
# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.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.
|
||||
# are mounted in all target systems.
|
||||
---
|
||||
# Extra filesystems to mount. The key's value is a list of entries; each
|
||||
# entry has four keys:
|
||||
# entry has five keys:
|
||||
# - device The device node to mount
|
||||
# - fs The filesystem type to use
|
||||
# - fs (optional) The filesystem type to use
|
||||
# - mountPoint Where to mount the filesystem
|
||||
# - options (optional) Extra options to pass to mount(8)
|
||||
# - options (optional) An array of options to pass to mount
|
||||
# - efi (optional) A boolean that when true is only mounted for UEFI installs
|
||||
#
|
||||
# The device is not mounted if the mountPoint is unset or if the fs is
|
||||
# set to unformatted.
|
||||
#
|
||||
extraMounts:
|
||||
- device: proc
|
||||
@@ -22,15 +27,18 @@ extraMounts:
|
||||
mountPoint: /sys
|
||||
- device: /dev
|
||||
mountPoint: /dev
|
||||
options: bind
|
||||
options: [ bind ]
|
||||
- device: tmpfs
|
||||
fs: tmpfs
|
||||
mountPoint: /run
|
||||
- device: /run/udev
|
||||
mountPoint: /run/udev
|
||||
options: bind
|
||||
|
||||
extraMountsEfi:
|
||||
options: [ bind ]
|
||||
- device: efivarfs
|
||||
fs: efivarfs
|
||||
mountPoint: /sys/firmware/efi/efivars
|
||||
efi: true
|
||||
- device: /dev/pts
|
||||
mountPoint: /dev/pts
|
||||
options: [ bind ]
|
||||
# /dev/pts is required by apt for storing the logs
|
||||
|
||||
@@ -15,3 +15,12 @@ defaultGroups:
|
||||
autologinGroup: autologin
|
||||
sudoersGroup: sudo
|
||||
setRootPassword: false
|
||||
|
||||
passwordRequirements:
|
||||
nonempty: true
|
||||
minLength: -1 # Password at least this many characters
|
||||
maxLength: -1 # Password at most this many characters
|
||||
libpwquality:
|
||||
- minlen=0
|
||||
- minclass=0
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ showKnownIssuesUrl: true
|
||||
showReleaseNotesUrl: true
|
||||
|
||||
requirements:
|
||||
requiredStorage: 10
|
||||
requiredStorage: 15
|
||||
requiredRam: 1.0
|
||||
check:
|
||||
- storage
|
||||
|
||||
@@ -62,6 +62,7 @@ sequence:
|
||||
- partition
|
||||
- mount
|
||||
- unpackfs
|
||||
- luksbootkeyfile
|
||||
- dpkg-unsafe-io
|
||||
- sources-media
|
||||
- machineid
|
||||
@@ -78,7 +79,6 @@ sequence:
|
||||
- grubcfg
|
||||
- bootloader
|
||||
- packages
|
||||
- luksbootkeyfile
|
||||
- plymouthcfg
|
||||
- initramfscfg
|
||||
- initramfs
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Launcher icons
|
||||
[org.gnome.shell]
|
||||
favorite-apps=['install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
|
||||
favorite-apps=['calamares-install-debian.desktop', 'firefox-esr.desktop', 'org.gnome.Evolution.desktop', 'rhythmbox.desktop', 'libreoffice-writer.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'yelp.desktop']
|
||||
|
||||
# We don't want the screensaver to enable on the live media while installing
|
||||
[org.gnome.desktop.lockdown]
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
.debhelper/
|
||||
calamares-settings-debian.substvars
|
||||
calamares-settings-debian/
|
||||
debhelper-build-stamp
|
||||
files
|
||||
Vendored
+113
@@ -1,3 +1,116 @@
|
||||
calamares-settings-debian (13.0.11-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Make script names less generic and namespace (Closes: #1021156)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Fri, 23 Aug 2024 17:48:32 +0200
|
||||
|
||||
calamares-settings-debian (13.0.9-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release (Closes: #1037123, #1001192)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Thu, 22 Aug 2024 18:54:20 +0200
|
||||
|
||||
calamares-settings-debian (13.0.8-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Further attempt to fix encrypted installs
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Mon, 22 Jul 2024 15:39:42 +0900
|
||||
|
||||
calamares-settings-debian (13.0.7-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Fix encrypted installs
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Mon, 22 Jul 2024 14:13:23 +0900
|
||||
|
||||
calamares-settings-debian (13.0.6-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Mount efivarfs when needed (Closes: #1051607)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Fri, 21 Jun 2024 18:13:26 +0200
|
||||
|
||||
calamares-settings-debian (13.0.5-2) unstable; urgency=medium
|
||||
|
||||
* Update debian/watch to work with new GitLab release
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Wed, 19 Jun 2024 11:01:19 +0200
|
||||
|
||||
calamares-settings-debian (13.0.5-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Fix delimiter in desktop icon script (Closes: #1037299)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Sun, 11 Feb 2024 14:48:39 +0200
|
||||
|
||||
calamares-settings-debian (13.0.4-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Fix crash where /dev isn't mounted
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Mon, 28 Aug 2023 19:17:29 +0200
|
||||
|
||||
calamares-settings-debian (13.0.3-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Do not allow empty password (Closes: #1050291)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Fri, 25 Aug 2023 21:51:02 +0200
|
||||
|
||||
calamares-settings-debian (13.0.2-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Fix desktop script path
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Thu, 24 Aug 2023 17:32:33 +0200
|
||||
|
||||
calamares-settings-debian (13.0.1-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Initial trixie support
|
||||
* Add dependency: libglib2.0-bin
|
||||
- Plus upstream fixes for desktop launcher (Closes: #1037299)
|
||||
* Update standards version to 4.6.2
|
||||
* Update copyright years
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Thu, 24 Aug 2023 16:49:49 +0200
|
||||
|
||||
calamares-settings-debian (12.0.9-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Deal with changes in how luks tools are installed from live media
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Thu, 04 May 2023 20:47:17 +0200
|
||||
|
||||
calamares-settings-debian (12.0.8-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Make grub changes in the correct place (within the chroot)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Wed, 26 Apr 2023 14:25:34 +0200
|
||||
|
||||
calamares-settings-debian (12.0.7-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Re-enable os-prober
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Wed, 26 Apr 2023 13:43:01 +0200
|
||||
|
||||
calamares-settings-debian (12.0.5-2) unstable; urgency=medium
|
||||
|
||||
* Depend on pkexec (Closes: #1033930)
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Tue, 04 Apr 2023 09:51:03 +0200
|
||||
|
||||
calamares-settings-debian (12.0.5-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
- Update sources.list to include backports and non-free-firmware
|
||||
|
||||
-- Jonathan Carter <jcc@debian.org> Mon, 06 Mar 2023 19:24:55 +0200
|
||||
|
||||
calamares-settings-debian (12.0.4-1) unstable; urgency=medium
|
||||
|
||||
* New upstream release
|
||||
|
||||
Vendored
+3
-1
@@ -3,7 +3,7 @@ Section: utils
|
||||
Priority: optional
|
||||
Maintainer: Jonathan Carter <jcc@debian.org>
|
||||
Build-Depends: debhelper-compat (= 13), libglib2.0-bin
|
||||
Standards-Version: 4.6.0
|
||||
Standards-Version: 4.6.2
|
||||
Rules-Requires-Root: no
|
||||
Homepage: https://salsa.debian.org/live-team/calamares-settings-debian
|
||||
Vcs-Git: https://salsa.debian.org/live-team/calamares-settings-debian-packaging.git
|
||||
@@ -13,7 +13,9 @@ Package: calamares-settings-debian
|
||||
Architecture: all
|
||||
Depends: calamares,
|
||||
cryptsetup,
|
||||
libglib2.0-bin,
|
||||
keyutils,
|
||||
pkexec,
|
||||
qml-module-qtquick-window2,
|
||||
qml-module-qtquick2,
|
||||
${misc:Depends}
|
||||
|
||||
Vendored
+2
-2
@@ -3,7 +3,7 @@ Upstream-Name: calamares-settings-debian
|
||||
Source: https://gitlab.com/highvoltage/calamares-settings-debian
|
||||
|
||||
Files: *
|
||||
Copyright: 2016-2020, Jonathan Carter <jcc@debian.org>
|
||||
Copyright: 2016-2024, Jonathan Carter <jcc@debian.org>
|
||||
License: ISC
|
||||
|
||||
Files: calamares/branding/debian/*png
|
||||
@@ -11,7 +11,7 @@ Copyright: 2019 Isabelle Simpkins <isy@koipond.org.uk>
|
||||
License: CC-BY-SA-3.0
|
||||
|
||||
Files: debian/*
|
||||
Copyright: 2016-2020 Jonathan Carter <jcc@debian.org>
|
||||
Copyright: 2016-2023 Jonathan Carter <jcc@debian.org>
|
||||
License: ISC
|
||||
|
||||
Files: calamares/branding/debian/show.qml
|
||||
|
||||
Vendored
+2
-2
@@ -1,8 +1,8 @@
|
||||
calamares etc
|
||||
calamares-modules/* usr/lib/calamares/modules
|
||||
scripts/* usr/sbin
|
||||
helpers/* usr/share/calamares/helpers
|
||||
*.desktop usr/share/applications
|
||||
install-debian usr/bin
|
||||
calamares-install-debian usr/bin
|
||||
artwork/install-debian.png usr/share/pixmaps
|
||||
conf/96_calamares-settings-debian.gschema.override usr/share/glib-2.0/schemas
|
||||
conf/calamares-desktop-icon.desktop etc/xdg/autostart
|
||||
|
||||
Vendored
+2
-1
@@ -1,2 +1,3 @@
|
||||
version=4
|
||||
https://salsa.debian.org/live-team/calamares-settings-debian/tags .*/calamares-settings-debian-(.*)\.tar\.gz
|
||||
opts="searchmode=plain" \
|
||||
https://salsa.debian.org/live-team/calamares-settings-debian/tags?sort=updated_desc -/archive/v?\d[\d.]+/calamares-settings-debian-@ANY_VERSION@@ARCHIVE_EXT@ debian uupdate
|
||||
|
||||
@@ -2,20 +2,26 @@
|
||||
|
||||
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
|
||||
|
||||
# Set secure permissions for the initramfs if we're configuring
|
||||
# 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 cryptsetup keyutils
|
||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi
|
||||
else
|
||||
echo " * install grub... (bios)"
|
||||
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
|
||||
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
|
||||
Executable
+25
@@ -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="trixie"
|
||||
|
||||
cat << EOF > $CHROOT/etc/apt/sources.list
|
||||
# See https://wiki.debian.org/SourcesList for more information.
|
||||
deb http://deb.debian.org/debian $RELEASE main non-free-firmware
|
||||
deb-src http://deb.debian.org/debian $RELEASE main non-free-firmware
|
||||
|
||||
deb http://deb.debian.org/debian $RELEASE-updates main non-free-firmware
|
||||
deb-src http://deb.debian.org/debian $RELEASE-updates main non-free-firmware
|
||||
|
||||
deb http://security.debian.org/debian-security/ $RELEASE-security main non-free-firmware
|
||||
deb-src http://security.debian.org/debian-security/ $RELEASE-security main 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 non-free-firmware
|
||||
deb-src http://deb.debian.org/debian $RELEASE-backports main non-free-firmware
|
||||
EOF
|
||||
|
||||
exit 0
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
|
||||
MEDIUM_PATH="/run/live/medium"
|
||||
RELEASE="bookworm"
|
||||
RELEASE="trixie"
|
||||
|
||||
if [ "$1" = "-u" ]; then
|
||||
umount $CHROOT/$MEDIUM_PATH
|
||||
@@ -1,21 +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="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
|
||||
deb-src http://deb.debian.org/debian $RELEASE main
|
||||
|
||||
deb http://deb.debian.org/debian $RELEASE-updates main
|
||||
deb-src http://deb.debian.org/debian $RELEASE-updates main
|
||||
|
||||
deb http://security.debian.org/debian-security/ $RELEASE-security main
|
||||
deb-src http://security.debian.org/debian-security/ $RELEASE-security main
|
||||
EOF
|
||||
|
||||
exit 0
|
||||
Reference in New Issue
Block a user