Compare commits

..

3 Commits
0.22 ... 0.22.1

Author SHA1 Message Date
5aa8bd3333 comparepkg: remove obsolete help opt 2021-01-05 17:58:41 +01:00
699ea06445 Merge pull request 's6: force artix-live dependency on displaymanagers' (#47) from Dudemanguy/artools:master into master
Reviewed-on: artix/artools#47
2021-01-05 17:56:22 +01:00
4b9a883113 s6: force artix-live dependency on displaymanagers
A bit of a hack, but it's good enough. The liveiso has the problem of
the display manager service starting before the artix-live service
starts. This means the artix user isn't created yet and thus autologin
fails. What needs to happen is that every display manager service should
have a dependency on artix-live. However, s6-rc has no way to specify
optional dependencies so simply adding it to the script package can't be
a solution. Instead what we can do is to just check for the existence of
these services when building the iso (this is the only case where we
care about this dependency) and manually add it to the dependencies file
and rebuild the database.
2021-01-05 10:31:48 -06:00
2 changed files with 9 additions and 1 deletions

View File

@@ -158,7 +158,7 @@ move=false
readonly table="%-18s %-18s %-25s %-27s %-27s %-10s"
usage() {
echo "Usage: ${0##*/} [options] (with -q [libname])"
echo "Usage: ${0##*/} [options]"
echo ' -u Show upgrade packages'
echo ' -d Show downgrade packages'
echo ' -m Show packages to move'

View File

@@ -42,6 +42,14 @@ add_svc_s6(){
fi
done
# force artix-live as a dependency if these display managers exist
for displaymanager in gdm lightdm-srv lxdm sddm; do
if [ -f "${work_dir}"/rootfs/etc/s6/sv/$displaymanager/dependencies ]; then
echo "artix-live" >> "${work_dir}"rootfs/etc/s6/sv/$displaymanager/dependencies
fi
done
chroot "$mnt" sh /usr/share/libalpm/scripts/s6-rc-db-update-hook
# rebuild s6-linux-init binaries
chroot "$mnt" rm -r /etc/s6/current
chroot "$mnt" s6-linux-init-maker -1 -N -f /etc/s6/skel -G "/usr/bin/agetty -L -8 tty1 115200" -c /etc/s6/current /etc/s6/current