Try to kill ukui process via calamares

Signed-off-by: Stefano Capitani <stefano@manjaro.org>
This commit is contained in:
Stefano Capitani 2020-08-15 22:01:36 +02:00
parent 9cc5c83b52
commit 8739f2a624
3 changed files with 104 additions and 1 deletions

View file

@ -0,0 +1,34 @@
# Configuration for the shell process job.
#
# Executes a list of commands found under the key *script*.
# If the top-level key *dontChroot* is true, then the commands
# are executed in the context of the live system, otherwise
# in the context of the target system. In all of the commands,
# the following substitutions will take place:
# - `@@ROOT@@` is replaced by the root mount point of the **target**
# system from the point of view of the command (for chrooted
# commands, that will be */*).
# - `@@USER@@` is replaced by the username, set on the user page.
#
# The (global) timeout for the command list can be set with
# the *timeout* key. The value is a time in seconds, default
# is 10 seconds if not set.
#
# If a command starts with "-" (a single minus sign), then the
# return value of the command following the - is ignored; otherwise,
# a failing command will abort the installation. This is much like
# make's use of - in a command.
#
# The value of *script* may be:
# - a single string; this is one command that is executed.
# - a list of strings; these are executed one at a time, by
# separate shells (/bin/sh -c is invoked for each command).
# - an object, specifying a key *command* and (optionally)
# a key *timeout* to set the timeout for this specific
# command differently from the global setting.
---
dontChroot: true
timeout: 10
script:
- command : "pkill ukui-flash-disk"

View file

@ -0,0 +1,52 @@
---
modules-search: [ local ]
instances:
- id: ukuiflashdisk
module: shellprocess
config: shellprocess-ukuiflashdisk.conf
sequence:
- show:
- welcome
- locale
- keyboard
- partition
- users
- summary
- exec:
- shellprocess@ukuiflashdisk
- partition
- mount
- unpackfs
- networkcfg
- machineid
- fstab
- locale
- keyboard
- localecfg
- luksopenswaphookcfg
- luksbootkeyfile
- initcpiocfg
- initcpio
- users
- displaymanager
- mhwdcfg
- hwclock
- services
- grubcfg
- bootloader
- postcfg
- umount
- show:
- finished
branding: manjaro
prompt-install: true
dont-chroot: false
oem-setup: false
disable-cancel: false
disable-cancel-during-exec: true
quit-at-end: false

View file

@ -43,11 +43,24 @@ displaymanager="lightdm"
# disable_openrc=() # disable_openrc=()
# unset defaults to given values # unset defaults to given values
# addgroups="lp,network,power,wheel" addgroups="lp,network,power,wheel,users,storage,input,audio"
# add strict snaps: strict_snaps="core core18 gnome-3-28-1804 gtk-common-themes snap-store"
# strict_snaps=""
# add classic snaps: classic_snaps="code"
# classic_snaps=""
# choose the snap channel. Possible options are: stable, candidate, beta, edge
# snap_channel="candidate"
# the same workgroup name if samba is used # the same workgroup name if samba is used
# smb_workgroup="" # smb_workgroup=""
# default system shell is bash
# '/etc/defaults/useradd': " "
# userShell : "/bin/zsh"
# empty value will not be used
# user_shell="/bin/zsh"
################# live-session ################# ################# live-session #################
# unset defaults to given value # unset defaults to given value
@ -59,6 +72,10 @@ hostname="manjaro-ukui"
# unset defaults to given value # unset defaults to given value
# password="manjaro" # password="manjaro"
# the login shell
# defaults to bash
#login_shell="/bin/zsh"
# unset defaults to given values # unset defaults to given values
# names must match systemd service names # names must match systemd service names
# services in enable_systemd array don't need to be listed here # services in enable_systemd array don't need to be listed here