kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-23 11:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(guix): set FHS local state path for daemon socket

Browse source
This commit is contained in:
vxtls 2026-03-08 19:37:19 -04:00
parent 49537b4100
commit aa72935a6f
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
steps-guix/guix-1.5.0/pass1.sh
View file

@ -205,6 +205,8 @@ src_configure() {
./configure \ ./configure \
--prefix="${PREFIX}" \ --prefix="${PREFIX}" \
--libdir="${LIBDIR}" \ --libdir="${LIBDIR}" \
--sysconfdir=/etc \
--localstatedir=/var \
--host="${host_triplet}" \ --host="${host_triplet}" \
--build="${host_triplet}" --build="${host_triplet}"
} }

4
steps-guix/improve/guix-build-iso.sh
View file

@ -6,8 +6,10 @@ set -e
. /steps/bootstrap.cfg . /steps/bootstrap.cfg
. /steps/env . /steps/env
daemon_socket="/var/guix/daemon-socket/socket" guix_localstate_dir="/var/guix"
daemon_socket="${guix_localstate_dir}/daemon-socket/socket"
out_dir="/external/guix-images" out_dir="/external/guix-images"
export GUIX_DAEMON_SOCKET="${daemon_socket}"
if [ ! -S "${daemon_socket}" ]; then if [ ! -S "${daemon_socket}" ]; then
echo "guix-daemon socket is missing: ${daemon_socket}" >&2 echo "guix-daemon socket is missing: ${daemon_socket}" >&2

6
steps-guix/improve/guix-daemon-and-pull.sh
View file

@ -6,13 +6,15 @@ set -e
. /steps/bootstrap.cfg . /steps/bootstrap.cfg
. /steps/env . /steps/env
daemon_socket="/var/guix/daemon-socket/socket" guix_localstate_dir="/var/guix"
daemon_socket="${guix_localstate_dir}/daemon-socket/socket"
channel_root="/var/lib/guix/local-channels" channel_root="/var/lib/guix/local-channels"
channel_repo="${channel_root}/guix" channel_repo="${channel_root}/guix"
channel_work="/tmp/guix-local-channel-work" channel_work="/tmp/guix-local-channel-work"
channels_file="/root/.config/guix/channels.scm" channels_file="/root/.config/guix/channels.scm"
distfiles="${DISTFILES:-/external/distfiles}" distfiles="${DISTFILES:-/external/distfiles}"
PATH="/usr/sbin:/sbin:${PATH}" PATH="/usr/sbin:/sbin:${PATH}"
export GUIX_DAEMON_SOCKET="${daemon_socket}"
have_group() { have_group() {
if command -v getent >/dev/null 2>&1; then if command -v getent >/dev/null 2>&1; then
@ -30,7 +32,7 @@ have_user() {
fi fi
} }
mkdir -p /proc /sys /dev /var/guix/daemon-socket /var/lib/guix /root/.config/guix mkdir -p /proc /sys /dev "${guix_localstate_dir}/daemon-socket" /var/lib/guix /root/.config/guix
mount | grep ' on /proc ' >/dev/null 2>&1 || mount -t proc proc /proc mount | grep ' on /proc ' >/dev/null 2>&1 || mount -t proc proc /proc
mount | grep ' on /sys ' >/dev/null 2>&1 || mount -t sysfs sysfs /sys mount | grep ' on /sys ' >/dev/null 2>&1 || mount -t sysfs sysfs /sys
mount | grep ' on /dev ' >/dev/null 2>&1 || mount -t devtmpfs devtmpfs /dev mount | grep ' on /dev ' >/dev/null 2>&1 || mount -t devtmpfs devtmpfs /dev