From f14e8e6f58195606e54a8e50770ccd0553cc7a96 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Tue, 10 Oct 2023 20:49:08 -0500 Subject: user/livecd-support: Many improvements * Change install scripts to local.d scripts. * Add a local.d script to make dhcpcd setuid. (adelie/horizon#361) * Make the Desktop Entry file a real file instead of a heredoc. * Remove setuid bit from the shell script; we don't need this any more. * Pull in our new LXQt theme for a better experience. * Add XFCE subpackage. * Set PATH correctly for horizon-run-qt5 so it can find mkfs.vfat and friends. * Set the clock with chronyd if possible on boot, before the graphical environment starts. * Use sudo for partitionmanger. (adelie/horizon#368) Ref: #1081 --- user/livecd-support/APKBUILD | 56 +++++++++++++++-------- user/livecd-support/allow-nullpw.start | 6 +++ user/livecd-support/allow-nullpw.stop | 5 ++ user/livecd-support/dhcpcd-suid.start | 5 ++ user/livecd-support/horizon-ui | 4 +- user/livecd-support/horizon.desktop | 8 ++++ user/livecd-support/live.sudoersd | 3 ++ user/livecd-support/livecd-support.post-deinstall | 3 -- user/livecd-support/livecd-support.post-install | 3 -- user/livecd-support/set-time.start | 5 ++ user/livecd-support/xfce.sddm.conf | 3 ++ 11 files changed, 75 insertions(+), 26 deletions(-) create mode 100644 user/livecd-support/allow-nullpw.start create mode 100644 user/livecd-support/allow-nullpw.stop create mode 100644 user/livecd-support/dhcpcd-suid.start create mode 100644 user/livecd-support/horizon.desktop create mode 100644 user/livecd-support/live.sudoersd delete mode 100644 user/livecd-support/livecd-support.post-deinstall delete mode 100644 user/livecd-support/livecd-support.post-install create mode 100644 user/livecd-support/set-time.start create mode 100644 user/livecd-support/xfce.sddm.conf (limited to 'user') diff --git a/user/livecd-support/APKBUILD b/user/livecd-support/APKBUILD index 85fca324e..afd4554ec 100644 --- a/user/livecd-support/APKBUILD +++ b/user/livecd-support/APKBUILD @@ -2,19 +2,26 @@ # Maintainer: A. Wilcox pkgname=livecd-support pkgver=1.0 -pkgrel=0 +pkgrel=1 pkgdesc="Support files for booting Adélie live media" url="https://www.adelielinux.org/" arch="noarch" -options="!check suid" # Metapackage +options="!check" # Metapackage license="NCSA" -subpackages="$pkgname-kde $pkgname-lxqt $pkgname-mate $pkgname-horizon" +subpackages="$pkgname-kde $pkgname-lxqt $pkgname-mate $pkgname-xfce + $pkgname-horizon" depends="" -install="livecd-support.post-install livecd-support.post-deinstall" source="kde.sddm.conf lxqt.sddm.conf mate.sddm.conf + xfce.sddm.conf + horizon.desktop horizon-ui + dhcpcd-suid.start + allow-nullpw.start + allow-nullpw.stop + set-time.start + live.sudoersd " package() { @@ -23,21 +30,19 @@ package() { horizon() { pkgdesc="Add the ability to install Adélie from live media" - depends="horizon-qt5 horizon netsurf partitionmanager xterm" + depends="dhcpcd horizon-qt5 horizon netsurf partitionmanager sudo xterm" - install -D -m4755 "$srcdir"/horizon-ui "$subpkgdir"/usr/sbin/horizon-ui + install -D -m755 "$srcdir"/horizon-ui "$subpkgdir"/usr/sbin/horizon-ui + install -D -m644 "$srcdir"/live.sudoersd "$subpkgdir"/etc/sudoers.d/live-pm - mkdir -p "$subpkgdir"/usr/share/applications - cat >"$subpkgdir"/usr/share/applications/horizon.desktop <