Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master cauldron by Justin Boffemmyer (e73e9481dcebdaf9c7114a7fbe8baa98ef201679)

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 master cauldron by Justin Boffemmyer (e73e9481dcebdaf9c7114a7fbe8baa98ef201679)
  • Date: Sat, 9 Feb 2008 09:06:47 -0600

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

iso/usr/share/doc/smgl.install/steps/boot-loader | 19 ++++-----
iso/usr/share/doc/smgl.install/welcome | 2 -
iso/usr/share/smgl.install/bashrc | 46
+++++++++--------------
iso/usr/share/smgl.install/commands | 1
iso/usr/share/smgl.install/order | 4 +-
5 files changed, 29 insertions(+), 43 deletions(-)

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

steps/boot-loader: update to match no branching

Modified the instructions to match the fact that "branch" is no longer
used. Also cleaned up some of the instructions, since I somehow forgot
to do that before when I split lilo and grub out to separate steps.

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

bashrc: error-proofing for jump command

Added a check to make sure that the argument passed to jump is
actually one of the steps we recognize, else output an error message
and point the user to type "steps".

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

bashrc,commands,order: removed branching

Removed the branching command from bashrc and updated commands to
match this. Also cleaned up steps so that bootloaders points directly
to grub, so that the grub step can be loaded by simply doing next, and
the lilo step will be gotten to by typing jump lilo.

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

welcome: Updated the ISO version

Updated the version listed in welcome to devel-20080207

diff --git a/iso/usr/share/doc/smgl.install/steps/boot-loader
b/iso/usr/share/doc/smgl.install/steps/boot-loader
index 049a8f2..4112cb9 100644
--- a/iso/usr/share/doc/smgl.install/steps/boot-loader
+++ b/iso/usr/share/doc/smgl.install/steps/boot-loader
@@ -1,18 +1,15 @@
boot-loader step
Now it is time to select a boot-loader. Since this is the x86 ISO, you can
choose either grub or lilo. Both are included in the basesystem you copied
-over to /mnt/root in the copy-base step.
+over to /mnt/root in the copy-base step. Since grub seems to be more popular
+than lilo these days, the installer defaults to grub. Use whichever you
please,
+but only use one of them.

Once you have decided which boot loader to use, you need to configure the
-boot loader. For lilo, this is done by editing /mnt/root/etc/lilo.conf. For
-grub, follow the instructions below. The grub instructions are for
-installing grub to the MBR of the first hdd (e.g. /dev/hda). Change this
-according to your setup/needs.
+boot loader. After you finish configuring your boot loader, you need to
+"install" it. This involves running the boot loader, which will install
itself
+to the location you specified in the config file.

-After you finish configuring your boot loader, you need to "install" it.
-This simply involves running the boot loader, which will install itself to
-the location you specified in the config file.
+For lilo instructions, type jump lilo.

-For lilo instructions, type branch lilo.
-
-For grub instructions, type branch grub.
+For grub instructions, just type next.
diff --git a/iso/usr/share/doc/smgl.install/welcome
b/iso/usr/share/doc/smgl.install/welcome
index 0164f9d..26ec647 100644
--- a/iso/usr/share/doc/smgl.install/welcome
+++ b/iso/usr/share/doc/smgl.install/welcome
@@ -1,4 +1,4 @@
-Welcome to the SMGL 0.10.0-devel install CD!
+Welcome to the SMGL devel-20080207 install CD!

The install process is currently a guided shell prompt. Type next to
start.
Everytime you finish a step, enter next to advance to the next one.
diff --git a/iso/usr/share/smgl.install/bashrc
b/iso/usr/share/smgl.install/bashrc
index 3e11d39..92f5d15 100755
--- a/iso/usr/share/smgl.install/bashrc
+++ b/iso/usr/share/smgl.install/bashrc
@@ -62,33 +62,6 @@ function next() {
todo
}

-function branch() {
- local CURSTEP
- local b1
- local b2
- # get old status
- CURSTEP=$(cat $INSTALLER_STATUS)
- # find next status
- CURSTEP=$(grep "^$CURSTEP:" $INSTALLER_DATA/order | head -n 1 | cut -d:
-f2)
- # make sure next status is a branch
- if [[ ${CURSTEP} == *'|'* ]] ; then
- b1=$(echo ${CURSTEP} | cut -d '|' -f 1)
- b2=$(echo ${CURSTEP} | cut -d '|' -f 2)
- if [[ $* = ${b1} || $* = ${b2} ]] ; then
- CURSTEP=$*
- else
- CURSTEP="error"
- fi
- else
- # couldn't match against the branches
- CURSTEP="error"
- fi
- # save new status
- echo "$CURSTEP" >$INSTALLER_STATUS
- # print new message
- todo
-}
-
function back() {
local CURSTEP
CURSTEP=$(cat $INSTALLER_STATUS)
@@ -115,7 +88,24 @@ function steps() {
}

function jump() {
- echo "$*" >$INSTALLER_STATUS
+ local i
+ local good=0
+
+ for i in $(cat $INSTALLER_DATA/steps | cut -d" " -f1)
+ do
+ if [[ $* = $i ]]
+ then
+ good=1
+ echo "$*" >$INSTALLER_STATUS
+ break
+ fi
+ done
+ if [[ $good = 0 ]]
+ then
+ echo ""
+ echo "Error: '$*' is not a recognized step."
+ echo "Type steps to see a list of steps."
+ fi
}

function welcome() {
diff --git a/iso/usr/share/smgl.install/commands
b/iso/usr/share/smgl.install/commands
index cdce121..eda899f 100644
--- a/iso/usr/share/smgl.install/commands
+++ b/iso/usr/share/smgl.install/commands
@@ -1,5 +1,4 @@
back return to the previous step
-branch <step> choose one of two possible next steps
help print a list of commands (this list)
jump <step> jump directly to <step>
next go to the next step
diff --git a/iso/usr/share/smgl.install/order
b/iso/usr/share/smgl.install/order
index 7582e0a..aee487a 100644
--- a/iso/usr/share/smgl.install/order
+++ b/iso/usr/share/smgl.install/order
@@ -4,9 +4,9 @@ disk-format:disk-mount
disk-mount:copy-base
copy-base:edit-confs
edit-confs:boot-loader
-boot-loader:lilo|grub
-lilo:install-opt-spells
+boot-loader:grub
grub:install-opt-spells
+lilo:install-opt-spells
install-opt-spells:user-setup
user-setup:reboot
reboot:reboot




Archive powered by MHonArc 2.6.24.

Top of Page