Compare commits

...

25 Commits

Author SHA1 Message Date
Jonathan Carter 2078611cc4 Source-only upload 2019-08-05 21:31:36 +02:00
Jonathan Carter f05fdbdad6 Update bootloader config 2019-07-08 12:23:29 +00:00
Jonathan Carter 15a94de5d5 fix path 2019-07-03 13:33:09 +00:00
Jonathan Carter 34abde07b6 Fix security issue 2019-07-03 13:09:54 +00:00
Jonathan Carter 70f14a44ba Add .gitignore 2019-04-18 08:51:04 +00:00
Jonathan Carter d1007c899d Add desktop icon 2019-04-18 08:50:53 +00:00
Jonathan Carter b16e2cb5c8 Minor bugs for buster 2019-04-16 08:03:39 +00:00
Jonathan Carter 6b89773a85 New upstream release 2019-02-15 16:08:17 +02:00
Jonathan Carter 98abeec1c0 New upstream release 2019-01-16 19:15:31 +02:00
Jonathan Carter d9134ca843 New upstream release 2019-01-16 12:16:25 +02:00
Jonathan Carter 3c596e4f06 Fix desc 2019-01-09 14:00:37 +02:00
Jonathan Carter 411ed1dcd8 New upstream version 2019-01-08 10:50:15 +02:00
Jonathan Carter 51ca364b40 New upstream release 2018-12-16 14:29:13 +02:00
Jonathan Carter c3a993c3b7 Commit upstream changes 2018-12-01 19:37:38 +02:00
Jonathan Carter d137b66265 Add install-debian wrapper 2018-11-23 22:23:02 +02:00
Jonathan Carter 383139c3c0 Fix diverts 2018-09-25 14:44:34 +02:00
Jonathan Carter 5ec79c0374 Fix path 2018-09-19 11:34:18 +02:00
Jonathan Carter 89fea61c65 Merge back 2018-09-18 20:59:35 +02:00
Jonathan Carter 18d541c980 New upstream release, add diverts 2018-09-18 20:57:47 +02:00
Jonathan Carter 710f387139 no unstable 2018-08-11 15:25:59 +02:00
Jonathan Carter ddea8df0cd Fix watch file 2018-08-11 15:25:04 +02:00
Jonathan Carter 3193b444d4 fix watch file 2018-08-09 09:30:08 +02:00
Jonathan Carter 02bb4818ba New upstream release 2018-06-26 14:08:41 +02:00
Jonathan Carter 39e4e793fa Update .desktop file to include main category 2018-06-25 12:27:44 +02:00
Jonathan Carter 34ac6e5339 Commit recent changes 2018-06-25 12:26:11 +02:00
39 changed files with 676 additions and 4 deletions
+7
View File
@@ -0,0 +1,7 @@
ISC License
Copyright (c) 2016-2018, 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.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+25
View File
@@ -0,0 +1,25 @@
#!/bin/sh
# Creates an "Install Debian" icon on the live session tested with:
# Xfce, LXDE, LXqt, Gnome, KDE, Mate, Cinnamon
# Create ~/Desktop just in case this runs before the xdg folder
# creation script.
mkdir -p ~/Desktop
# Among the Debian desktop environments, LXDE is the only one
# that behaves completely different.
if [ -f /usr/bin/lxsession ]; then
echo "[Desktop Entry]" > ~/Desktop/install-debian.desktop
echo "Type=Link" >> ~/Desktop/install-debian.desktop
echo "Name=Install Debian" >> ~/Desktop/install-debian.desktop
echo "Icon=install-debian" >> ~/Desktop/install-debian.desktop
echo "URL=/usr/share/applications/install-debian.desktop" \
>> ~/Desktop/install-debian.desktop
else
cp /usr/share/applications/install-debian.desktop ~/Desktop
# Xfce needs this executable otherwise it complains, everything
# else doesn't seem to care either way.
chmod +x ~/Desktop/install-debian.desktop
fi
Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

