Skip to Content.
Sympa Menu

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

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 (2e286c9bd5ee05897950b63ca8f66978c2de3b0f)
  • Date: Sat, 27 Dec 2008 01:36:16 -0600

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

iso/usr/share/doc/smgl.install/help/index | 1
iso/usr/share/doc/smgl.install/steps/boot-loader | 19 +++++++++-------
iso/usr/share/doc/smgl.install/steps/compile-kernel | 7 ++----
iso/usr/share/doc/smgl.install/steps/install | 23
++++++++++++++++++++
iso/usr/share/doc/smgl.install/steps/iso-kernel | 13 +++++++++++
iso/usr/share/doc/smgl.install/steps/kernel | 12 ++++++++++
iso/usr/share/doc/smgl.install/steps/select-spells | 22
+++++++++++++++++++
iso/usr/share/smgl.install/bashrc | 3 --
iso/usr/share/smgl.install/order | 16 +++++--------
iso/usr/share/smgl.install/steps | 10 +++-----
scripts/spellcaster.sh | 4 +--
11 files changed, 98 insertions(+), 32 deletions(-)

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

implemented optional spell installation steps

The steps for doing optional spell installation have been implemented.
The alchemy script for presenting a selection menu of the caches
available for installation is almost done, and the enchant script will
be implemented soon after.

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

Change jump {lilo,grub} to todo {lilo,grub}

Implemented argument parsing for the todo command so that it can print
the step info for arbitrary steps in addition to the current step. Also
modified the step listing files and boot-loader step information to make
use of this feature. This is cleaner than jumping to different steps.

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

scripts/spellcaster.sh: fix var substitution

Accidentally had ${$VAR:-foo} instead of ${VAR:-foo} for $SYSDIR and
$ISODIR.

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

steps/compile-kernel: added missing 'step'

The 'step' keyword was missing in the title line. Also simplified the
language explaining the step.

diff --git a/iso/usr/share/doc/smgl.install/help/index
b/iso/usr/share/doc/smgl.install/help/index
index da822ba..4beaa93 100644
--- a/iso/usr/share/doc/smgl.install/help/index
+++ b/iso/usr/share/doc/smgl.install/help/index
@@ -6,4 +6,5 @@ next go to the next step
prev return to the previous step in the list
steps print a listing of all possible steps
todo show what needs to be done for the current step
+todo <step> show what needs to be done for <step>
welcome show some help information (seen at the welcome
screen)
diff --git a/iso/usr/share/doc/smgl.install/steps/boot-loader
b/iso/usr/share/doc/smgl.install/steps/boot-loader
index 4112cb9..f6ee7f1 100644
--- a/iso/usr/share/doc/smgl.install/steps/boot-loader
+++ b/iso/usr/share/doc/smgl.install/steps/boot-loader
@@ -1,15 +1,18 @@
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. 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.
+Now it is time to set up a boot loader. Since this is the x86 ISO, you can
+set up either grub or lilo. Use whichever you please, but only use one of
them.
+It is assumed that whichever boot loader you will set up here was selected
and
+installed during the select-spells and install steps.

-Once you have decided which boot loader to use, you need to configure the
+Once you have decided which boot loader to set up, you need to configure the
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.

-For lilo instructions, type jump lilo.
+For lilo instructions, type todo lilo.

-For grub instructions, just type next.
+For grub instructions, type todo grub.
+
+To see the instructions for this step again, just type todo.
+
+When you are finished, type next.
diff --git a/iso/usr/share/doc/smgl.install/steps/compile-kernel
b/iso/usr/share/doc/smgl.install/steps/compile-kernel
index 1fa08eb..008660f 100644
--- a/iso/usr/share/doc/smgl.install/steps/compile-kernel
+++ b/iso/usr/share/doc/smgl.install/steps/compile-kernel
@@ -1,7 +1,6 @@
-compile-kernel
-This step is optional but recommended. You may now set up a custom kernel for
-your installation. You can either do this by casting the spell or
-compiling and installing manually.
+compile-kernel step
+You may now set up a custom kernel for your installation by casting the linux
+spell or compiling and installing manually.

chroot into your system:
 smgl-chroot
