Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (16795ac6e628446ffe1a1313f32d29cf3632dee7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (16795ac6e628446ffe1a1313f32d29cf3632dee7)
  • Date: Wed, 10 Jan 2007 09:19:16 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

smgl/init.d/CONFIGURE | 6 ++++--
smgl/init.d/HISTORY | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit de55cad2fb11dc08765f6c5320246212715146ec
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

init.d: properly do the devices sourcing

commit 1482cec499e1a050f4909f4c1e13d639d0ec186c
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "init.d: made the last change iso generation friendly"

This reverts commit 558005852b0ee1aacbe20cbcd5e8c2eaf0bf771e.

diff --git a/smgl/init.d/CONFIGURE b/smgl/init.d/CONFIGURE
index 7582f95..dbb7fc5 100755
--- a/smgl/init.d/CONFIGURE
+++ b/smgl/init.d/CONFIGURE
@@ -18,8 +18,10 @@ fi &&

# default to the previously selected option #9772 - only a problem on the
very
# second cast. Adding it to the start of the list makes it the default in
-# the next query. No &&, so it can be cast even when the file is MIA (iso).
-. /etc/sysconfig/devices
+# the next query.
+if [[ -f $INSTALL_ROOT/etc/sysconfig/devices ]]; then
+ . $INSTALL_ROOT/etc/sysconfig/devices
+fi &&
config_query_list DEVICES "Choose /dev management mode:" $DEVICES
${DEVICES_LIST/$DEVICES/}
if [[ "$DEVICES" != "devfs" ]]
then
diff --git a/smgl/init.d/HISTORY b/smgl/init.d/HISTORY
index 9e62c07..815ab08 100644
--- a/smgl/init.d/HISTORY
+++ b/smgl/init.d/HISTORY
@@ -1,5 +1,5 @@
2007-01-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
- * CONFIGURE: removed the && after sourcing devices
+ * CONFIGURE: added check before sourcing devices

2007-01-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* CONFIGURE: fix #9772, restore the DEVICE settings for the second
cast



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (16795ac6e628446ffe1a1313f32d29cf3632dee7), Jaka Kranjc, 01/10/2007

Archive powered by MHonArc 2.6.24.

Top of Page