mirror of https://github.com/JPyke3/mbp-manjaro
fix hybrid installer
This commit is contained in:
parent
9f4842ceeb
commit
b9a17032dd
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
prettyName: "Join Our Forum"
|
||||
url: "https://forum.manjaro.org/"
|
|
@ -1,6 +0,0 @@
|
|||
---
|
||||
groupsUrl: https://gitlab.manjaro.org/packages/community/jade/calamares-netinstall-settings/-/raw/master/netinstall-applications.yaml
|
||||
|
||||
label:
|
||||
sidebar: "Software"
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
groupsUrl: https://gitlab.manjaro.org/packages/community/jade/calamares-netinstall-settings/-/raw/master/netinstall-software.yaml
|
||||
|
||||
label:
|
||||
sidebar: "Software"
|
|
@ -0,0 +1,7 @@
|
|||
---
|
||||
|
||||
backend: pacman
|
||||
|
||||
skip_if_no_internet: false
|
||||
update_db: true
|
||||
update_system: true
|
|
@ -1,3 +0,0 @@
|
|||
---
|
||||
prettyName: "Release Notes"
|
||||
url: "https://arcolinux.info/getting-to-know-arcolinux-d-b/"
|
|
@ -2,9 +2,13 @@ modules-search: [ local ]
|
|||
|
||||
|
||||
instances:
|
||||
- id: applications
|
||||
- id: software
|
||||
module: netinstall
|
||||
config: netinstall-applications.conf
|
||||
config: netinstall-software.conf
|
||||
|
||||
- id: forum-sign-on
|
||||
module: webview
|
||||
config: forum-sign-on.conf
|
||||
|
||||
|
||||
sequence:
|
||||
|
@ -13,7 +17,7 @@ sequence:
|
|||
- users
|
||||
- locale
|
||||
- keyboard
|
||||
- netinstall@applications
|
||||
- netinstall@software
|
||||
- partition
|
||||
- summary
|
||||
- exec:
|
||||
|
@ -39,8 +43,10 @@ sequence:
|
|||
- grubcfg
|
||||
- bootloader
|
||||
- postcfg
|
||||
- packages
|
||||
- umount
|
||||
- show:
|
||||
#- webview@forum-sign-on
|
||||
- finished
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
# use extra packages as defined in pkglist to activate a full profile
|
||||
# for remote netinstall, comment line 388(write_settings_conf "$1") in /usr/lib/manjaro-tools/util-yaml.sh
|
||||
# or if netinstall is not wanted turn extra=true and delete /livefs/etc/calamares/settings.conf
|
||||
# or delete /livefs/etc/calamares/settings.conf
|
||||
extra="false"
|
||||
|
||||
################ install ################
|
||||
|
@ -33,7 +33,7 @@ custom_boot_args="'quiet'"
|
|||
#oem_used="true"
|
||||
|
||||
# configure calamares for netinstall
|
||||
netinstall="true"
|
||||
#netinstall="true"
|
||||
|
||||
# configure calamares to use chrootcfg instead of unpackfs
|
||||
# chrootcfg="false"
|
||||
|
@ -94,4 +94,4 @@ login_shell="/bin/zsh"
|
|||
# names must match openrc service names
|
||||
# services in enable_openrc array don't need to be listed here
|
||||
# enable_openrc_live=('manjaro-live' 'mhwd-live' 'pacman-init' 'mirrors-live')
|
||||
# enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live')
|
||||
# enable_systemd_live=('manjaro-live' 'pacman-init' 'mirrors-live')
|
Loading…
Reference in New Issue