diff --git a/iso/usr/share/doc/smgl.install/steps/install
b/iso/usr/share/doc/smgl.install/steps/install
new file mode 100644
index 0000000..4f2f895
--- /dev/null
+++ b/iso/usr/share/doc/smgl.install/steps/install
@@ -0,0 +1,23 @@
+install step
+It is time to install all of the spells to your system. There are two ways
that
+you can do this: manually, and using the enchant script. Note that
+system.tar.bz2 is required.
+
+manual method:
+ tar xjvf /system.tar.bz2 -C /mnt/root
+ cd /var/cache/sorcery
+ tar jxf SPELL -C /mnt/root 
+
+Remember to replace "SPELL" with the filename of the spell cache to install.
As
+an example, to install lilo:
+ tar jxf lilo-22.8-i486-pc-linux-gnu.tar.bz2 -C /mnt/root
+
+enchant method (uses /tmp/opt-spells):
+ enchant
+
+Enchant can also take a command-line argument to a cache file with a
specified
+path. This enables you to run enchant on any cache file you choose, from any
+directory, without the tedium of typing in the tar line as given in the
"manual
+method" section. See  enchant [-h|--help] for more information.
+
+When the step finishes type next.
diff --git a/iso/usr/share/doc/smgl.install/steps/iso-kernel
b/iso/usr/share/doc/smgl.install/steps/iso-kernel
new file mode 100644
index 0000000..823b773
--- /dev/null
+++ b/iso/usr/share/doc/smgl.install/steps/iso-kernel
@@ -0,0 +1,13 @@
+iso-kernel step
+Installing the ISO kernel is easy, and it should work well (it's working on
+your computer right now). To install the ISO kernel, all you need to do is
copy
+the kernel and kernel modules over to your new system.
+
+copy the kernel itself:
+ cp /boot/{config,System.map}* /mnt/root/boot/
+ cp /boot/linux /mnt/root/boot/vmlinuz-$(uname -r)
+
+copy all the kernel modules:
+ cp -a /lib/modules/$(uname -r) /mnt/root/lib/modules
+
+Type next to go to the next step.
diff --git a/iso/usr/share/doc/smgl.install/steps/kernel
b/iso/usr/share/doc/smgl.install/steps/kernel
new file mode 100644
index 0000000..895941f
--- /dev/null
+++ b/iso/usr/share/doc/smgl.install/steps/kernel
@@ -0,0 +1,12 @@
+kernel
+You can install the ISO kernel (fast and easy), set up a custom kernel
+(recommended), or both (best of both worlds). Whatever you choose, you must
+install at least one kernel.
+
+For instructions on how to install the ISO kernel, type todo
iso-kernel.
+
+For instructions on how to install a custom kernel, type todo
compile-kernel.
+
+To see the instructions for this step again, just type todo.
+
+When you are finished, type next.
diff --git a/iso/usr/share/doc/smgl.install/steps/select-spells
b/iso/usr/share/doc/smgl.install/steps/select-spells
new file mode 100644
index 0000000..b4486ed
--- /dev/null
+++ b/iso/usr/share/doc/smgl.install/steps/select-spells
@@ -0,0 +1,22 @@
+select-spells step
+You may now select the spells you would like that are provided on the ISO.
+There are currently two ways that you can accomplish this. Both methods make
+use of /tmp/opt-spells. Note that it is crucial to install some spells (such
as
+a bootloader) or your system may not function, so some of these have been
+included as defaults in /tmp/opt-spells.
+
+The menu will present a list of the spells available on the ISO, as well as
+mark which ones are selected for install. The menu is accessed as follows.
+
+menu:
+ alchemy
+
+manual:
+ $EDITOR /tmp/opt-spells
+
+You can of course use any editor you like, in case you haven't set $EDITOR.
+
+You can re-edit /tmp/opt-spells any time during the install session and it
will
+remember your changes each time. Likewise, you may re-run alchemy.
+
+When you are finished selecting your spells, type next.
diff --git a/iso/usr/share/smgl.install/bashrc
b/iso/usr/share/smgl.install/bashrc
index 87dde6e..9c28e18 100644
--- a/iso/usr/share/smgl.install/bashrc
+++ b/iso/usr/share/smgl.install/bashrc
@@ -20,8 +20,7 @@ function header() {
}

function todo() {
- local CURSTEP
- CURSTEP=$(cat $INSTALLER_STATUS)
+ local CURSTEP="${1:-$(cat $INSTALLER_STATUS)}"
header
cat $INSTALLER_DOCS/steps/$CURSTEP
}
diff --git a/iso/usr/share/smgl.install/order
b/iso/usr/share/smgl.install/order
index 34c09bb..2ea7405 100644
--- a/iso/usr/share/smgl.install/order
+++ b/iso/usr/share/smgl.install/order
@@ -1,16 +1,12 @@
init:disk-partition
disk-partition:disk-format
disk-format:disk-mount
-disk-mount:copy-base
-copy-base:edit-confs
-edit-confs:compile-kernel
-compile-kernel:boot-loader
-boot-loader:grub
-boot-loader:lilo
-grub:install-opt-spells
-lilo:install-opt-spells
-boot-loader:install-opt-spells
-install-opt-spells:user-setup
+disk-mount:select-spells
+select-spells:install
+install:edit-confs
+edit-confs:kernel
+kernel:boot-loader
+boot-loader:user-setup
user-setup:reboot
reboot:reboot
error:init
diff --git a/iso/usr/share/smgl.install/steps
b/iso/usr/share/smgl.install/steps
index 8c78064..44cb6f9 100644
--- a/iso/usr/share/smgl.install/steps
+++ b/iso/usr/share/smgl.install/steps
@@ -2,12 +2,10 @@ init - start of the install
disk-partition - creating partitions
disk-format - creating filesystems
disk-mount - mounting filesystems at appropriate mount-points
-copy-base - copying basesystem and basic /etc files
+select-spells - choose the spells to install
+install - install the spells and base system
edit-confs - editing the basic configuration files
-compile-kernel - compile a custom kernel
-boot-loader - installing and setting up a boot manager
-lilo - do this step to set up lilo
-grub - do this step to set up grub
-install-opt-spells - installing other spells you may need
+kernel - install ISO kernel and/or compile a custom kernel
+boot-loader - install and set up a boot manager
user-setup - set root password, create regular users
reboot - reboot into the new system
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 9f98d81..9ee4d4a 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -189,8 +189,8 @@ shift
[[ $# -gt 0 ]] && TYPE="$1"
TYPE="${TYPE:-x86}"

-ISODIR="${$ISODIR:-/tmp/cauldron/iso}"
-SYSDIR="${$SYSDIR:-/tmp/cauldron/sys}"
+ISODIR="${ISODIR:-/tmp/cauldron/iso}"
+SYSDIR="${SYSDIR:-/tmp/cauldron/sys}"

sanity_check




  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (2e286c9bd5ee05897950b63ca8f66978c2de3b0f), Justin Boffemmyer, 12/27/2008

Archive powered by MHonArc 2.6.24.

Top of Page