Paths

src/freedombone-image-customise

@@ -1099,13 +1099,13 @@ function mesh_client_startup_applications {
 	echo 'X-GNOME-Autostart-enabled=true' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
 	echo 'Name=Tox Chat' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
 	echo 'Comment=Peer to peer encrypted communications' >> $rootdir/home/$MY_USERNAME/.config/autostart/tox.desktop
-	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME ~/.config
-	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME ~/Desktop
+	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.config
+	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop
 }
 
 function mesh_desktop_icons {
 	# qTox
-	chroot "$rootdir" ln -s ~/.config/autostart/tox.desktop ~/Desktop/tox.desktop
+	chroot "$rootdir" ln -s /home/$MY_USERNAME/.config/autostart/tox.desktop /home/$MY_USERNAME/Desktop/tox.desktop
 
 	# Terminal
 	echo '[Desktop Entry]' > $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
@@ -1116,7 +1116,7 @@ function mesh_desktop_icons {
 	echo 'Exec=mate-terminal' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 	echo 'StartupNotify=true' >> $rootdir/home/$MY_USERNAME/Desktop/terminal.desktop
 
-	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME ~/Desktop
+	chroot "$rootdir" chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop
 }
 
 function configure_user_interface {
@@ -1220,7 +1220,9 @@ username=$MY_USERNAME
 echo $"warning: creating initial user $username with well known password!"
 password=$MY_PASSWORD
 chroot "$rootdir" adduser --gecos $username --disabled-password $username
-echo $username:$password | chroot $rootdir /usr/sbin/chpasswd
+if [[ $VARIANT != "meshclient" && $VARIANT != "meshusb" ]]; then
+	echo $username:$password | chroot $rootdir /usr/sbin/chpasswd
+fi
 chroot "$rootdir" adduser $username sudo
 
 case "$MACHINE" in