From 1e31257209a3e0756ab314979c66b47047cee24d Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 2 Feb 2022 00:00:55 +0000 Subject: added bootscripts to nm --- repo/system/elogind.xibuild | 66 ++++++++++++++++++++++++++++++++++++++ repo/system/networkmanager.xibuild | 17 ++++++++++ 2 files changed, 83 insertions(+) create mode 100644 repo/system/elogind.xibuild diff --git a/repo/system/elogind.xibuild b/repo/system/elogind.xibuild new file mode 100644 index 0000000..d7179b4 --- /dev/null +++ b/repo/system/elogind.xibuild @@ -0,0 +1,66 @@ +#!/bin/bash + +MAKEDEPS=(make docbook-xml docbook-xsl libxslt) +DEPS=(dbus pam polkit) + +PKG_VER=246.10 +SOURCE=https://github.com/elogind/elogind/archive/v$PKG_VER/elogind-$PKG_VER.tar.gz +DESC="The standalone logind daemon" + +prepare () { + sed -i '/Disable polkit/,+8 d' meson.build && + + +} + +build () { + mkdir build && + cd build && + + meson --prefix=/usr \ + --buildtype=release \ + -Dcgroup-controller=elogind \ + -Ddbuspolicydir=/etc/dbus-1/system.d \ + -Dman=auto \ + .. && + ninja +} + +package () { + DESTDIR=$PKG_DEST ninja install && + ln -sfv libelogind.pc $PKG_DEST/usr/lib/pkgconfig/libsystemd.pc && + ln -sfvn elogind $PKG_DEST/usr/include/systemd + + + sed -e '/\[Login\]/a KillUserProcesses=no' \ + -i $PKG_DEST/etc/elogind/logind.conf + + cat >> $PKG_DEST/etc/pam.d/system-session << "EOF" && +# Begin elogind addition + +session required pam_loginuid.so +session optional pam_elogind.so + +# End elogind addition +EOF + cat > $PKG_DEST/etc/pam.d/elogind-user << "EOF" +# Begin /etc/pam.d/elogind-user + +account required pam_access.so +account include system-account + +session required pam_env.so +session required pam_limits.so +session required pam_unix.so +session required pam_loginuid.so +session optional pam_keyinit.so force revoke +session optional pam_elogind.so + +auth required pam_deny.so +password required pam_deny.so + +# End /etc/pam.d/elogind-user +EOF + + +} diff --git a/repo/system/networkmanager.xibuild b/repo/system/networkmanager.xibuild index a734b1a..c825177 100644 --- a/repo/system/networkmanager.xibuild +++ b/repo/system/networkmanager.xibuild @@ -5,6 +5,12 @@ DEPS=(jansson libndp curl wpa_supplicant newt nss polkit libpsl audit dbus gobje PKG_VER=1.35.5 SOURCE=https://download.gnome.org/sources/NetworkManager/$(echo $PKG_VER | cut -d. -f-2)/NetworkManager-$PKG_VER.tar.xz + +BOOTSCRIPTS=blfs-bootscripts-20210826 +ADDITIONAL=( + https://anduin.linuxfromscratch.org/BLFS/blfs-bootscripts/$BOOTSCRIPTS.tar.xz + ) + DESC="Network connection manager and user applications" prepare () { @@ -48,5 +54,16 @@ EOF auth-polkit=true EOF +cat > $PKG_DEST/etc/NetworkManager/conf.d/dhcp.conf << "EOF" +[main] +dhcp=dhclient +EOF + # TODO add boot scripts + + tar xf $BOOTSCRIPTS.tar.xz + cd $BOOTSCRIPTS + make DESTDIR=$PKG_DEST install-networkmanager + + } -- cgit v1.2.1