Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installer/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.0
0.0.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
componentName: cusdeb
welcomeStyleCalamares: true
welcomeStyleCalamares: false
welcomeExpandingLogo: true
windowExpanding: normal
windowSize: 800px,580px
Expand All @@ -9,16 +9,16 @@ windowPlacement: center
strings:
productName: CusDeb OS
shortProductName: CusDeb
version: 1
shortVersion: 1
versionedName: CusDeb OS 1
shortVersionedName: CusDeb OS 1
version: ""
shortVersion: ""
versionedName: CusDeb OS
shortVersionedName: CusDeb OS
bootloaderEntryName: CusDeb OS
productUrl: https://github.com/CusDeb
supportUrl: https://github.com/CusDeb
knownIssuesUrl: https://github.com/CusDeb
releaseNotesUrl: https://github.com/CusDeb
donateUrl: https://github.com/CusDeb
productUrl: https://github.com/cusdeb-com/os
supportUrl: https://github.com/cusdeb-com/os
knownIssuesUrl: https://github.com/cusdeb-com/os/issues
releaseNotesUrl: https://github.com/cusdeb-com/os/releases
donateUrl: https://cusdeb.com/cdmag

sidebar: widget
navigation: widget
Expand All @@ -31,9 +31,9 @@ images:
slideshow: "show.qml"

style:
SidebarBackground: "#26475b"
SidebarBackground: "#74A7E2"
SidebarText: "#FFFFFF"
SidebarTextCurrent: "#fbfbfb"
SidebarBackgroundCurrent: "#265370"
SidebarTextCurrent: "#FFFFFF"
SidebarBackgroundCurrent: "#193576"

slideshowAPI: 2
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Presentation
Slide {
Image {
id: background1
source: "slide1.png"
source: "welcome.png"
width: 467; height: 280
fillMode: Image.PreserveAspectFit
anchors.centerIn: parent
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* CusDeb OS installer theme: pure white main window background. */
#mainApp { background-color: #FFFFFF; }
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,8 @@ operations:
- "^live-*"
- calamares-settings-debian
- calamares
- qml6-module-qtqml
- qml6-module-qtqml-models
- qml6-module-qtqml-workerscript
- qml6-module-qtquick
- qml6-module-qtquick-window
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Based on the Debian package default, with one addition: the live-only
# /usr/sbin/xdg-open wrapper (see includes.chroot/usr/sbin/xdg-open) must
# not be copied to the installed system, so it is excluded from the copy.
---
unpack:
- source: "/run/live/medium/live/filesystem.squashfs"
sourcefs: "squashfs"
destination: ""
exclude:
- /usr/sbin/xdg-open
34 changes: 34 additions & 0 deletions installer/config/includes.chroot/usr/sbin/xdg-open
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/bin/sh
# Wrapper around /usr/bin/xdg-open for the live installer session.
#
# Calamares runs as root (pkexec via calamares-install-debian), so
# QDesktopServices::openUrl() spawns xdg-open as root. A browser started
# as root cannot (and must not) attach to the live user's X session, so
# the welcome-page buttons (support/known-issues/release-notes) silently
# did nothing.
#
# pkexec gives root a PATH of /usr/sbin:/usr/bin:/sbin:/bin (no
# /usr/local/bin), so this file lives in /usr/sbin, ahead of the real
# /usr/bin/xdg-open. When invoked as root it re-runs the real xdg-open
# as the live user; otherwise it just forwards the call.
#
# pkexec (allow_gui=true in the Calamares polkit action) already passes
# the live session's DISPLAY and XAUTHORITY into root's environment, so
# they are inherited; the :- fallbacks below only cover callers that
# lack them.
#
# Note: this file is live-only. Calamares' unpackfs configuration
# (modules/unpackfs.conf) excludes it from the copy to the target disk,
# so it never lands on the installed system.

REAL_XDG_OPEN=/usr/bin/xdg-open
LIVE_USER=user

if [ "$(id -u)" = 0 ] && id "${LIVE_USER}" >/dev/null 2>&1; then
exec runuser -u "${LIVE_USER}" -- env \
DISPLAY="${DISPLAY:-:0}" \
XAUTHORITY="${XAUTHORITY:-/home/${LIVE_USER}/.Xauthority}" \
"${REAL_XDG_OPEN}" "$@"
fi

exec "${REAL_XDG_OPEN}" "$@"
7 changes: 7 additions & 0 deletions installer/config/package-lists/calamares.list.chroot
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
calamares
calamares-settings-debian

# QML modules required by the Calamares slideshow (slideshowAPI 2).
# Without them the exec-phase slideshow fails with
# "module "QtQuick.Window" is not installed" and shows a blank page.
qml6-module-qtquick
qml6-module-qtquick-window

# Password strength dictionary required by Calamares users module
# Without it the installer prints: "the password fails the dictionary check - error loading dictionary"
cracklib-runtime
Expand Down Expand Up @@ -83,6 +89,7 @@ usbutils
# Essentials
sudo
ca-certificates
xdg-utils

# Optional packages pre-installed in live so they are available in target
# regardless of Calamares network state. The optional-packages-apply job
Expand Down