diff options
| author | Jonathan Bauer | 2014-03-11 17:07:24 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-03-11 17:07:24 +0100 |
| commit | 1354b6921c7661af32c2dbeda54a183e22145e15 (patch) | |
| tree | 13fc7441bfd2a70aa637445be6f3a2ebf4fea66d /remote/modules/nvidia_libs | |
| parent | [nvidia_kernel] port to new chroot-run functionality (diff) | |
| download | tm-scripts-1354b6921c7661af32c2dbeda54a183e22145e15.tar.gz tm-scripts-1354b6921c7661af32c2dbeda54a183e22145e15.tar.xz tm-scripts-1354b6921c7661af32c2dbeda54a183e22145e15.zip | |
[nvidia_libs] port to new chroot-run functionality
Diffstat (limited to 'remote/modules/nvidia_libs')
| -rw-r--r-- | remote/modules/nvidia_libs/nvidia_libs.build | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/remote/modules/nvidia_libs/nvidia_libs.build b/remote/modules/nvidia_libs/nvidia_libs.build index 1a7e9a5b..38f60d09 100644 --- a/remote/modules/nvidia_libs/nvidia_libs.build +++ b/remote/modules/nvidia_libs/nvidia_libs.build @@ -29,17 +29,23 @@ build() { /NVIDIA/nvidia-installer --no-nouveau-check --no-network --no-backup --no-rpms --no-runlevel-check --no-distro-scripts --no-cc-version-check --no-x-check --no-precompiled-interface --silent --no-kernel-module EOF pinfo "chroot terminated, cleaning up" + + # move whiteout list to its /opt/openslx/etc/nvidia.whiteout + if [ -e "${MODULE_BUILD_DIR}/overlay.whiteout.list" ]; then + mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/etc" + mv "${MODULE_BUILD_DIR}/overlay.whiteout.list" "${MODULE_BUILD_DIR}/opt/openslx/etc/nvidia.whiteout" + fi - pdebug "Handling whiteouts ..." - local WHITEOUT_LIST="${MODULE_BUILD_DIR}/opt/openslx/etc/nvidia.whiteout" - rm -f -- "$WHOUTEOUT_LIST" - mkdir -p "$(dirname "$WHITEOUT_LIST")" || perror "Could not create $(dirname "$WHITEOUT_LIST")" - pdebug "Searching for overlayfs-whiteouts ..." - for WHITEOUT in $(find "$MODULE_BUILD_DIR" -lname "(overlay-whiteout)"); do - pdebug "Whiteout found: $WHITEOUT" - echo "/./${WHITEOUT#$MODULE_BUILD_DIR}" >> "$WHITEOUT_LIST" - rm -f -- "$WHITEOUT" || perror "Could not delete whiteout $WHITEOUT!" - done + #pdebug "Handling whiteouts ..." + #local WHITEOUT_LIST="${MODULE_BUILD_DIR}/opt/openslx/etc/nvidia.whiteout" + #rm -f -- "$WHOUTEOUT_LIST" + #mkdir -p "$(dirname "$WHITEOUT_LIST")" || perror "Could not create $(dirname "$WHITEOUT_LIST")" + #pdebug "Searching for overlayfs-whiteouts ..." + #for WHITEOUT in $(find "$MODULE_BUILD_DIR" -lname "(overlay-whiteout)"); do +# pdebug "Whiteout found: $WHITEOUT" +# echo "/./${WHITEOUT#$MODULE_BUILD_DIR}" >> "$WHITEOUT_LIST" +# rm -f -- "$WHITEOUT" || perror "Could not delete whiteout $WHITEOUT!" +# done rm -rf "$MODULE_BUILD_DIR/NVIDIA" } |