Use minijail0 instead of jchroot.

Clean environment with env when entering chroot. Use read -r.
dnschneid · Mar 8, 2016 · 8fcc551 · 8fcc551
1 parent 56eccfa
commit 8fcc551
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/host-bin/enter-chroot b/host-bin/enter-chroot
@@ -684,18 +684,16 @@ if [ -n "$NOLOGIN" ]; then
     fi
 elif [ -n "$SYSTEMD" ]; then
     [ -e "/run/crouton/$NAME.systemd.pid" ] && \
-        read SYSTEMD_PID < "/run/crouton/$NAME.systemd.pid"
-
+        read -r SYSTEMD_PID < "/run/crouton/$NAME.systemd.pid"
     if [ -z "SYSTEMD_PID" ] || ! pwdx $SYSTEMD_PID >/dev/null 2>&1; then
         echo "Starting systemd..."
-        /usr/local/bin/jchroot "$CHROOT" /bin/systemd &
+        env -i /sbin/minijail0 -C "$CHROOT" -f "/run/crouton/$NAME.systemd.pid" -i -I /bin/bash -c "exec /lib/systemd/systemd"
         sleep 1
-        pidof -s systemd > "/run/crouton/$NAME.systemd.pid"
-        read SYSTEMD_PID < "/run/crouton/$NAME.systemd.pid"
+        read -r SYSTEMD_PID < "/run/crouton/$NAME.systemd.pid"
     fi
     if [ -n "$SYSTEMD_PID" ]; then
         echo "Entering systemd PID $SYSTEMD_PID..."
-        nsenter -t $SYSTEMD_PID -p -r -w -u -- su - "$USERNAME"
+        env -i TERM="$TERM" nsenter -t $SYSTEMD_PID -p -r -w -u -- su - "$USERNAME"
     else
         echo "Could not start systemd" >&2
     fi