Fixed NoDM and OctoPrint building

stage1/01-sys-tweaks/00-run.sh

@@ -11,7 +11,9 @@ on_chroot << EOF
 if ! id -u ${FIRST_USER_NAME} >/dev/null 2>&1; then
 	adduser --disabled-password --gecos "" ${FIRST_USER_NAME}
 fi
-adduser --disabled-password --gecos "" octoprint
+if ! id -u octoprint >/dev/null 2>&1; then
+  adduser --disabled-password --gecos "" octoprint
+fi
 echo "${FIRST_USER_NAME}:${FIRST_USER_PASS}" | chpasswd
 echo "octoprint:$(cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c20)" | chpasswd 
 echo "root:$(cat /dev/urandom | tr -dc _A-Z-a-z-0-9 | head -c20)" | chpasswd

stage2/04-octoprint/01-run.sh

@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
-if [ -d /home/octoprint ];
+on_chroot << EOF
+if [ -d /home/octoprint ]; then
   cd /home/octoprint || exit 1
   mkdir OctoPrint || exit 1
   cd OctoPrint || exit 1
@@ -9,3 +10,4 @@ if [ -d /home/octoprint ];
   pip install pip --upgrade || exit 1
   pip install octoprint || exit 1
 fi
+EOF

stage3/00-install-packages/01-run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-echo -n -e "NODM_USER=${FIRST_USER_NAME}\nNODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile" > /etc/nodm.conf
+echo -n -e "NODM_USER=${FIRST_USER_NAME}\nNODM_XSESSION=/home/${FIRST_USER_NAME}/.xprofile" > ${ROOTFS_DIR}/etc/nodm.conf
 
 on_chroot << EOF
 update-alternatives --install /usr/bin/x-www-browser \

stage3/00-install-packages/files/nodm.conf

@@ -1,2 +0,0 @@
-NODM_USER=pi
-NODM_XSESSION=/home/pi/.xprofile