diff options
| author | Christian Rößler | 2014-03-24 16:01:42 +0100 |
|---|---|---|
| committer | Christian Rößler | 2014-03-24 16:01:42 +0100 |
| commit | 395f941fda040b0f6b4350869ab6992af10e0977 (patch) | |
| tree | b5f181d699ecd8dca4a4045de99a37761246818d /remote/modules/vmware | |
| parent | [vmware, chroot] vmware pseudo-deletions in case workstation is installed in (diff) | |
| parent | [kernel] remove forgotten pinfo used while dev'ing (diff) | |
| download | tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.tar.gz tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.tar.xz tm-scripts-395f941fda040b0f6b4350869ab6992af10e0977.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts
Conflicts:
remote/modules/vmware/vmware.build
Diffstat (limited to 'remote/modules/vmware')
| -rw-r--r-- | remote/modules/vmware/vmware.build | 4 | ||||
| -rw-r--r-- | remote/modules/vmware/vmware.conf | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/vmware.build index b4baf9c2..98ee2b8d 100644 --- a/remote/modules/vmware/vmware.build +++ b/remote/modules/vmware/vmware.build @@ -22,12 +22,14 @@ fetch_source() { build() { local DELETE_FILES - local OLDIFS="$IFS" DELETE_FILES=$(for LINE in $REQUIRED_VMWARE_DELETIONS;do echo rm -rf $LINE; done) # prepare the build directory with the files needed during the chroot cp "${MODULE_DIR}/src/$VMWARE_BUNDLE_FILE" "${MODULE_BUILD_DIR}/$VMWARE_BUNDLE_FILE" cp -r "${MODULE_DIR}/patches" "${MODULE_BUILD_DIR}" + + # sanity check to see if KERNEL_HEADERS_PATH is set and exists + [ -z "${KERNEL_HEADERS_PATH}" -o ! -e "${KERNEL_HEADERS_PATH}" ] && perror "KERNEL_HEADERS_PATH ('"${KERNEL_HEADERS_PATH}"') not found. Was the kernel module built?" pinfo "Installing vmware per chroot..." chroot_run "${MODULE_BUILD_DIR}" <<-EOF diff --git a/remote/modules/vmware/vmware.conf b/remote/modules/vmware/vmware.conf index 51e73b85..017d1d5b 100644 --- a/remote/modules/vmware/vmware.conf +++ b/remote/modules/vmware/vmware.conf @@ -1,5 +1,6 @@ REQUIRED_DOWNLOAD_BASE="http://softwareupdate.vmware.com/cds/vmw-desktop/ws/10.0.1/1379776/linux/core/" REQUIRED_TYPE="workstation" +REQUIRED_MODULES="kernel" REQUIRED_DIRECTORIES=" /etc/vmware /usr/sbin |