Merge branch 'master' into kpartx

7 files changed, 88 insertions, 0 deletions

diff --git a/user/livecd-support/APKBUILD b/user/livecd-support/APKBUILD
new file mode 100644
index 000000000..85fca324e
--- /dev/null
+++ b/user/livecd-support/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=livecd-support
+pkgver=1.0
+pkgrel=0
+pkgdesc="Support files for booting Adélie live media"
+url="https://www.adelielinux.org/"
+arch="noarch"
+options="!check suid"  # Metapackage
+license="NCSA"
+subpackages="$pkgname-kde $pkgname-lxqt $pkgname-mate $pkgname-horizon"
+depends=""
+install="livecd-support.post-install livecd-support.post-deinstall"
+source="kde.sddm.conf
+	lxqt.sddm.conf
+	mate.sddm.conf
+	horizon-ui
+	"
+
+package() {
+	mkdir -p $pkgdir
+}
+
+horizon() {
+	pkgdesc="Add the ability to install Adélie from live media"
+	depends="horizon-qt5 horizon netsurf partitionmanager xterm"
+
+	install -D -m4755 "$srcdir"/horizon-ui "$subpkgdir"/usr/sbin/horizon-ui
+
+	mkdir -p "$subpkgdir"/usr/share/applications
+	cat >"$subpkgdir"/usr/share/applications/horizon.desktop <<DESKTOP
+[Desktop Entry]
+Type=Application
+Version=1.1
+Name=System Installation
+Comment=Install Adélie Linux to your computer
+Icon=system-software-install
+Exec=/usr/sbin/horizon-ui
+Categories=System;
+DESKTOP
+}
+
+
+kde() {
+	pkgdesc="$pkgdesc (KDE spin)"
+	depends="livecd-support adelie-kde-theme kde sddm x11"
+	install -D -m644 "$srcdir"/kde.sddm.conf "$subpkgdir"/etc/sddm.conf.d/kde.conf
+}
+
+lxqt() {
+	pkgdesc="$pkgdesc (LXQt spin)"
+	depends="livecd-support lxqt-desktop sddm x11"
+	install -D -m644 "$srcdir"/lxqt.sddm.conf "$subpkgdir"/etc/sddm.conf.d/lxqt.conf
+}
+
+mate() {
+	pkgdesc="$pkgdesc (MATE spin)"
+	depends="livecd-support mate-complete sddm x11"
+	install -D -m644 "$srcdir"/mate.sddm.conf "$subpkgdir"/etc/sddm.conf.d/mate.conf
+}
+
+sha512sums="eddcc68917b4dc376bb9b7e7ed5e2c06379957c787c7152e654f31adb402f5811463bff69ce2a41a2cb87b0fa83a4aa3718b63d830eb9ee46b7d0d2058663d34  kde.sddm.conf
+9a9a61035c0a8c5ee84d235f319ca158216056221d03a0f5a3846982cb6110c569d7b4eadd2e24de66a75a428c18850e0393e20412e0edcfc8ad41c9d4783604  lxqt.sddm.conf
+603d2a5b1fdad0cb0abfefa8a4019c690ee4f5f9ac45057eeeac3bac3207e7871bdb32a564791fb99d965959b39a7de979d575db2694c2d1d88a4a16b68adb25  mate.sddm.conf
+b6d39b2feb0aa400ac7013d6b8c9080ab00ffc1c8b40dbf9489df999fe08b86aebd878c84d968a53ad29bc2a2c30209d8c6ff5daa4171aab03d5b921f966e08d  horizon-ui"
diff --git a/user/livecd-support/horizon-ui b/user/livecd-support/horizon-ui
new file mode 100644
index 000000000..e984e9476
--- /dev/null
+++ b/user/livecd-support/horizon-ui
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# Welcome to Adélie Linux.
+# This script allows you to run Horizon as the live user.
+#
+
+horizon-qt5
+if [ $? -eq 0 ]; then horizon-run-qt5; fi
diff --git a/user/livecd-support/kde.sddm.conf b/user/livecd-support/kde.sddm.conf
new file mode 100644
index 000000000..d8b190abe
--- /dev/null
+++ b/user/livecd-support/kde.sddm.conf
@@ -0,0 +1,3 @@
+[Autologin]
+User=live
+Session=plasma.desktop
diff --git a/user/livecd-support/livecd-support.post-deinstall b/user/livecd-support/livecd-support.post-deinstall
new file mode 100644
index 000000000..cfd0c59ac
--- /dev/null
+++ b/user/livecd-support/livecd-support.post-deinstall
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed -i 's/pam_unix.so nullok_secure$/pam_unix.so/' /etc/pam.d/base-auth
diff --git a/user/livecd-support/livecd-support.post-install b/user/livecd-support/livecd-support.post-install
new file mode 100644
index 000000000..9556f5a52
--- /dev/null
+++ b/user/livecd-support/livecd-support.post-install
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed -i 's/pam_unix.so$/pam_unix.so nullok_secure/' /etc/pam.d/base-auth
diff --git a/user/livecd-support/lxqt.sddm.conf b/user/livecd-support/lxqt.sddm.conf
new file mode 100644
index 000000000..797782fed
--- /dev/null
+++ b/user/livecd-support/lxqt.sddm.conf
@@ -0,0 +1,3 @@
+[Autologin]
+User=live
+Session=lxqt.desktop
diff --git a/user/livecd-support/mate.sddm.conf b/user/livecd-support/mate.sddm.conf
new file mode 100644
index 000000000..56e53c6fb
--- /dev/null
+++ b/user/livecd-support/mate.sddm.conf
@@ -0,0 +1,3 @@
+[Autologin]
+User=live
+Session=mate.desktop