From b9a17032ddf20ddb24d504b1d60aab45c46896bd Mon Sep 17 00:00:00 2001
From: Vitor Lopes <vlopes@gmail.com>
Date: Sun, 21 Jun 2020 04:57:09 +0100
Subject: [PATCH] fix hybrid installer

---
 .../etc/calamares/modules/forum-sign-on.conf         |  3 +++
 .../calamares/modules/netinstall-applications.conf   |  6 ------
 .../etc/calamares/modules/netinstall-software.conf   |  5 +++++
 .../live-overlay/etc/calamares/modules/packages.conf |  7 +++++++
 .../live-overlay/etc/calamares/modules/webview.conf  |  3 ---
 .../webdad/live-overlay/etc/calamares/settings.conf  | 12 +++++++++---
 community/webdad/profile.conf                        |  6 +++---
 7 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 community/webdad/live-overlay/etc/calamares/modules/forum-sign-on.conf
 delete mode 100644 community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf
 create mode 100644 community/webdad/live-overlay/etc/calamares/modules/netinstall-software.conf
 create mode 100644 community/webdad/live-overlay/etc/calamares/modules/packages.conf
 delete mode 100644 community/webdad/live-overlay/etc/calamares/modules/webview.conf

diff --git a/community/webdad/live-overlay/etc/calamares/modules/forum-sign-on.conf b/community/webdad/live-overlay/etc/calamares/modules/forum-sign-on.conf
new file mode 100644
index 0000000..9d150e9
--- /dev/null
+++ b/community/webdad/live-overlay/etc/calamares/modules/forum-sign-on.conf
@@ -0,0 +1,3 @@
+---
+prettyName: "Join Our Forum"
+url:        "https://forum.manjaro.org/"
diff --git a/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf b/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf
deleted file mode 100644
index b8906b5..0000000
--- a/community/webdad/live-overlay/etc/calamares/modules/netinstall-applications.conf
+++ /dev/null
@@ -1,6 +0,0 @@
----
-groupsUrl: https://gitlab.manjaro.org/packages/community/jade/calamares-netinstall-settings/-/raw/master/netinstall-applications.yaml
-
-label:
-    sidebar: "Software"
-
diff --git a/community/webdad/live-overlay/etc/calamares/modules/netinstall-software.conf b/community/webdad/live-overlay/etc/calamares/modules/netinstall-software.conf
new file mode 100644
index 0000000..cb86ea7
--- /dev/null
+++ b/community/webdad/live-overlay/etc/calamares/modules/netinstall-software.conf
@@ -0,0 +1,5 @@
+---
+groupsUrl: https://gitlab.manjaro.org/packages/community/jade/calamares-netinstall-settings/-/raw/master/netinstall-software.yaml
+
+label:
+    sidebar: "Software"
\ No newline at end of file
diff --git a/community/webdad/live-overlay/etc/calamares/modules/packages.conf b/community/webdad/live-overlay/etc/calamares/modules/packages.conf
new file mode 100644
index 0000000..cb7533d
--- /dev/null
+++ b/community/webdad/live-overlay/etc/calamares/modules/packages.conf
@@ -0,0 +1,7 @@
+---
+
+backend: pacman
+
+skip_if_no_internet: false
+update_db: true
+update_system: true
\ No newline at end of file
diff --git a/community/webdad/live-overlay/etc/calamares/modules/webview.conf b/community/webdad/live-overlay/etc/calamares/modules/webview.conf
deleted file mode 100644
index 1ee8105..0000000
--- a/community/webdad/live-overlay/etc/calamares/modules/webview.conf
+++ /dev/null
@@ -1,3 +0,0 @@
----
-prettyName: "Release Notes"
-url:        "https://arcolinux.info/getting-to-know-arcolinux-d-b/"
diff --git a/community/webdad/live-overlay/etc/calamares/settings.conf b/community/webdad/live-overlay/etc/calamares/settings.conf
index 54894c1..3623f17 100644
--- a/community/webdad/live-overlay/etc/calamares/settings.conf
+++ b/community/webdad/live-overlay/etc/calamares/settings.conf
@@ -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
 
 
diff --git a/community/webdad/profile.conf b/community/webdad/profile.conf
index ad79cf7..e30f5f6 100644
--- a/community/webdad/profile.conf
+++ b/community/webdad/profile.conf
@@ -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')
\ No newline at end of file