[SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (7a49eb16b18915165259fb1c705c429eca137bfe)

Justin Boffemmyer scm at sourcemage.org
Sat Dec 27 03:03:52 EST 2008


GIT changes to test cauldron by Justin Boffemmyer <flux at sourcemage.org>:

 scripts/spellcaster.sh |    7 +++++++
 1 files changed, 7 insertions(+)

New commits:
commit 7a49eb16b18915165259fb1c705c429eca137bfe
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    scripts/spellcaster.sh: copy resolv.conf for wgets
    
    Copy the host resolv.conf to the target so that sorcery can wget sources
    for spell building inside the target.

diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 5453168..01cd42c 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -96,6 +96,10 @@ function prepare_target() {
 	export ispells="ispells.$TYPE"
 	export ospells="ospells.$TYPE"
 
+	# Copy resolv.conf so spell sources can be downloaded inside the TARGET
+	cp -f "$TARGET"/etc/resolv.conf "$TARGET"/tmp/resolv.conf &&
+		cp -f /etc/resolv.conf "$TARGET"/etc/resolv.conf
+
 	# If using the linux spell copy the kernel config to TARGET sorcery
 	grep -q '^linux$' "$CAULDRONDIR/$rspells" "$CAULDRONDIR/$ospells" &&
 	cp "$CAULDRONDIR/config-2.6" "$TARGET/etc/sorcery/local/kernel.config"
@@ -169,6 +173,9 @@ OPTIONAL
 function clean_target() {
 	local config="etc/sorcery/local/kernel.config"
 
+	# Restore resolv.conf
+	cp -f "$TARGET"/tmp/resolv.conf "$TARGET"/etc/resolv.conf
+
 	# Clean up the target
 	rm -f "$TARGET/rspells" \
 		"$TARGET/ispells" \



More information about the SM-Commit mailing list