Merge branch 'awilfox/for-beta5' into 'current'

Configuration updates for BETA5

Closes packages#1114 and #385

See merge request adelie/image!7

6 files changed, 31 insertions, 42 deletions

diff --git a/configs/base/base.installfile b/configs/base/base.installfile
index c6a3c48..45e41f3 100644
--- a/configs/base/base.installfile
+++ b/configs/base/base.installfile
@@ -22,6 +22,9 @@ pkginstall hdparm pciutils pcmciautils smartmontools usbutils
 # User convenience tools
 pkginstall bzip2 chrony gnupg kbd-keymaps less links lzop nano openssh tmux
 
+# Install all available documentation.
+pkginstall docs
+
 # Enable logging by default - can be disabled with `rc-update del sysklogd`
 svcenable sysklogd
 
@@ -31,5 +34,5 @@ repository https://distfiles.adelielinux.org/adelie/current/user
 # Live User
 username live
 useralias live Live User
-usergroups live disk,users,audio,video,cdrom,games,floppy,cdrw,ping
+usergroups live disk,users,audio,video,cdrom,games,floppy,cdrw,ping,usb
 pkginstall livecd-support
diff --git a/configs/base/kde.installfile b/configs/base/kde.installfile
index 4e47751..57c3bb4 100644
--- a/configs/base/kde.installfile
+++ b/configs/base/kde.installfile
@@ -1,12 +1,4 @@
-# Install KDE and SDDM auto-login for it.
-pkginstall livecd-support-horizon livecd-support-kde networkmanager
+# Install KDE.
+pkginstall livecd-support-kde
 
-# Start X on boot, if possible.
-svcenable udev boot
-svcenable udev-trigger boot
-svcenable bluetooth graphical
-svcenable elogind
-svcenable NetworkManager
-svcenable chronyd graphical
-svcenable sddm graphical
-svcenable wpa_supplicant
+inherit live-base.installfile
diff --git a/configs/base/live-base.installfile b/configs/base/live-base.installfile
new file mode 100644
index 0000000..8ff3125
--- /dev/null
+++ b/configs/base/live-base.installfile
@@ -0,0 +1,15 @@
+# Install the Live CD support files, Bluetooth support, and NetworkManager.
+pkginstall bluez livecd-support-horizon networkmanager
+
+# Install PulseAudio support by default.
+pkginstall pulseaudio
+
+# Start X on boot, if possible.
+svcenable udev boot
+svcenable udev-trigger boot
+svcenable elogind
+svcenable wpa_supplicant
+svcenable NetworkManager
+svcenable bluetooth graphical
+svcenable chronyd graphical
+svcenable sddm graphical
diff --git a/configs/base/lxqt.installfile b/configs/base/lxqt.installfile
index c2b619f..f06afef 100644
--- a/configs/base/lxqt.installfile
+++ b/configs/base/lxqt.installfile
@@ -1,11 +1,4 @@
-# Install LXQt and SDDM auto-login for it.
-pkginstall livecd-support-horizon livecd-support-lxqt networkmanager
+# Install LXQt.
+pkginstall livecd-support-lxqt
 
-# Start X on boot, if possible.
-svcenable udev boot
-svcenable udev-trigger boot
-svcenable elogind
-svcenable NetworkManager
-svcenable chronyd graphical
-svcenable sddm graphical
-svcenable wpa_supplicant
+inherit live-base.installfile
diff --git a/configs/base/mate.installfile b/configs/base/mate.installfile
index 359a1b8..6b2edad 100644
--- a/configs/base/mate.installfile
+++ b/configs/base/mate.installfile
@@ -1,11 +1,4 @@
-# Install MATE and SDDM auto-login for it.
-pkginstall livecd-support-horizon livecd-support-mate networkmanager
+# Install MATE.
+pkginstall livecd-support-mate
 
-# Start X on boot, if possible.
-svcenable udev boot
-svcenable udev-trigger boot
-svcenable elogind
-svcenable NetworkManager
-svcenable chronyd graphical
-svcenable sddm graphical
-svcenable wpa_supplicant
+inherit live-base.installfile
diff --git a/configs/base/xfce.installfile b/configs/base/xfce.installfile
index ec29354..fe2abbe 100644
--- a/configs/base/xfce.installfile
+++ b/configs/base/xfce.installfile
@@ -1,11 +1,4 @@
-# Install XFCE and SDDM auto-login for it.
-pkginstall livecd-support-horizon livecd-support-xfce networkmanager
+# Install XFCE.
+pkginstall livecd-support-xfce
 
-# Start X on boot, if possible.
-svcenable udev boot
-svcenable udev-trigger boot
-svcenable elogind
-svcenable NetworkManager
-svcenable chronyd graphical
-svcenable sddm graphical
-svcenable wpa_supplicant
+inherit live-base.installfile