diff --git a/list-common.sh b/list-common.sh
index d654dcf..c1a1677 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -155,9 +155,7 @@ buildignore udev-configure-printer
# We don't need those
buildignore yast2-samba-client
buildignore yast2-vpn
-buildignore yast2-vm
buildignore yast2-journal
-buildignore yast2-nfs-client
buildignore yast2-auth-client
buildignore yast2-sudo
@@ -187,6 +185,10 @@ buildignore open-vm-tools
# Pulls in tcl
buildignore usb_modeswitch
+# This was previously required by base
+install patterns-yast-yast2_basis
+installPattern yast2_basis
+
# This was previously required by rest_cd_core
install kernel-default
install kernel-firmware
@@ -284,3 +286,7 @@ install yast2-trans-zh_CN
install yast2-trans-zh_TW
install zd1211-firmware
install zip
+
+# Workaround for bsc#1131492
+buildignore ntp
+
diff --git a/list-gnome.sh b/list-gnome.sh
index 436b1a5..92bdb8f 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -27,12 +27,7 @@ buildignore noto-sans-kr-regular-fonts
install libreoffice-writer
# Packages for the installer
-install live-net-installer
-install skelcd-openSUSE # Needed for README.BETA
-install setxkbmap # Needed by yast2-keyboard
-install yast2-qt-branding-openSUSE
-install cracklib
-install cracklib-dict-full
+source "$PWD/list-installer.sh"
# Pulls in sane-backends
buildignore simple-scan
diff --git a/list-installer.sh b/list-installer.sh
new file mode 100644
index 0000000..84dcf21
--- /dev/null
+++ b/list-installer.sh
@@ -0,0 +1,16 @@
+# Packages for the installer
+install live-net-installer
+install skelcd-openSUSE # Needed for README.BETA
+install setxkbmap # Needed by yast2-keyboard
+install skelcd-control-openSUSE # Just pulled in for deps
+install cracklib-dict-full
+
+# Fonts for the installation (taken from installation-images)
+install thai-fonts
+install lklug-fonts
+install ipa-gothic-fonts
+install indic-fonts
+install arabic-kacst-fonts
+# too big
+# install un-fonts
+
diff --git a/list-kde.sh b/list-kde.sh
index 030bbe9..e6549f3 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -26,12 +26,7 @@ buildignore kdenetwork4-filesharing
buildignore gnome-keyring
# Packages for the installer
-install live-net-installer
-install skelcd-openSUSE # Needed for README.BETA
-install setxkbmap # Needed by yast2-keyboard
-install yast2-qt-branding-openSUSE
-install cracklib
-install cracklib-dict-full
+source "$PWD/list-installer.sh"
buildignore oxygen5-icon-theme-large
buildignore gwenview5
diff --git a/list-x11.sh b/list-x11.sh
index 2c2ccd5..d68c509 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -31,7 +31,6 @@ buildignore python-base
buildignore aspell-en
buildignore ModemManager
-buildignore yast2-users
buildignore yast2-printer
buildignore avahi
buildignore fprintd
diff --git a/list-xfce.sh b/list-xfce.sh
index b100b0d..da58824 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -18,12 +18,7 @@ buildignore sbl
buildignore gnome-online-accounts
# Packages for the installer
-install live-net-installer
-install skelcd-openSUSE # Needed for README.BETA
-install setxkbmap # Needed by yast2-keyboard
-install yast2-qt-branding-openSUSE
-install cracklib
-install cracklib-dict-full
+source "$PWD/list-installer.sh"
buildignore aspell-en
install libxslt-tools
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 6f1e760..2e0654a 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -449,9 +449,13 @@
-
-
+
+
+
+
+
+
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 5ad0839..664ff55 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -450,9 +450,13 @@
-
-
+
+
+
+
+
+
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 969d974..b451739 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -463,8 +463,6 @@
-
-
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 06e6445..7e615d1 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Apr 3 14:45:56 UTC 2019 - Fabian Vogt
+
+- Split packages for installation into list-installer.sh, shared
+ between gnome, kde and xfce
+- Require yast2_basis pattern in list-common
+- Pull in skelcd-control-openSUSE for installer deps
+ (boo#1131235)
+- Add more fonts for the installation (boo#1131061)
+- Ignore ntp, workaround for bsc#1131492
+
-------------------------------------------------------------------
Mon Mar 25 15:59:12 UTC 2019 - Fabian Vogt
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 1d7608d..c43b612 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -449,9 +449,13 @@
-
-
+
+
+
+
+
+
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 20293a3..edc03bd 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -450,9 +450,13 @@
-
-
+
+
+
+
+
+
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 1172400..698cebc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -463,8 +463,6 @@
-
-
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index d7c9c45..2610472 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -280,12 +280,8 @@
-
-
-
-
@@ -309,6 +305,8 @@
+
+
@@ -403,6 +401,8 @@
+
+
@@ -439,9 +439,13 @@
-
-
+
+
+
+
+
+