@@ -0,0 +1,6 @@
---
type: "job"
name: "bootloader-config"
interface: "process"
command: "/usr/sbin/bootloader-config"
timeout: 600
@@ -0,0 +1,6 @@
---
type: "job"
name: "sources-final"
interface: "process"
command: "/usr/sbin/sources-final"
timeout: 600
@@ -0,0 +1,6 @@
---
type: "job"
name: "sources-media-unmount"
interface: "process"
command: "/usr/sbin/sources-media -u"
timeout: 600
@@ -0,0 +1,6 @@
---
type: "job"
name: "sources-media"
interface: "process"
command: "/usr/sbin/sources-media"
timeout: 600
+27
View File
@@ -0,0 +1,27 @@
---
componentName: debian
welcomeStyleCalamares: true
strings:
productName: Debian GNU/Linux
shortProductName: Debian
version: 10 (buster)
shortVersion: 10
versionedName: Debian 10 (buster)
shortVersionedName: Debian 10
bootloaderEntryName: Debian
productUrl: https://debian.org
supportUrl: https://www.debian.org/support
releaseNotesUrl: https://www.debian.org/releases/buster/releasenotes
images:
productLogo: "debian-logo.png"
productIcon: "debian-logo.png"
productWelcome: "welcome.png"
slideshow: "show.qml"
style:
sidebarBackground: "#2c3133"
sidebarText: "#FFFFFF"
sidebarTextSelect: "#4d7079"
Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

+51
View File
@@ -0,0 +1,51 @@
/* === This file is part of Calamares - <http://github.com/calamares> ===
*
* Copyright 2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Jonathan Carter <jcc@debian.org>
*
* 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, 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 <http://www.gnu.org/licenses/>.
*/
import QtQuick 2.0;
import calamares.slideshow 1.0;
Presentation
{
id: presentation
Timer {
interval: 20000
repeat: true
onTriggered: presentation.goToNextSlide()
}
Slide {
Image {
id: background1
source: "slide1.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
}
Text {
anchors.horizontalCenter: background1.horizontalCenter
anchors.top: background1.bottom
text: "Welcome to Debian GNU/Linux.<br/>"+
"The rest of the installation is automated and should complete in a few minutes."
wrapMode: Text.WordWrap
width: 600
horizontalAlignment: Text.Center
}
}
}
Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

