summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorChristian Rößler2014-03-21 15:01:32 +0100
committerChristian Rößler2014-03-21 15:01:32 +0100
commit52c75b7e40c9655495418c0c776bafefd75bc458 (patch)
tree9e039681bdae94718afaca510f53a46d91908cfb /remote
parent[chroot.inc] Added parameter to bind-remount (diff)
downloadtm-scripts-52c75b7e40c9655495418c0c776bafefd75bc458.tar.gz
tm-scripts-52c75b7e40c9655495418c0c776bafefd75bc458.tar.xz
tm-scripts-52c75b7e40c9655495418c0c776bafefd75bc458.zip
[logging.inc, chroot.inc] Some redirections for debugging within a chroot
Diffstat (limited to 'remote')
-rw-r--r--remote/includes/chroot.inc3
-rw-r--r--remote/modules/vmware/vmware.build3
2 files changed, 4 insertions, 2 deletions
diff --git a/remote/includes/chroot.inc b/remote/includes/chroot.inc
index f6581680..fc9738ec 100644
--- a/remote/includes/chroot.inc
+++ b/remote/includes/chroot.inc
@@ -72,7 +72,7 @@ chroot_gen_autoexec() {
# create the script to be automatically executed.
cat >"${CHROOT_MOUNTDIR}/autoexec.bat"<<-EOF
#!/bin/bash
- echo "chroot success."
+ echo "chroot started successfully."
EOF
# dump the piped input to it
@@ -128,6 +128,7 @@ chroot_run() {
chroot_gen_autoexec || perror "'chroot_gen_autoexec' failed with $?."
# do the chroot
+ exec 0>&8
chroot --userspec root:root "${CHROOT_MOUNTDIR}" /autoexec.bat
local RET=$?
if [ "$RET" -eq 0 ]; then
diff --git a/remote/modules/vmware/vmware.build b/remote/modules/vmware/vmware.build
index 8636f335..8dba3c11 100644
--- a/remote/modules/vmware/vmware.build
+++ b/remote/modules/vmware/vmware.build
@@ -21,16 +21,17 @@ fetch_source() {
}
build() {
-
# 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}"
pinfo "Installing vmware per chroot..."
chroot_run "${MODULE_BUILD_DIR}" <<-EOF
+ # PS1='\[\e[1;33m\](chroot) \u@\h:\w\$ \[\e[1;32m\]' /bin/bash -norc # un-comment for debugging within chroot
yes | sh /"${VMWARE_BUNDLE_FILE}" --eulas-agreed --console --required
vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmnet $(which gcc) "${MODULES_DIR}"/kernel/ksrc/include/ vmplayer vmnet
vmware-modconfig --console --build-mod -k "${SYS_UTS_RELEASE}" vmmon $(which gcc) "${MODULES_DIR}"/kernel/ksrc/include/ vmplayer vmmon
+ PS1='\[\e[1;33m\](chroot) \u@\h:\w\$ \[\e[1;32m\]' /bin/bash -norc # un-comment for debugging within chroot
EOF
# cleanup unneeded files