diff options
author | Simon Rettberg | 2014-02-24 11:58:58 +0100 |
---|---|---|
committer | Simon Rettberg | 2014-02-24 11:58:58 +0100 |
commit | 672d6dacea77c60b787a57499e2a4965ecc4a15d (patch) | |
tree | 4f765cec2b83896b4d63e5a4232e1d0d63cfcfa3 /remote/modules/nvidia_libs | |
parent | Sorry, jetzt korrekte Verzeichnis. (diff) | |
download | tm-scripts-672d6dacea77c60b787a57499e2a4965ecc4a15d.tar.gz tm-scripts-672d6dacea77c60b787a57499e2a4965ecc4a15d.tar.xz tm-scripts-672d6dacea77c60b787a57499e2a4965ecc4a15d.zip |
[nvidia_libs] Fix indentation
Diffstat (limited to 'remote/modules/nvidia_libs')
-rw-r--r-- | remote/modules/nvidia_libs/nvidia_libs.build | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/remote/modules/nvidia_libs/nvidia_libs.build b/remote/modules/nvidia_libs/nvidia_libs.build index 9dd4c0e2..7e4e86c7 100644 --- a/remote/modules/nvidia_libs/nvidia_libs.build +++ b/remote/modules/nvidia_libs/nvidia_libs.build @@ -6,7 +6,7 @@ fetch_source() { build() { local KERNELSRCDIR="$MODULE_DIR/../kernel/ksrc" # kernel sources - local TEMPDIR="$MODULE_DIR/temp" + local TEMPDIR="$MODULE_DIR/temp" local ROOTLOWERDIR="/" local ROOTUPPERDIR="$MODULE_DIR/build" local ROOTBINDDIR="$TEMPDIR/rootbind" @@ -15,7 +15,7 @@ build() { local NVIDIA="$MODULE_DIR/src/$REQUIRED_NVIDIA" local NVIDIAEXTRACTDIR="$ROOTMOUNTDIR/NVIDIA" local NVEXTRACTDIR="/NVIDIA" # This is relative to the chroot. - + make_dirs () { [ -d "$TEMPDIR" ] && rm -rf "$TEMPDIR" mkdir -p "$TEMPDIR" || perror "Could not create base directory for mount directories $TEMPDIR." @@ -23,23 +23,23 @@ build() { mkdir -p "$DIR" || perror "Could not create directory for mount directory $DIR." done } - + mount_dirs () { pinfo "Executing bind- and overlay mounts ..." mount -o bind "$ROOTLOWERDIR" "$ROOTBINDDIR" || perror "Could not mount (bind) $ROOTLOWERDIR to $ROOTBINDDIR." mount -o remount,ro "$ROOTBINDDIR" || perror "Could not remount $ROOTBINDDIR ro read-only." mount -t overlayfs overlayfs -o lowerdir="$ROOTBINDDIR",upperdir="$ROOTUPPERDIR" "$ROOTMOUNTDIR" \ - || perror "Could not mount (overlayfs) $ROOTLOWERDIR, $ROOTUPPERDIR to $BINDDIR." + || perror "Could not mount (overlayfs) $ROOTLOWERDIR, $ROOTUPPERDIR to $BINDDIR." pinfo "Executing bind mounts ($BINDMOUNTS) for chroot root dir ..." for MOUNT in $BINDMOUNTS; do - mount -o bind "$MOUNT" "$ROOTMOUNTDIR/$MOUNT" || perror "Could not mount (bind) $MOUNTS into chroot root dir." + mount -o bind "$MOUNT" "$ROOTMOUNTDIR/$MOUNT" || perror "Could not mount (bind) $MOUNTS into chroot root dir." done } - + # We inject a bashrc to be executed later within the chroot. gen_bashrc () { local COMMON_OPTIONS=' --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 ' - + cat >"$ROOTMOUNTDIR/$HOME/.bashrc"<<-EOF echo "chroot successful." alias ll='ls -alF' # A little convenience for debugging purposes. @@ -47,24 +47,24 @@ build() { cd "$NVEXTRACTDIR" ./nvidia-installer $COMMON_OPTIONS --no-kernel-module # Do the work! exit # Out-comment this for debugging: Then script stays in chroot. -EOF + EOF } - + unpack_nvidia () { - [ -d "$NVIDIAEXTRACTDIR" ] && rm -rf "$NVIDIAEXTRACTDIR" - pinfo "Unpacking NVidia archive ($NVIDIA) ..." - sh "$NVIDIA" --extract-only --target "$NVIDIAEXTRACTDIR" || perror "Could not extract $NVIDIA to $NVIDIAEXTRACTDIR." + [ -d "$NVIDIAEXTRACTDIR" ] && rm -rf "$NVIDIAEXTRACTDIR" + pinfo "Unpacking NVidia archive ($NVIDIA) ..." + sh "$NVIDIA" --extract-only --target "$NVIDIAEXTRACTDIR" || perror "Could not extract $NVIDIA to $NVIDIAEXTRACTDIR." } - + umount_dirs () { # Let's tidy the place, or at least the mounts: Otherwise these would stack up, and we do not like that, don't we. - for MOUNT in $BINDMOUNTS; do - umount "$ROOTMOUNTDIR/$MOUNT" || pwarning "Could not unmount $ROOTMOUNTDIR/$MOUNT!" - done - umount "$ROOTMOUNTDIR" || pwarning "Could not unmount $ROOTMOUNTDIR!" - umount "$ROOTBINDDIR" || pwarning "Could not unmount $ROOTBINDDIR!" + for MOUNT in $BINDMOUNTS; do + umount "$ROOTMOUNTDIR/$MOUNT" || pwarning "Could not unmount $ROOTMOUNTDIR/$MOUNT!" + done + umount "$ROOTMOUNTDIR" || pwarning "Could not unmount $ROOTMOUNTDIR!" + umount "$ROOTBINDDIR" || pwarning "Could not unmount $ROOTBINDDIR!" } - + clean_whiteouts () { # The case of these overlay whiteouts should be investigated instead of just killing them. But for now... pdebug "Searching for overlayfs-whiteouts ..." @@ -73,24 +73,24 @@ EOF rm -f "$WHITEOUT" || perror "Could not delete whiteout $WHITEOUT!" done } - + clean_temp () { rm -rf "$TEMPDIR" || perror "Could not clean/delete temp directory $TEMPDIR." rm -rf "$ROOTUPPERDIR/NVIDIA" } - + # Main stuff pinfo "Generating temporary directories ..." make_dirs pinfo "Mounting directories ..." mount_dirs - + pinfo "Injecting .bashrc into later chroot ..." gen_bashrc - + pinfo "Unpacking NVidia-Installer ..." unpack_nvidia - + pinfo "Ready to chroot - compiling may take some time." pdebug "--- chroot ---------------------------------------------------------------------" pdebug "- -" @@ -104,13 +104,13 @@ EOF pdebug "--------------------------------------------------------------------------------" chroot "$ROOTMOUNTDIR" pinfo "chroot terminated." - + pinfo "Unmount directories ..." umount_dirs - + pinfo "Cleaning whiteouts ..." clean_whiteouts - + pinfo "Cleaning / deleting temp directories." clean_temp } |