Fix minor oversights

Author: 3XX0

conf/hooks/10-devices.sh

@@ -16,7 +16,7 @@ tmpfs                   /dev            tmpfs   x-create=dir,rw,nosuid,noexec,mo
 /dev/full               /dev/full       none    x-create=file,bind,rw,nosuid,noexec
 /dev/urandom            /dev/urandom    none    x-create=file,bind,rw,nosuid,noexec
 /dev/random             /dev/random     none    x-create=file,bind,rw,nosuid,noexec
-/dev/pts                /dev/pts        none    x-create=dir,rbind,rw,nosuid,noexec
+/dev/pts                /dev/pts        none    x-create=dir,bind,rw,nosuid,noexec
 /dev/ptmx               /dev/ptmx       none    x-create=file,bind,rw,nosuid,noexec
 /dev/console            /dev/console    none    x-create=file,bind,rw,nosuid,noexec
 /dev/shm                /dev/shm        none    x-create=dir,bind,rw,nosuid,noexec,nodev

conf/hooks/99-nvidia.sh

@@ -3,10 +3,13 @@
 # Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.
 
 set -eu
+shopt -s lastpipe
 
 source "${ENROOT_LIBEXEC_PATH}/common.sh"
 
-readonly $(grep "^NVIDIA_" "${ENROOT_ENVIRON}")
+grep "^NVIDIA_" "${ENROOT_ENVIRON}" | while read -r var; do
+    export "${var}"
+done
 
 cli_args=("--no-cgroups" "--ldconfig=@$(command -v ldconfig.real || command -v ldconfig)")
 

src/common.sh

@@ -95,7 +95,7 @@ common::realpath() {
     if ! rpath=$(readlink -f "${path}" 2> /dev/null); then
         common::err "No such file or directory: ${path}"
     fi
-    echo "${rpath}"
+    printf "%s" "${rpath}"
 }
 
 common::envsubst() {

src/runtime.sh

@@ -17,7 +17,7 @@ runtime::_do_mounts() {
     local -r rootfs="$1"
     local -a mounts=()
 
-    readarray -t mounts <<< "$2"; shift
+    readarray -t mounts <<< "$2"
 
     # Generate the mount configuration file from the rootfs fstab.
     common::envsubst "${rootfs}/etc/fstab" >> "${mount_file}"
@@ -47,7 +47,7 @@ runtime::_do_environ() {
     local -r rootfs="$1"
     local -a environ=()
 
-    readarray -t environ <<< "$2"; shift
+    readarray -t environ <<< "$2"
 
     # Generate the environment configuration file from the rootfs.
     common::envsubst "${rootfs}/etc/environment" >> "${environ_file}"