+54
View File
@@ -0,0 +1,54 @@
# Bootloader configuration. The bootloader is installed to allow
# the system to start (and pick one of the installed operating
# systems to run).
---
# Define which bootloader you want to use for EFI installations
# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
efiBootLoader: "grub"
# systemd-boot configuration files settings, set kernel and initramfs file names
# and amount of time before default selection boots
kernel: "/vmlinuz-linux"
img: "/initramfs-linux.img"
fallback: "/initramfs-linux-fallback.img"
timeout: "10"
# Optionally set the menu entry name and kernel name to use in systemd-boot.
# If not specified here, these settings will be taken from branding.desc.
#
# bootloaderEntryName: "Generic GNU/Linux"
# kernelLine: ", with Stable-Kernel"
# fallbackKernelLine: ", with Stable-Kernel (fallback initramfs)"
# GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
# These names are also used when using sb-shim, since that needs some
# GRUB functionality (notably grub-probe) to work. As needed, you may use
# complete paths like `/usr/bin/efibootmgr` for the executables.
#
grubInstall: "grub-install"
grubMkconfig: "grub-mkconfig"
grubCfg: "/boot/grub/grub.cfg"
grubProbe: "grub-probe"
efiBootMgr: "efibootmgr"
# Optionally set the bootloader ID to use for EFI. This is passed to
# grub-install --bootloader-id.
#
# If not set here, the value from bootloaderEntryName from branding.desc
# is used, with problematic characters (space and slash) replaced.
#
# The ID is also used as a directory name within the EFI environment,
# and the bootloader is copied from /boot/efi/EFI/<dirname>/ . When
# setting the option here, keep in mind that the name is sanitized
# (problematic characters, see above, are replaced).
#
# efiBootloaderId: "dirname"
# Optionally install a copy of the GRUB EFI bootloader as the EFI
# fallback loader (either bootia32.efi or bootx64.efi depending on
# the system). This may be needed on certain systems (Intel DH87MC
# seems to be the only one). If you set this to false, take care
# to add another module to optionally install the fallback on those
# boards that need it.
installEFIFallback: false
+4
View File
@@ -0,0 +1,4 @@
---
restartNowEnabled: true
restartNowChecked: true
restartNowCommand: "systemctl -i reboot"
+11
View File
@@ -0,0 +1,11 @@
---
mountOptions:
default: defaults,noatime
btrfs: defaults,noatime,space_cache,autodefrag
ssdExtraMountOptions:
ext4: discard
jfs: discard
xfs: discard
swap: discard
btrfs: discard,compress=lzo
crypttabOptions: luks,keyscript=/bin/cat
@@ -0,0 +1,4 @@
# Writes an openswap configuration with LUKS settings to the given path
---
# Path of the configuration file to write (in the target system)
configFilePath: /etc/openswap.conf
+8
View File
@@ -0,0 +1,8 @@
---
# 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
+36
View File
@@ -0,0 +1,36 @@
# Mount filesystems in the target (generally, before treating the
# target as a usable chroot / "live" system). Filesystems are
# automatically mounted from the partitioning module. Filesystems
# listed here are **extra**. The filesystems listed in *extraMounts*
# are mounted in all target systems. The filesystems listed in
# *extraMountsEfi* are mounted in the target system **only** if
# the host machine uses UEFI.
---
# Extra filesystems to mount. The key's value is a list of entries; each
# entry has four keys:
# - device The device node to mount
# - fs The filesystem type to use
# - mountPoint Where to mount the filesystem
# - options (optional) Extra options to pass to mount(8)
#
extraMounts:
- device: proc
fs: proc
mountPoint: /proc
- device: sys
fs: sysfs
mountPoint: /sys
- device: /dev
mountPoint: /dev
options: bind
- device: tmpfs
fs: tmpfs
mountPoint: /run
- device: /run/udev
mountPoint: /run/udev
options: bind
extraMountsEfi:
- device: efivarfs
fs: efivarfs
mountPoint: /sys/firmware/efi/efivars
+14
View File
@@ -0,0 +1,14 @@
backend: apt
operations:
- remove:
- 'live-boot'
- 'live-boot-doc'
- 'live-config'
- 'live-config-doc'
- 'live-config-systemd'
- 'live-config-systemd'
- 'live-tools'
- 'live-task-localisation'
- 'live-task-recommended'
- 'calamares-settings-debian'
+5
View File
@@ -0,0 +1,5 @@
---
unpack:
- source: "/run/live/medium/live/filesystem.squashfs"
sourcefs: "squashfs"
destination: ""
+17
View File
@@ -0,0 +1,17 @@
---
userGroup: users
defaultGroups:
- cdrom
- floppy
- sudo
- audio
- dip
- video
- plugdev
- netdev
- lpadmin
- scanner
- bluetooth
autologinGroup: autologin
sudoersGroup: sudo
setRootPassword: false
+17
View File
@@ -0,0 +1,17 @@
---
showSupportUrl: true
showKnownIssuesUrl: true
showReleaseNotesUrl: true
requirements:
requiredStorage: 10
requiredRam: 1.0
check:
- storage
- ram
- power
- root
required:
- storage
- ram
- root
+91
View File
@@ -0,0 +1,91 @@
# 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 ]
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
- networkcfg
- hwclock
- services-systemd
- bootloader-config
- grubcfg
- bootloader
- 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: debian
# 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
@@ -0,0 +1,10 @@
# 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']
# We don't want the screensaver to enable on the live media while installing
[org.gnome.desktop.lockdown]
disable-lock-screen=true
[org.gnome.desktop.session]
idle-delay=0
+9
View File
@@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Name=Add Calamares Desktop Icon
Exec=add-calamares-desktop-icon
StartupNotify=false
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
X-KDE-autostart-phase=1
+5
View File
@@ -0,0 +1,5 @@
.debhelper/
calamares-settings-debian.substvars
calamares-settings-debian/
debhelper-build-stamp
files
+123
View File
@@ -1,3 +1,126 @@
calamares-settings-debian (10.0.25-2) unstable; urgency=medium
* Initial source-only upload
* Update standards version to 4.4.0
-- Jonathan Carter <jcc@debian.org> Mon, 05 Aug 2019 21:30:20 +0200
calamares-settings-debian (10.0.25-1) unstable; urgency=medium
* New upstream release
- Refine fix for initramfs permissions, only apply
when encryption is enabled
-- Jonathan Carter <jcc@debian.org> Fri, 05 Jul 2019 17:37:33 +0200
calamares-settings-debian (10.0.24-1) unstable; urgency=medium
* New upstream release
- Fix path in previous CVE bug fix
-- Jonathan Carter <jcc@debian.org> Wed, 03 Jul 2019 13:29:07 +0000
calamares-settings-debian (10.0.23-1) unstable; urgency=medium
* New upstream release
- Fixes permissions for initramfs image (CVE-2019-13179)
(Closes: #931373)
-- Jonathan Carter <jcc@debian.org> Wed, 03 Jul 2019 13:05:47 +0000
calamares-settings-debian (10.0.20-1) unstable; urgency=medium
* New upstream release
- Configure Desktop icon for calamares
-- Jonathan Carter <jcc@debian.org> Thu, 18 Apr 2019 08:18:37 +0000
calamares-settings-debian (10.0.19-1) unstable; urgency=medium
* New upstream release
- Don't install unnecessary efi file (Closes: #927102)
- Fix distribution description
- Fix release notes URL
-- Jonathan Carter <jcc@debian.org> Mon, 15 Apr 2019 13:32:36 +0000
calamares-settings-debian (10.0.18-1) unstable; urgency=medium
* New upstream releas
- fix efi install path to EFI/debian
* Update to debhelper-compat (=12)
-- Jonathan Carter <jcc@debian.org> Fri, 15 Feb 2019 16:06:39 +0200
calamares-settings-debian (10.0.17-1) unstable; urgency=medium
* New upstream release
- explicitly remove calamares-settings-debian from calamares packages
module
-- Jonathan Carter <jcc@debian.org> Wed, 16 Jan 2019 19:14:36 +0200
calamares-settings-debian (10.0.16-1) unstable; urgency=medium
* New upstream release
* Fix package description (Closes: #918222)
-- Jonathan Carter <jcc@debian.org> Wed, 16 Jan 2019 12:15:28 +0200
calamares-settings-debian (10.0.15-1) unstable; urgency=medium
* New upstream release
* Update standards version to 4.3.0
-- Jonathan Carter <jcc@debian.org> Tue, 08 Jan 2019 10:48:47 +0200
calamares-settings-debian (10.0.14-1) unstable; urgency=medium
* New upstream release
-- Jonathan Carter <jcc@debian.org> Mon, 10 Dec 2018 15:32:26 +0200
calamares-settings-debian (10.0.13-1) unstable; urgency=medium
* New upstream release
* Add libglib2.0-bin to build-depends
-- Jonathan Carter <jcc@debian.org> Sat, 01 Dec 2018 11:40:55 +0200
calamares-settings-debian (10.0.10-2) unstable; urgency=medium
* Fix diverts (Closes: #909492)
-- Jonathan Carter <jcc@debian.org> Tue, 25 Sep 2018 14:32:01 +0200
calamares-settings-debian (10.0.10-1) unstable; urgency=medium
* New upstream release
-- Jonathan Carter <jcc@debian.org> Wed, 19 Sep 2018 10:58:27 +0200
calamares-settings-debian (10.0.9-1) unstable; urgency=medium
* New usptream release
* Add divert to hide original Calamares icon
* Update standards version to 4.2.1
-- Jonathan Carter <jcc@debian.org> Tue, 18 Sep 2018 20:17:54 +0200
calamares-settings-debian (10.0.8-2) unstable; urgency=medium
* Fix watch file
* Update standards version to 4.2.0
-- Jonathan Carter <jcc@debian.org> Thu, 09 Aug 2018 09:29:48 +0200
calamares-settings-debian (10.0.8-1) unstable; urgency=medium
* New upstream release
* Update watch file
-- Jonathan Carter <jcc@debian.org> Mon, 25 Jun 2018 12:29:07 +0200
calamares-settings-debian (10.0.3-1) unstable; urgency=medium
* New upstream release
-1
View File
@@ -1 +0,0 @@
11
+3 -3
View File
@@ -2,8 +2,8 @@ Source: calamares-settings-debian
Section: utils
Priority: optional
Maintainer: Jonathan Carter <jcc@debian.org>
Build-Depends: debhelper (>= 11)
Standards-Version: 4.1.4
Build-Depends: debhelper-compat (= 12), libglib2.0-bin
Standards-Version: 4.3.0
Homepage: https://salsa.debian.org/live-team/calamares-settings-debian
Vcs-Git: https://salsa.debian.org/live-team/calamares-settings-debian-packaging.git
Vcs-Browser: https://salsa.debian.org/live-team/calamares-settings-debian-packaging
@@ -18,7 +18,7 @@ Depends: calamares,
${misc:Depends}
Provides: calamares-settings
Description: Debian theme and settings for the Calamares Installer
Calamares is a genereic installer framework for Linux distributions.
Calamares is a generic installer framework for Linux distributions.
By default, it contains a set of boilerplate wording and images. This
package provides the latest Debian artwork as well as scripts that
supports EFI installations.
+4
View File
@@ -2,4 +2,8 @@ calamares etc
calamares-modules/* usr/lib/calamares/modules
scripts/* usr/sbin
*.desktop usr/share/applications
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
add-calamares-desktop-icon usr/bin
+5
View File
@@ -0,0 +1,5 @@
# Only meant to be run by calamares, so its scripts wouldn't have manpages
calamares-settings-debian: binary-without-manpage
# We don't provide this file on purpose
calamares-settings-debian: diversion-for-unknown-file
+12
View File
@@ -0,0 +1,12 @@
#!/bin/sh
set -e
case "$1" in
remove)
# Restore original Calamares icon
dpkg-divert --quiet --rename --package calamares-settings-debian \
--remove /usr/share/applications/calamares.desktop
;;
esac
#DEBHELPER#
+13
View File
@@ -0,0 +1,13 @@
#!/bin/sh
set -e
case "$1" in
install|upgrade)
# Hide upstream calamares icon when this package is installed
dpkg-divert --quiet --package calamares-settings-debian \
--divert /usr/share/applications/calamares.desktop.orig \
--rename /usr/share/applications/calamares.desktop
;;
esac
#DEBHELPER#
+2
View File
@@ -0,0 +1,2 @@
version=4
https://salsa.debian.org/live-team/calamares-settings-debian/tags .*/calamares-settings-debian-(.*)\.tar\.gz
Executable
+15
View File
@@ -0,0 +1,15 @@
#!/bin/sh
###
# Wrapper for running calamares on Debian live media
###
# Stale file left behind by live-build that messes with partitioning
sudo mv /etc/fstab /etc/fstab.orig.calamares
# Access control to run calamares as root for xwayland
xhost +si:localuser:root
pkexec calamares
xhost -si:localuser:root
# Restore stale fstab, for what it's worth
sudo mv /etc/fstab.orig.calamares /etc/fstab
+13
View File
@@ -0,0 +1,13 @@
[Desktop Entry]
Type=Application
Version=1.0
Name=Install Debian
GenericName=Calamares Installer
Exec=install-debian
Comment=Calamares — Installer for Debian Live
Keywords=calamares;system;install;debian;installer
Icon=install-debian
Terminal=false
Categories=Qt;System;
StartupWMClass=calamares
StartupNotify=True
+21
View File
@@ -0,0 +1,21 @@
#!/bin/bash
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
# 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
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
else
echo " * install grub... (bios)"
DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils
fi
+21
View File
@@ -0,0 +1,21 @@
#!/bin/sh
#
# Writes the final sources.list file
#
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
RELEASE="buster"
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/updates main
deb-src http://security.debian.org/debian-security/ $RELEASE/updates main
EOF
exit 0
+25
View File
@@ -0,0 +1,25 @@
#!/bin/sh
CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g")
MEDIUM_PATH="/run/live/medium"
RELEASE="buster"
if [ "$1" = "-u" ]; then
umount $CHROOT/$MEDIUM_PATH
rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list
chroot $CHROOT apt-get update
exit 0
fi
# Remove the base sources, we will configure sources in a later phase
rm -f $CHROOT/etc/apt/sources.list.d/base.list
mkdir -p $CHROOT/$MEDIUM_PATH
mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH
echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list
chroot $CHROOT apt-get update
# Attempt safest way to remove cruft
rmdir $CHROOT/run/live/medium
rmdir $CHROOT/run/live
exit 0