Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ArchLinux installation with Xfce4 #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix ArchLinux installation with Xfce4 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de8eff
Fix ArchLinux installation with Xfce4
pgoltsev Oct 25, 2018
3d17849
Put creation of 'network' group after users creation
pgoltsev Oct 25, 2018
7ce1fca
Add home directory as root during user creation
pgoltsev Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions include/desktop/dbus/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,18 @@ do_configure()
make_dirs /run/dbus /var/run/dbus
chmod 644 "${CHROOT_DIR}/etc/machine-id"
chroot_exec -u root dbus-uuidgen > "${CHROOT_DIR}/etc/machine-id"
case "${DISTRIB}:${ARCH}:${SUITE}" in
archlinux:*)
local user_names="systemd-timesync systemd-network colord systemd-resolve polkitd avahi dbus"
for username in ${user_names}
do
chroot_exec -u root groupadd -f ${username}
chroot_exec -u root useradd -g ${username} -s /bin/false -d / ${username}
done

chroot_exec -u root groupadd -f network
;;
esac
return 0
}

Expand Down
8 changes: 7 additions & 1 deletion include/desktop/xfce/deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ do_configure()
{
msg ":: Configuring ${COMPONENT} ... "
local xsession="${CHROOT_DIR}$(user_home ${USER_NAME})/.xsession"
echo 'exec dbus-run-session xfce4-session' > "${xsession}"
local command='exec dbus-run-session xfce4-session'
case "${DISTRIB}:${ARCH}:${SUITE}" in
archlinux:*)
command='exec dbus-launch xfce4-session'
;;
esac
echo ${command} > "${xsession}"
return 0
}