X-Git-Url: https://git.plutz.net/?p=rpi_small;a=blobdiff_plain;f=xfce.mk;h=3fd16479a3512378b11d3839145dd2c8fbb3ad53;hp=58c1a43f06c74858934b306c723e5943a75e53cd;hb=HEAD;hpb=4bb200e9c0d07b49a199f865bd9b0cd66a818a1f

diff --git a/xfce.mk b/xfce.mk
index 58c1a43..3fd1647 100644
--- a/xfce.mk
+++ b/xfce.mk
@@ -1,11 +1,8 @@
-PACKAGES := ${PACKAGES} xserver-xorg-video-fbturbo xserver-xorg xserver-xorg-input-evdev nodm xfce4 xauth x2x xvkbd blueman xfce4-terminal xinput xinput-calibrator xfce4-clipman-plugin xfce4-whiskermenu-plugin
+PACKAGES := ${PACKAGES} xserver-xorg-video-fbturbo xserver-xorg xserver-xorg-input-evdev nodm xfce4 xauth x11-xserver-utils x2x xvkbd blueman xfce4-terminal xinput xinput-calibrator xfce4-clipman-plugin xfce4-whiskermenu-plugin
 
-.PHONY: xuser xfce
-
-${IMGFILE}: xuser xfce
-
-xuser: imgmount root_copy
-	-chroot "$<" useradd -m local
-
-xfce: imgmount files_xfce/
+.PHONY: xfce
+${IMGFILE}: xfce
+xfce: imgmount root_copy files_xfce/
 	cp -a files_xfce/. "$</"
+	-chroot "$<" useradd -s /opt/busybox/ash -m local
+	chroot "$<" adduser local video