From 37f93c0c1d8f116ff9767a210c3bd5ffa7c9b6c1 Mon Sep 17 00:00:00 2001 From: davedatum Date: Sun, 27 Oct 2019 17:47:08 +0000 Subject: [PATCH] calamares test --- .../etc/manjaro-tools/branding.desc.d | 87 +++++++++++++ .../live-overlay/etc/manjaro-tools/live.conf | 16 +++ .../etc/manjaro-tools/manjaro-tools.conf | 120 ++++++++++++++++++ .../{manjaro => tromjaro}/branding.desc | 2 +- .../{manjaro => tromjaro}/languages.png | Bin .../branding/{manjaro => tromjaro}/logo.png | Bin .../branding/{manjaro => tromjaro}/show.qml | 0 .../branding/{manjaro => tromjaro}/slide1.png | Bin .../branding/{manjaro => tromjaro}/slide2.png | Bin .../branding/{manjaro => tromjaro}/slide3.png | Bin .../branding/{manjaro => tromjaro}/slide4.png | Bin .../branding/{manjaro => tromjaro}/slide5.png | Bin .../branding/{manjaro => tromjaro}/squid.png | Bin .../usr/share/calamares/settings.conf | 2 +- 14 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 tromjaro/gnome/live-overlay/etc/manjaro-tools/branding.desc.d create mode 100644 tromjaro/gnome/live-overlay/etc/manjaro-tools/live.conf create mode 100644 tromjaro/gnome/live-overlay/etc/manjaro-tools/manjaro-tools.conf rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/branding.desc (99%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/languages.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/logo.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/show.qml (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/slide1.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/slide2.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/slide3.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/slide4.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/slide5.png (100%) rename tromjaro/gnome/live-overlay/usr/share/calamares/branding/{manjaro => tromjaro}/squid.png (100%) diff --git a/tromjaro/gnome/live-overlay/etc/manjaro-tools/branding.desc.d b/tromjaro/gnome/live-overlay/etc/manjaro-tools/branding.desc.d new file mode 100644 index 00000000..60ab9f1f --- /dev/null +++ b/tromjaro/gnome/live-overlay/etc/manjaro-tools/branding.desc.d @@ -0,0 +1,87 @@ +--- +componentName: tromjaro + +# This selects between different welcome texts. When false, uses +# the traditional "Welcome to the %1 installer.", and when true, +# uses "Welcome to the Calamares installer for %1." This allows +# to distinguish this installer from other installers for the +# same distribution. +welcomeStyleCalamares: false + +# Should the welcome image (productWelcome, below) be scaled +# up beyond its natural size? If false, the image does not grow +# with the window but remains the same size throughout (this +# may have surprising effects on HiDPI monitors). +welcomeExpandingLogo: true + +# Size and expansion policy for Calamares. +# - "normal" or unset, expand as needed, use *windowSize* +# - "fullscreen", start as large as possible, ignore *windowSize* +# - "noexpand", never expand, use *windowSize* +windowExpanding: noexpand + +# Size of Calamares window, expressed as w,h. Both w and h +# may be either pixels (suffix px) or font-units (suffix em). +# e.g. "800px,600px" +# "60em,480px" +# This setting is ignored if "fullscreen" is selected for +# *windowExpanding*, above. If not set, use constants defined +# in CalamaresUtilsGui, 800x520. +windowSize: 800px,520px + +# These are strings shown to the user in the user interface. +# There is no provision for translating them -- since they +# are names, the string is included as-is. +# +# The four Url strings are the Urls used by the buttons in +# the welcome screen, and are not shown to the user. Clicking +# on the "Support" button, for instance, opens the link supportUrl. +# If a Url is empty, the corresponding button is not shown. +# +# bootloaderEntryName is how this installation / distro is named +# in the boot loader (e.g. in the GRUB menu). +strings: + productName: TROMjaro Linux + shortProductName: TROMjaro + version: 18.0 + shortVersion: 18.0 + versionedName: TROMjaro Linux 18.0 "Illyria" + shortVersionedName: TROMjaro 18.0 + bootloaderEntryName: TROMjaro + +# These images are loaded from the branding module directory. +# +# productIcon is used as the window icon, and will (usually) be used +# by the window manager to represent the application. This image +# should be square, and may be displayed by the window manager +# as small as 16x16 (but possibly larger). +# productLogo is used as the logo at the top of the left-hand column +# which shows the steps to be taken. The image should be square, +# and is displayed at 80x80 pixels (also on HiDPI). +# productWelcome is shown on the welcome page of the application in +# the middle of the window, below the welcome text. It can be +# any size and proportion, and will be scaled to fit inside +# the window. Use `welcomeExpandingLogo` to make it non-scaled. +# Recommended size is 320x150. +images: + productLogo: "logo.png" + productIcon: "logo.png" + productWelcome: "languages.png" + +# The slideshow is displayed during execution steps (e.g. when the +# installer is actually writing to disk and doing other slow things). +slideshow: "show.qml" + +# Colors for text and background components. +# +# - sidebarBackground is the background of the sidebar +# - sidebarText is the (foreground) text color +# - sidebarTextHighlight sets the background of the selected (current) step. +# Optional, and defaults to the application palette. +# - sidebarSelect is the text color of the selected step. +# +style: + sidebarBackground: "#454948" + sidebarText: "#efefef" + sidebarTextSelect: "#4d915e" + sidebarTextHighlight: "#1a1c1b" diff --git a/tromjaro/gnome/live-overlay/etc/manjaro-tools/live.conf b/tromjaro/gnome/live-overlay/etc/manjaro-tools/live.conf new file mode 100644 index 00000000..48f6be71 --- /dev/null +++ b/tromjaro/gnome/live-overlay/etc/manjaro-tools/live.conf @@ -0,0 +1,16 @@ +# live session configuration + +# autologin +autologin=true + +# login shell +login_shell=/bin/bash + +# live username +username=tromjaro + +# live password +password=tromjaro + +# live group membership +addgroups='lp,network,power,sys,wheel' diff --git a/tromjaro/gnome/live-overlay/etc/manjaro-tools/manjaro-tools.conf b/tromjaro/gnome/live-overlay/etc/manjaro-tools/manjaro-tools.conf new file mode 100644 index 00000000..a126a832 --- /dev/null +++ b/tromjaro/gnome/live-overlay/etc/manjaro-tools/manjaro-tools.conf @@ -0,0 +1,120 @@ +###################################################### +################ manjaro-tools.conf ################## +###################################################### + +# default target branch +# target_branch=stable + +# default taget arch: auto detect +# target_arch=$(uname -m) + +# cache dir where buildpkg, buildtree cache packages/pkgbuild, builiso iso files +# cache_dir=/var/cache/manjaro-tools + +# build dir where buildpkg or buildiso chroots are created +# chroots_dir=/var/lib/manjaro-tools + +# log dir where log files are created +# log_dir='/var/log/manjaro-tools' + +# custom build mirror server +# build_mirror=https://mirror.netzspielplatz.de/manjaro/packages + +################ buildtree ############### + +# manjaro package tree +# repo_tree=('core' 'extra' 'community' 'multilib') + +# host_tree=https://github.com/manjaro + +# default https seems slow; try this +# host_tree_abs=git://projects.archlinux.org/svntogit + +################ buildpkg ################ + +# default pkg build list; name without .list extension +# build_list_pkg=default + +################ buildiso ################ + +#default branch for iso-profiles repo: v18.0 Illyria master>development release +# branch=v18.0 + +# default iso build list; name without .list extension +# build_list_iso=default + +# the dist release; default: auto +# dist_release=18.0 + +# the dist codename; default: auto +# dist_codename=Illyria + +# the OS branding; default: auto +# dist_name + +# the branding; default: auto +# dist_branding="MJRO" + +# compression used, possible values xz (default, best compression), gzip, lzma, lzo, lz4 +# lz4 is faster but worst compression, may be useful for locally testing isos +# iso_compression=xz + +# unset defaults to given value +# kernel="linux419" + +# gpg key; leave empty or commented to skip sfs signing +# gpgkey="" + +########## calamares preferences ########## +#See branding.desc.d for reference + +# welcome style for calamares: true="Welcome to the %1 installer." ; false="Welcome to the Calamares installer for %1." (default) +# welcomestyle=false + +# welcome image scaled (productWelcome) +# welcomelogo=true + +# size and expansion policy for Calamares (possible value: normal,fullscreen,noexpand) +# windowexp=noexpand + +# size of Calamares window, expressed as w,h. +# (possible units: pixel (px) or font-units (em)) +# windowsize="800px,520px" + +# colors for text and background components: + +# background of the sidebar +# sidebarbackground=#454948 + +# text color +# sidebartext=#efefef + +# background of the selected step +# sidebartextselect=#4d915e + +# text color of the selected step +# sidebartexthighlight=#1a1c1b + +################ deployiso ################ + +# the server user +# account=[SetUser] + +# Set to 'true' to use ssh-agent to store passphrase. +# ssh_agent=false + +# use alternative storage server (one or the other might be more stable) +# alt_storage=false + +# the server project: manjaro|manjaro-community +# determined automatically based on profile if unset +# project="[SetProject]" + +# set upload bandwidth limit in kB/s +# limit= + +# the torrent tracker urls, comma separated +# tracker_url='udp://mirror.strits.dk:6969' + +# Piece size, 2^n +# piece_size=21 diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/branding.desc similarity index 99% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/branding.desc index d515333b..60ab9f1f 100644 --- a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/branding.desc +++ b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/branding.desc @@ -1,5 +1,5 @@ --- -componentName: manjaro +componentName: tromjaro # This selects between different welcome texts. When false, uses # the traditional "Welcome to the %1 installer.", and when true, diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/languages.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/languages.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/languages.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/languages.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/logo.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/logo.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/logo.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/logo.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/show.qml b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/show.qml similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/show.qml rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/show.qml diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide1.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide1.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide1.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide1.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide2.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide2.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide2.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide2.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide3.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide3.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide3.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide3.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide4.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide4.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide4.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide4.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide5.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide5.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/slide5.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/slide5.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/squid.png b/tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/squid.png similarity index 100% rename from tromjaro/gnome/live-overlay/usr/share/calamares/branding/manjaro/squid.png rename to tromjaro/gnome/live-overlay/usr/share/calamares/branding/tromjaro/squid.png diff --git a/tromjaro/gnome/live-overlay/usr/share/calamares/settings.conf b/tromjaro/gnome/live-overlay/usr/share/calamares/settings.conf index 4b36ab84..4fe02c76 100644 --- a/tromjaro/gnome/live-overlay/usr/share/calamares/settings.conf +++ b/tromjaro/gnome/live-overlay/usr/share/calamares/settings.conf @@ -131,7 +131,7 @@ sequence: # here, Calamares then takes care of finding it and loading the contents. # # YAML: string. -branding: manjaro +branding: tromjaro # 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