Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (48e739f4a429b18d07015f9d7b2b53752777ab26)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (48e739f4a429b18d07015f9d7b2b53752777ab26)
  • Date: Sat, 3 Jan 2009 07:32:11 -0600

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

iso/usr/share/smgl.install/bashrc | 2 ++
iso/usr/share/smgl.install/smgl-enchant | 2 +-
iso/usr/share/smgl.install/spells | 26 ++++++++++++++++++++++++++
3 files changed, 29 insertions(+), 1 deletion(-)

New commits:
commit 48e739f4a429b18d07015f9d7b2b53752777ab26
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

smgl.install/bashrc: set up default opt. spells

Set up the default list of optional spells in /tmp/spells on startup.

commit 901300de18997ffcd87bdc64de6353dd469f0c38
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

smgl.install/spells: suggested optional spells

List of optional spells provided on the ISO that are suggested for
installation.

commit b30a9127078fc2ec1d98a212b7c6978f02119f71
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

smgl.install/smgl-enchant: silence sorcery conf

When sourcing the sorcery config, ignore any output it generates. It
only matters if it is sourced successfully at all (the file itself), not
whether all of it's internal sourcings are ok (for now).

diff --git a/iso/usr/share/smgl.install/bashrc
b/iso/usr/share/smgl.install/bashrc
index 54261d7..492e891 100644
--- a/iso/usr/share/smgl.install/bashrc
+++ b/iso/usr/share/smgl.install/bashrc
@@ -8,10 +8,12 @@ INSTALLER_TMP=/tmp/smgl.install
INSTALLER_STATUS=$INSTALLER_TMP/status
INSTALLER_DATA=/usr/share/smgl.install
INSTALLER_DOCS=/usr/share/doc/smgl.install
+OPT_SPELLS=/tmp/spells

# This will race on startup, but it shouldn't harm anyone. I hope.
mkdir -p $INSTALLER_TMP
[[ -e $INSTALLER_STATUS ]] || echo 'init' >$INSTALLER_STATUS
+[[ -e $OPT_SPELLS ]] || cat $INSTALLER_DATA/spells > $OPT_SPELLS

function header() {
echo ""
diff --git a/iso/usr/share/smgl.install/smgl-enchant
b/iso/usr/share/smgl.install/smgl-enchant
index 9a3d535..0066d53 100755
--- a/iso/usr/share/smgl.install/smgl-enchant
+++ b/iso/usr/share/smgl.install/smgl-enchant
@@ -72,7 +72,7 @@ then
tar xjvf /system.tar.bz2 -C "$TARGET"
fi

-. "$TARGET"/etc/sorcery/config ||
+. "$TARGET"/etc/sorcery/config &> /dev/null ||
die "Couldn't source $TARGET/etc/sorcery/config"

# generate a listing of all tablet directories if needed
diff --git a/iso/usr/share/smgl.install/spells
b/iso/usr/share/smgl.install/spells
new file mode 100644
index 0000000..22cc2ba
--- /dev/null
+++ b/iso/usr/share/smgl.install/spells
@@ -0,0 +1,26 @@
+autoconf
+automake
+bin86
+bison
+dhcpcd
+e2fsprogs
+elvis
+flex
+g++
+groff
+hdparm
+less
+lilo
+lynx
+m4
+man
+openssl
+pciutils
+perl
+slang
+sysfsutils
+tcp_wrappers
+texinfo
+which
+usbutils
+udev



  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (48e739f4a429b18d07015f9d7b2b53752777ab26), Justin Boffemmyer, 01/03/2009

Archive powered by MHonArc 2.6.24.

Top of Page