Skip to Content.
Sympa Menu

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

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 (14b341e7a5f44191aff54b0ff7aacc3132e7a6de)
  • Date: Sun, 14 Mar 2010 10:16:48 -0500

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

enchantment/etc/config | 27 ++++---
enchantment/libenchantment | 64
++++++++++++++---
enchantment/modules/boot-loader | 18 ----
enchantment/modules/boot-loader.info | 1
enchantment/modules/boot-loader/boot-loader | 18 ++++
enchantment/modules/boot-loader/boot-loader.info | 1
enchantment/modules/compile-kernel | 23 ------
enchantment/modules/compile-kernel.info | 1
enchantment/modules/compile-kernel/compile-kernel | 23 ++++++
enchantment/modules/compile-kernel/compile-kernel.info | 1
enchantment/modules/disk-format | 21 -----
enchantment/modules/disk-format.info | 1
enchantment/modules/disk-format/disk-format | 21 +++++
enchantment/modules/disk-format/disk-format.info | 1
enchantment/modules/disk-mount | 23 ------
enchantment/modules/disk-mount.info | 1
enchantment/modules/disk-mount/disk-mount | 23 ++++++
enchantment/modules/disk-mount/disk-mount.info | 1
enchantment/modules/disk-partition | 23 ------
enchantment/modules/disk-partition.info | 1
enchantment/modules/disk-partition/disk-partition | 23 ++++++
enchantment/modules/disk-partition/disk-partition.info | 1
enchantment/modules/edit-confs | 23 ------
enchantment/modules/edit-confs.info | 1
enchantment/modules/edit-confs/edit-confs | 23 ++++++
enchantment/modules/edit-confs/edit-confs.info | 1
enchantment/modules/error | 1
enchantment/modules/error.info | 1
enchantment/modules/error/error | 1
enchantment/modules/error/error.info | 1
enchantment/modules/grub | 23 ------
enchantment/modules/grub.info | 1
enchantment/modules/grub/grub | 23 ++++++
enchantment/modules/grub/grub.info | 1
enchantment/modules/init | 2
enchantment/modules/init.info | 1
enchantment/modules/init/init | 2
enchantment/modules/init/init.info | 1
enchantment/modules/install | 23 ------
enchantment/modules/install.info | 1
enchantment/modules/install/install | 23 ++++++
enchantment/modules/install/install.info | 1
enchantment/modules/iso-kernel | 22 -----
enchantment/modules/iso-kernel.info | 1
enchantment/modules/iso-kernel/iso-kernel | 22 +++++
enchantment/modules/iso-kernel/iso-kernel.info | 1
enchantment/modules/kernel | 12 ---
enchantment/modules/kernel.info | 1
enchantment/modules/kernel/kernel | 12 +++
enchantment/modules/kernel/kernel.info | 1
enchantment/modules/lilo | 20 -----
enchantment/modules/lilo.info | 1
enchantment/modules/lilo/lilo | 20 +++++
enchantment/modules/lilo/lilo.info | 1
enchantment/modules/reboot | 12 ---
enchantment/modules/reboot.info | 1
enchantment/modules/reboot/reboot | 12 +++
enchantment/modules/reboot/reboot.info | 1
enchantment/modules/select-spells | 23 ------
enchantment/modules/select-spells.info | 1
enchantment/modules/select-spells/select-spells | 23 ++++++
enchantment/modules/select-spells/select-spells.info | 1
enchantment/modules/user-setup | 17 ----
enchantment/modules/user-setup.info | 1
enchantment/modules/user-setup/user-setup | 17 ++++
enchantment/modules/user-setup/user-setup.info | 1
enchantment/shell/bashrc | 4 -
67 files changed, 377 insertions(+), 322 deletions(-)

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

enchantment: module enter and exit functions

Enable each module to perform its own entry and exit procedures. This
will help keep the separate installers cleaner since they won't need to
implement this functionality themselves, and it will also give
enchantment more flexibility.

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

enchantment: ensure proper quoting

Prevent some potential quoting issues by properly quoting all variables
that could cause trouble.

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

enchantment: fix function name in libenchantment

Correct a copy/paste error in libenchantment where one of the function
names was "cauldron_" instead of "enchant_".

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

enchantment: logically organize config file

Moved bits around in the config file for logical cohesion, and also
added some blank lines to separate logically distinct portions of the
config for better readability.

diff --git a/enchantment/etc/config b/enchantment/etc/config
index 5e9ba1e..c79c076 100644
--- a/enchantment/etc/config
+++ b/enchantment/etc/config
@@ -3,17 +3,11 @@
# path to the ISO system (this should usually be null, unless
# you are doing some tricky hacking)
ENCHANT_ISO_PATH="${ENCHANT_ISO_PATH:-}"
+
# path to the enchant library modules
ENCHANT_BASE="${ENCHANT_BASE:-$ENCHANT_ISO_PATH/var/lib/cauldron/}"
ENCHANT_LIBS="${ENCHANT_LIBS:-$ENCHANT_BASE/enchantment}"
- # temp directory used during the install
- ENCHANT_TMP="${ENCHANT_TMP:-$ENCHANT_ISO_PATH/tmp/enchantment}"
- # install module (step) info
- ENCHANT_STATUS="${ENCHANT_STATUS:-$ENCHANT_TMP/current_module}"
- ENCHANT_BACK="${ENCHANT_BACK:-$ENCHANT_TMP/history/back}"
- ENCHANT_FORWARD="${ENCHANT_FORWARD:-$ENCHANT_TMP/history/forward}"
- # where the target system is mounted
- ENCHANT_TARGET="${ENCHANT_TARGET:-$ENCHANT_ISO_PATH/mnt/root}"
+
# where the installer files are located

ENCHANT_DATA="${ENCHANT_DATA:-$ENCHANT_ISO_PATH/usr/share/enchantment}"
# location of the install modules (steps)
@@ -21,12 +15,25 @@
# location of installer documentation

ENCHANT_DOCS="${ENCHANT_DOCS:-$ENCHANT_ISO_PATH/usr/share/doc/enchantment}"

- # whether to use color for displaying messages
- ENCHANT_COLOR="${ENCHANT_COLOR:-yes}"
+ # temp directory used during the install
+ ENCHANT_TMP="${ENCHANT_TMP:-$ENCHANT_ISO_PATH/tmp/enchantment}"
+
+ # where the target system is mounted
+ ENCHANT_TARGET="${ENCHANT_TARGET:-$ENCHANT_ISO_PATH/mnt/root}"
+
+ # install module (step) info
+ ENCHANT_STATUS="${ENCHANT_STATUS:-$ENCHANT_TMP/current_module}"
+ # install module history
+ ENCHANT_BACK="${ENCHANT_BACK:-$ENCHANT_TMP/history/back}"
+ ENCHANT_FORWARD="${ENCHANT_FORWARD:-$ENCHANT_TMP/history/forward}"

# size of history buffers, total size = $ENCHANT_HISTORY * 2 = (back
+ forward)
ENCHANT_HISTORY=${ENCHANT_HISTORY:-20}

+ # whether to use color for displaying messages
+ ENCHANT_COLOR="${ENCHANT_COLOR:-yes}"
+
+
ENCHANT_SORCERY_CONFIG="${ENCHANT_SORCERY_CONFIG:-/etc/sorcery/config}"
ENCHANT_SORCERY_LIBS="${ENCHANT_SORCERY_LIBS:-/var/lib/sorcery/modules}"
# branch of sorcery to use in the ISO
diff --git a/enchantment/libenchantment b/enchantment/libenchantment
index 29b7022..5409d53 100755
--- a/enchantment/libenchantment
+++ b/enchantment/libenchantment
@@ -32,8 +32,8 @@ ENCHANT_NULL="/dev/null"
## occurs. Afterwards, functions from liberror are used instead.
##

#-------------------------------------------------------------------------------
-function cauldron_fatal_error() {
- echo $1
+function enchant_fatal_error() {
+ echo "$1"
exit 1
}

@@ -60,10 +60,10 @@ unset enchant_fatal_error
##

#-------------------------------------------------------------------------------
function enchant_load_library() {
- local lib=$1
+ local lib="$1"

. "$ENCHANT_LIBS/$lib" 2>$ENCHANT_NULL ||
- liberror_check_fatal_error
+ liberror_check_fatal_error
}


#-------------------------------------------------------------------------------
@@ -91,7 +91,7 @@ function enchant_color() {
fi
else
# if ENCHANT_COLOR specifically set to yes
- if [[ $ENCHANT_COLOR == "yes" ]]
+ if [[ "$ENCHANT_COLOR" == "yes" ]]
then
# we want color
return 0
@@ -114,8 +114,8 @@ function enchant_color() {
##

#-------------------------------------------------------------------------------
function enchant_copy_kernel() {
- local KERNEL=$1
- local LINUX_VER=$2
+ local KERNEL="$1"
+ local LINUX_VER="$2"

# copy the kernel over
cp "$ENCHANT_ISO/boot/$KERNEL" "$ENCHANT_TARGET/boot/" ||
@@ -176,7 +176,7 @@ function enchant_get_modules() {
do
if [[ "$module" != "error" ]]
then
- if ! $(echo ${output[*]} | grep -q $module)
+ if ! $(echo ${output[*]} | grep -q "$module")
then
output=( ${output[*]} "$module" )
fi
@@ -216,6 +216,8 @@ function enchant_set_current() {
return $ERR_SET_CURRENT
fi

+ enchant_module_exit || return $ERR_MODULE_EXIT
+
# if the max history size has been reached, then we drop the oldest item
if [[ "$(wc -l < $ENCHANT_BACK)" -ge "$ENCHANT_HISTORY" ]]
then
@@ -228,6 +230,8 @@ function enchant_set_current() {
# set the current module
echo "$module" > "$ENCHANT_STATUS" || return $ERR_SET_CURRENT

+ enchant_module_enter || return $ERR_MODULE_ENTER
+
return $ERR_OK
}

@@ -416,6 +420,50 @@ function enchant_get_total() {
return $ERR_OK
}

+#-------------------------------------------------------------------------------
+##
+## Processes the module entry functions. This is used to provide extra
+## functionality upon entering a module (usually preparatory work, like
creating
+## module-specific temp files, etc.)
+##
+#-------------------------------------------------------------------------------
+function enchant_module_enter() {
+ local module="$(cat $ENCHANT_STATUS)"
+ local script=""
+
+ for script in "$ENCHANT_MODULES/$module/enter"/*
+ do
+ if [[ -f "$script" ]]
+ then
+ /bin/bash "$script" || return $ERR_MODULE_SCRIPT
+ fi
+ done
+
+ return $ERR_OK
+}
+
+#-------------------------------------------------------------------------------
+##
+## Processes the module exit functions. This is used to provide extra
+## functionality upon exiting a module, usually things like writing data to
the
+## module's temp files, etc.
+##
+#-------------------------------------------------------------------------------
+function enchant_module_exit() {
+ local module="$(cat $ENCHANT_STATUS)"
+ local script=""
+
+ for script in "$ENCHANT_MODULES/$module/exit"/*
+ do
+ if [[ -f "$script" ]]
+ then
+ /bin/bash "$script" || return $ERR_MODULE_SCRIPT
+ fi
+ done
+
+ return $ERR_OK
+}
+


#-------------------------------------------------------------------------------
##=back
diff --git a/enchantment/modules/boot-loader b/enchantment/modules/boot-loader
deleted file mode 100644
index 3bafe86..0000000
--- a/enchantment/modules/boot-loader
+++ /dev/null
@@ -1,18 +0,0 @@
-@[boot-loader step]
-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 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 @[todo lilo].
-
-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/enchantment/modules/boot-loader.info
b/enchantment/modules/boot-loader.info
deleted file mode 100644
index c856628..0000000
--- a/enchantment/modules/boot-loader.info
+++ /dev/null
@@ -1 +0,0 @@
-install and set up a boot manager
diff --git a/enchantment/modules/boot-loader/boot-loader
b/enchantment/modules/boot-loader/boot-loader
new file mode 100644
index 0000000..3bafe86
--- /dev/null
+++ b/enchantment/modules/boot-loader/boot-loader
@@ -0,0 +1,18 @@
+@[boot-loader step]
+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 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 @[todo lilo].
+
+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/enchantment/modules/boot-loader/boot-loader.info
b/enchantment/modules/boot-loader/boot-loader.info
new file mode 100644
index 0000000..c856628
--- /dev/null
+++ b/enchantment/modules/boot-loader/boot-loader.info
@@ -0,0 +1 @@
+install and set up a boot manager
diff --git a/enchantment/modules/compile-kernel
b/enchantment/modules/compile-kernel
deleted file mode 100644
index e6a7e18..0000000
--- a/enchantment/modules/compile-kernel
+++ /dev/null
@@ -1,23 +0,0 @@
-@[compile-kernel step]
-You may now set up a custom kernel for your installation by casting the linux
-spell or compiling and installing manually. Remember to update your
bootloader
-configuration to use your new kernel if you wish to boot it!
-
-chroot into your system:
-@[ smgl-chroot]
-
-spell install:
-@[ cast -r linux]
-
-manual install (change VERSION to what you have):
-@[ cd /usr/src && tar jxvf linux-VERSION]
-@[ ln -sf /usr/src/linux-VERSION /usr/src/linux && cd /usr/src/linux]
-@[ make menuconfig && make && make modules_install]
-@[ cp -f arch/i386/boot/bzImage /boot/vmlinuz-VERSION]
-@[ cp -f .config /boot/config-VERSION]
-@[ cp -f System.map /boot/System.map-VERSION]
-
-Exit the chroot:
-@[exit]
-
-Type @[next] to go to the next step.
diff --git a/enchantment/modules/compile-kernel.info
b/enchantment/modules/compile-kernel.info
deleted file mode 100644
index 8f3a34b..0000000
--- a/enchantment/modules/compile-kernel.info
+++ /dev/null
@@ -1 +0,0 @@
-configure, build, and install a custom kernel
diff --git a/enchantment/modules/compile-kernel/compile-kernel
b/enchantment/modules/compile-kernel/compile-kernel
new file mode 100644
index 0000000..e6a7e18
--- /dev/null
+++ b/enchantment/modules/compile-kernel/compile-kernel
@@ -0,0 +1,23 @@
+@[compile-kernel step]
+You may now set up a custom kernel for your installation by casting the linux
+spell or compiling and installing manually. Remember to update your
bootloader
+configuration to use your new kernel if you wish to boot it!
+
+chroot into your system:
+@[ smgl-chroot]
+
+spell install:
+@[ cast -r linux]
+
+manual install (change VERSION to what you have):
+@[ cd /usr/src && tar jxvf linux-VERSION]
+@[ ln -sf /usr/src/linux-VERSION /usr/src/linux && cd /usr/src/linux]
+@[ make menuconfig && make && make modules_install]
+@[ cp -f arch/i386/boot/bzImage /boot/vmlinuz-VERSION]
+@[ cp -f .config /boot/config-VERSION]
+@[ cp -f System.map /boot/System.map-VERSION]
+
+Exit the chroot:
+@[exit]
+
+Type @[next] to go to the next step.
diff --git a/enchantment/modules/compile-kernel/compile-kernel.info
b/enchantment/modules/compile-kernel/compile-kernel.info
new file mode 100644
index 0000000..8f3a34b
--- /dev/null
+++ b/enchantment/modules/compile-kernel/compile-kernel.info
@@ -0,0 +1 @@
+configure, build, and install a custom kernel
diff --git a/enchantment/modules/disk-format b/enchantment/modules/disk-format
deleted file mode 100644
index bc8cbfa..0000000
--- a/enchantment/modules/disk-format
+++ /dev/null
@@ -1,21 +0,0 @@
-@[disk-format step]
-Now create filesystems on the partitions you just created. Below is a list
-of example commands for the different types of filesystems supported on this
-ISO. The partitions given are examples. Be sure to format all the partitions
-you need.
-
-@[ mke2fs /dev/sda1]
-@[ mkfs.ext3 /dev/sda1]
-@[ mkreiserfs /dev/sda1]
-@[ mkfs.jfs /dev/sda1]
-@[ mkfs.xfs /dev/sda1]
-
-You probably want a swap partition:
-@[ mkswap /dev/sda2]
-
-The reiser4 tools are provided on the ISO. However, the ISO kernel does not
-yet support reiser4, so although you can create reiser4 filesystems and
-check ones already created, you cannot yet mount them. Only make a reiser4
-filesystem if you really know what you are doing. (@[mkfs.reiser4])
-
-Type @[next] to go to the next step.
diff --git a/enchantment/modules/disk-format.info
b/enchantment/modules/disk-format.info
deleted file mode 100644
index 33cf106..0000000
--- a/enchantment/modules/disk-format.info
+++ /dev/null
@@ -1 +0,0 @@
-creating filesystems
diff --git a/enchantment/modules/disk-format/disk-format
b/enchantment/modules/disk-format/disk-format
new file mode 100644
index 0000000..bc8cbfa
--- /dev/null
+++ b/enchantment/modules/disk-format/disk-format
@@ -0,0 +1,21 @@
+@[disk-format step]
+Now create filesystems on the partitions you just created. Below is a list
+of example commands for the different types of filesystems supported on this
+ISO. The partitions given are examples. Be sure to format all the partitions
+you need.
+
+@[ mke2fs /dev/sda1]
+@[ mkfs.ext3 /dev/sda1]
+@[ mkreiserfs /dev/sda1]
+@[ mkfs.jfs /dev/sda1]
+@[ mkfs.xfs /dev/sda1]
+
+You probably want a swap partition:
+@[ mkswap /dev/sda2]
+
+The reiser4 tools are provided on the ISO. However, the ISO kernel does not
+yet support reiser4, so although you can create reiser4 filesystems and
+check ones already created, you cannot yet mount them. Only make a reiser4
+filesystem if you really know what you are doing. (@[mkfs.reiser4])
+
+Type @[next] to go to the next step.
diff --git a/enchantment/modules/disk-format/disk-format.info
b/enchantment/modules/disk-format/disk-format.info
new file mode 100644
index 0000000..33cf106
--- /dev/null
+++ b/enchantment/modules/disk-format/disk-format.info
@@ -0,0 +1 @@
+creating filesystems
diff --git a/enchantment/modules/disk-mount b/enchantment/modules/disk-mount
deleted file mode 100644
index 72f8a05..0000000
--- a/enchantment/modules/disk-mount
+++ /dev/null
@@ -1,23 +0,0 @@
-@[disk-mount step]
-You need to mount the filesystems. We'll be installing to /mnt/root,
-so mount the filesystem that will be / onto /mnt/root. The partitions given
are
-only examples. Replace them with the partitions you used in @[disk-format].
-
-Examples:
-@[ mount -t ext2 /dev/sda1 /mnt/root]
-@[ mount -t reiserfs /dev/sda1 /mnt/root]
-@[ mount -t xfs /dev/sda1 /mnt/root]
-
-Then mount any other partitions you made at the proper subdirectories.
-You'll probably need to make directories for the other mount points first
-(assuming you formatted the / partition). Make sure you mount / first.
-
-For example, if you created /dev/sda2 for /usr:
-@[ mkdir /mnt/root/usr]
-@[ mount -t ext2 /dev/sda2 /mnt/root/usr]
-(or, for example, if it's a jfs partition)
-@[ mount -t jfs /dev/sda1 /mnt/root]
-
-Don't forget to mount @[all] the (system) partitions you plan to use.
-Also, you may want to turn on swap via e.g.
-@[ swapon /dev/sda2]
diff --git a/enchantment/modules/disk-mount.info
b/enchantment/modules/disk-mount.info
deleted file mode 100644
index a6df0c5..0000000
--- a/enchantment/modules/disk-mount.info
+++ /dev/null
@@ -1 +0,0 @@
-mounting filesystems at appropriate mount-points
diff --git a/enchantment/modules/disk-mount/disk-mount
b/enchantment/modules/disk-mount/disk-mount
new file mode 100644
index 0000000..72f8a05
--- /dev/null
+++ b/enchantment/modules/disk-mount/disk-mount
@@ -0,0 +1,23 @@
+@[disk-mount step]
+You need to mount the filesystems. We'll be installing to /mnt/root,
+so mount the filesystem that will be / onto /mnt/root. The partitions given
are
+only examples. Replace them with the partitions you used in @[disk-format].
+
+Examples:
+@[ mount -t ext2 /dev/sda1 /mnt/root]
+@[ mount -t reiserfs /dev/sda1 /mnt/root]
+@[ mount -t xfs /dev/sda1 /mnt/root]
+
+Then mount any other partitions you made at the proper subdirectories.
+You'll probably need to make directories for the other mount points first
+(assuming you formatted the / partition). Make sure you mount / first.
+
+For example, if you created /dev/sda2 for /usr:
+@[ mkdir /mnt/root/usr]
+@[ mount -t ext2 /dev/sda2 /mnt/root/usr]
+(or, for example, if it's a jfs partition)
+@[ mount -t jfs /dev/sda1 /mnt/root]
+
+Don't forget to mount @[all] the (system) partitions you plan to use.
+Also, you may want to turn on swap via e.g.
+@[ swapon /dev/sda2]
diff --git a/enchantment/modules/disk-mount/disk-mount.info
b/enchantment/modules/disk-mount/disk-mount.info
new file mode 100644
index 0000000..a6df0c5
--- /dev/null
+++ b/enchantment/modules/disk-mount/disk-mount.info
@@ -0,0 +1 @@
+mounting filesystems at appropriate mount-points
diff --git a/enchantment/modules/disk-partition
b/enchantment/modules/disk-partition
deleted file mode 100644
index 21d95d0..0000000
--- a/enchantment/modules/disk-partition
+++ /dev/null
@@ -1,23 +0,0 @@
-@[disk-partition step]
-First, we'll need to create some partitions on your disk that we can install
-SMGL to. You'll need to know the device of your hard disk to do this. One
good
-way to find your disks is by ls /sys/block, running cat /proc/partitions, or
by
-dmesg | grep -i disk. You probably want something that is either hd or sd.
-
-This image ships with several popular programs for partitioning:
-
-cfdisk is probably the most popular, a curses-based menu system:
-@[ cfdisk /dev/sda]
-
-parted can resize partitions, but may be a tad confusing:
-@[ parted /dev/sda]
-
-Then for the purists there's plain line-based fdisk. Can be a bit hard to
use:
-@[ fdisk /dev/sda]
-
-The iso also ships with @[sfdisk], if you're insane enough to want to use
-it.
-
-Remember to save your new partitioning scheme before quitting the program,
-create a swap partition, and remember you can always see this screen again
-by typing @[todo]. Type @[next] when you're done.
diff --git a/enchantment/modules/disk-partition.info
b/enchantment/modules/disk-partition.info
deleted file mode 100644
index 470f054..0000000
--- a/enchantment/modules/disk-partition.info
+++ /dev/null
@@ -1 +0,0 @@
-creating partitions
diff --git a/enchantment/modules/disk-partition/disk-partition
b/enchantment/modules/disk-partition/disk-partition
new file mode 100644
index 0000000..21d95d0
--- /dev/null
+++ b/enchantment/modules/disk-partition/disk-partition
@@ -0,0 +1,23 @@
+@[disk-partition step]
+First, we'll need to create some partitions on your disk that we can install
+SMGL to. You'll need to know the device of your hard disk to do this. One
good
+way to find your disks is by ls /sys/block, running cat /proc/partitions, or
by
+dmesg | grep -i disk. You probably want something that is either hd or sd.
+
+This image ships with several popular programs for partitioning:
+
+cfdisk is probably the most popular, a curses-based menu system:
+@[ cfdisk /dev/sda]
+
+parted can resize partitions, but may be a tad confusing:
+@[ parted /dev/sda]
+
+Then for the purists there's plain line-based fdisk. Can be a bit hard to
use:
+@[ fdisk /dev/sda]
+
+The iso also ships with @[sfdisk], if you're insane enough to want to use
+it.
+
+Remember to save your new partitioning scheme before quitting the program,
+create a swap partition, and remember you can always see this screen again
+by typing @[todo]. Type @[next] when you're done.
diff --git a/enchantment/modules/disk-partition/disk-partition.info
b/enchantment/modules/disk-partition/disk-partition.info
new file mode 100644
index 0000000..470f054
--- /dev/null
+++ b/enchantment/modules/disk-partition/disk-partition.info
@@ -0,0 +1 @@
+creating partitions
diff --git a/enchantment/modules/edit-confs b/enchantment/modules/edit-confs
deleted file mode 100644
index 1858656..0000000
--- a/enchantment/modules/edit-confs
+++ /dev/null
@@ -1,23 +0,0 @@
-@[edit-confs step]
-Now, we need to set up our partitions so the system will find them again on
-bootup. For this, edit @[/mnt/root/etc/fstab] and add your partitions.
-
-(For editors available on this iso, do @[help editors])
-
-Also, take a look at the files in @[/mnt/root/etc/sysconfig/] and edit any
you
-feel should be different. Especially, you should make sure the @[facilities]
file
-looks correct, and if you selected a custom keymap at the start of this
-install, you'll need to edit the file called @[keymap] in that directory
-(do @[ cat /tmp/selected-keymap] to see which you chose).
-
-You may also wish to create @[/mnt/root/etc/hostname] with a hostname for
your
-system, and you can set up networking by editing the
-@[/mnt/root/etc/network/interfaces] file.
-
-Finally, you can choose to set your timezone by doing the following:
-@[ smgl-chroot]
-@[ ln -sf /usr/share/zoneinfo/SOME/TIMEZONE /etc/localtime]
-
-Just remember to replace "SOME/TIMEZONE" with your actual timezone.
-
-Type @[next] to go to the next step.
diff --git a/enchantment/modules/edit-confs.info
b/enchantment/modules/edit-confs.info
deleted file mode 100644
index a460b43..0000000
--- a/enchantment/modules/edit-confs.info
+++ /dev/null
@@ -1 +0,0 @@
-editing the basic configuration files
diff --git a/enchantment/modules/edit-confs/edit-confs
b/enchantment/modules/edit-confs/edit-confs
new file mode 100644
index 0000000..1858656
--- /dev/null
+++ b/enchantment/modules/edit-confs/edit-confs
@@ -0,0 +1,23 @@
+@[edit-confs step]
+Now, we need to set up our partitions so the system will find them again on
+bootup. For this, edit @[/mnt/root/etc/fstab] and add your partitions.
+
+(For editors available on this iso, do @[help editors])
+
+Also, take a look at the files in @[/mnt/root/etc/sysconfig/] and edit any
you
+feel should be different. Especially, you should make sure the @[facilities]
file
+looks correct, and if you selected a custom keymap at the start of this
+install, you'll need to edit the file called @[keymap] in that directory
+(do @[ cat /tmp/selected-keymap] to see which you chose).
+
+You may also wish to create @[/mnt/root/etc/hostname] with a hostname for
your
+system, and you can set up networking by editing the
+@[/mnt/root/etc/network/interfaces] file.
+
+Finally, you can choose to set your timezone by doing the following:
+@[ smgl-chroot]
+@[ ln -sf /usr/share/zoneinfo/SOME/TIMEZONE /etc/localtime]
+
+Just remember to replace "SOME/TIMEZONE" with your actual timezone.
+
+Type @[next] to go to the next step.
diff --git a/enchantment/modules/edit-confs/edit-confs.info
b/enchantment/modules/edit-confs/edit-confs.info
new file mode 100644
index 0000000..a460b43
--- /dev/null
+++ b/enchantment/modules/edit-confs/edit-confs.info
@@ -0,0 +1 @@
+editing the basic configuration files
diff --git a/enchantment/modules/error b/enchantment/modules/error
deleted file mode 100644
index d81e770..0000000
--- a/enchantment/modules/error
+++ /dev/null
@@ -1 +0,0 @@
-I got confused. WTF. Well, hope for the best and type "next" to start over...
diff --git a/enchantment/modules/error.info b/enchantment/modules/error.info
deleted file mode 100644
index 2732448..0000000
--- a/enchantment/modules/error.info
+++ /dev/null
@@ -1 +0,0 @@
-an error was encountered
diff --git a/enchantment/modules/error/error b/enchantment/modules/error/error
new file mode 100644
index 0000000..d81e770
--- /dev/null
+++ b/enchantment/modules/error/error
@@ -0,0 +1 @@
+I got confused. WTF. Well, hope for the best and type "next" to start over...
diff --git a/enchantment/modules/error/error.info
b/enchantment/modules/error/error.info
new file mode 100644
index 0000000..2732448
--- /dev/null
+++ b/enchantment/modules/error/error.info
@@ -0,0 +1 @@
+an error was encountered
diff --git a/enchantment/modules/grub b/enchantment/modules/grub
deleted file mode 100644
index 74cf91f..0000000
--- a/enchantment/modules/grub
+++ /dev/null
@@ -1,23 +0,0 @@
-@[grub step]:
-To run grub properly, it needs to be chroot'ed into the new system.
-
-chroot into the system:
-@[ smgl-chroot]
-
-Copy all the necessary grub files to /boot:
-cp /usr/lib/grub/i386-pc/* /boot/grub
-
-Then run grub and enter the following commands, without the > in front
(adjust
-for your disk layout):
-@[ /sbin/grub]
-> @[root (hd0,0)]
-> @[setup (hd0)]
-> @[quit]
-
-Update menu.lst for your kernel:
-$EDITOR /boot/grub/menu.lst
-
-Exit the chroot:
-@[ exit]
-
-Type @[next] to go to the next step.
diff --git a/enchantment/modules/grub.info b/enchantment/modules/grub.info
deleted file mode 100644
index cc62224..0000000
--- a/enchantment/modules/grub.info
+++ /dev/null
@@ -1 +0,0 @@
-install and configure the grub bootloader
diff --git a/enchantment/modules/grub/grub b/enchantment/modules/grub/grub
new file mode 100644
index 0000000..74cf91f
--- /dev/null
+++ b/enchantment/modules/grub/grub
@@ -0,0 +1,23 @@
+@[grub step]:
+To run grub properly, it needs to be chroot'ed into the new system.
+
+chroot into the system:
+@[ smgl-chroot]
+
+Copy all the necessary grub files to /boot:
+cp /usr/lib/grub/i386-pc/* /boot/grub
+
+Then run grub and enter the following commands, without the > in front
(adjust
+for your disk layout):
+@[ /sbin/grub]
+> @[root (hd0,0)]
+> @[setup (hd0)]
+> @[quit]
+
+Update menu.lst for your kernel:
+$EDITOR /boot/grub/menu.lst
+
+Exit the chroot:
+@[ exit]
+
+Type @[next] to go to the next step.
diff --git a/enchantment/modules/grub/grub.info
b/enchantment/modules/grub/grub.info
new file mode 100644
index 0000000..cc62224
--- /dev/null
+++ b/enchantment/modules/grub/grub.info
@@ -0,0 +1 @@
+install and configure the grub bootloader
diff --git a/enchantment/modules/init b/enchantment/modules/init
deleted file mode 100644
index 7cd6fe4..0000000
--- a/enchantment/modules/init
+++ /dev/null
@@ -1,2 +0,0 @@
-@[init step]
-enter @[next].
diff --git a/enchantment/modules/init.info b/enchantment/modules/init.info
deleted file mode 100644
index da3882a..0000000
--- a/enchantment/modules/init.info
+++ /dev/null
@@ -1 +0,0 @@
-start of the install
diff --git a/enchantment/modules/init/init b/enchantment/modules/init/init
new file mode 100644
index 0000000..7cd6fe4
--- /dev/null
+++ b/enchantment/modules/init/init
@@ -0,0 +1,2 @@
+@[init step]
+enter @[next].
diff --git a/enchantment/modules/init/init.info
b/enchantment/modules/init/init.info
new file mode 100644
index 0000000..da3882a
--- /dev/null
+++ b/enchantment/modules/init/init.info
@@ -0,0 +1 @@
+start of the install
diff --git a/enchantment/modules/install b/enchantment/modules/install
deleted file mode 100644
index e8cd038..0000000
--- a/enchantment/modules/install
+++ /dev/null
@@ -1,23 +0,0 @@
-@[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 @[smgl-enchant] script. Note
-that system.tar.bz2 is @[required] for a new install.
-
-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 /var/cache/sorcery/lilo-22.8-i486-pc-linux-gnu.tar.bz2 -C
/mnt/root]
-
-enchant method (uses /tmp/spells):
-@[ smgl-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 @[ smgl-enchant] for more information.
-
-When the step finishes type @[next].
diff --git a/enchantment/modules/install.info
b/enchantment/modules/install.info
deleted file mode 100644
index e1eb7cf..0000000
--- a/enchantment/modules/install.info
+++ /dev/null
@@ -1 +0,0 @@
-install the base system and selected optional spells
diff --git a/enchantment/modules/install/install
b/enchantment/modules/install/install
new file mode 100644
index 0000000..e8cd038
--- /dev/null
+++ b/enchantment/modules/install/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 @[smgl-enchant] script. Note
+that system.tar.bz2 is @[required] for a new install.
+
+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 /var/cache/sorcery/lilo-22.8-i486-pc-linux-gnu.tar.bz2 -C
/mnt/root]
+
+enchant method (uses /tmp/spells):
+@[ smgl-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 @[ smgl-enchant] for more information.
+
+When the step finishes type @[next].
diff --git a/enchantment/modules/install/install.info
b/enchantment/modules/install/install.info
new file mode 100644
index 0000000..e1eb7cf
--- /dev/null
+++ b/enchantment/modules/install/install.info
@@ -0,0 +1 @@
+install the base system and selected optional spells
diff --git a/enchantment/modules/iso-kernel b/enchantment/modules/iso-kernel
deleted file mode 100644
index 460a899..0000000
--- a/enchantment/modules/iso-kernel
+++ /dev/null
@@ -1,22 +0,0 @@
-@[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. You can do this with a
-script we provide, or manually. Remember to modify your bootloader
-configuration to use the kernel you install if you wish to boot it!
-
-using smgl-kernel:
-@[ smgl-kernel]
-
-manually:
-copy the kernel itself:
-@[ cp /boot/config-$(uname -r) /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/]
-
-you'll probably also want the modprobe blacklist:
-@[ cp /etc/modprobe.d/blacklist /mnt/root/etc/modprobe.d/blacklist]
-
-Type @[next] to go to the next step.
diff --git a/enchantment/modules/iso-kernel.info
b/enchantment/modules/iso-kernel.info
deleted file mode 100644
index d998c9a..0000000
--- a/enchantment/modules/iso-kernel.info
+++ /dev/null
@@ -1 +0,0 @@
-install the kernel from the ISO into your target system
diff --git a/enchantment/modules/iso-kernel/iso-kernel
b/enchantment/modules/iso-kernel/iso-kernel
new file mode 100644
index 0000000..460a899
--- /dev/null
+++ b/enchantment/modules/iso-kernel/iso-kernel
@@ -0,0 +1,22 @@
+@[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. You can do this with a
+script we provide, or manually. Remember to modify your bootloader
+configuration to use the kernel you install if you wish to boot it!
+
+using smgl-kernel:
+@[ smgl-kernel]
+
+manually:
+copy the kernel itself:
+@[ cp /boot/config-$(uname -r) /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/]
+
+you'll probably also want the modprobe blacklist:
+@[ cp /etc/modprobe.d/blacklist /mnt/root/etc/modprobe.d/blacklist]
+
+Type @[next] to go to the next step.
diff --git a/enchantment/modules/iso-kernel/iso-kernel.info
b/enchantment/modules/iso-kernel/iso-kernel.info
new file mode 100644
index 0000000..d998c9a
--- /dev/null
+++ b/enchantment/modules/iso-kernel/iso-kernel.info
@@ -0,0 +1 @@
+install the kernel from the ISO into your target system
diff --git a/enchantment/modules/kernel b/enchantment/modules/kernel
deleted file mode 100644
index cd9f5a0..0000000
--- a/enchantment/modules/kernel
+++ /dev/null
@@ -1,12 +0,0 @@
-@[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/enchantment/modules/kernel.info b/enchantment/modules/kernel.info
deleted file mode 100644
index bb5c5a1..0000000
--- a/enchantment/modules/kernel.info
+++ /dev/null
@@ -1 +0,0 @@
-install ISO kernel and/or compile a custom kernel
diff --git a/enchantment/modules/kernel/kernel
b/enchantment/modules/kernel/kernel
new file mode 100644
index 0000000..cd9f5a0
--- /dev/null
+++ b/enchantment/modules/kernel/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/enchantment/modules/kernel/kernel.info
b/enchantment/modules/kernel/kernel.info
new file mode 100644
index 0000000..bb5c5a1
--- /dev/null
+++ b/enchantment/modules/kernel/kernel.info
@@ -0,0 +1 @@
+install ISO kernel and/or compile a custom kernel
diff --git a/enchantment/modules/lilo b/enchantment/modules/lilo
deleted file mode 100644
index 82c49bd..0000000
--- a/enchantment/modules/lilo
+++ /dev/null
@@ -1,20 +0,0 @@
-@[lilo step]:
-Edit @[/mnt/root/etc/lilo.conf] to your setup (especially, you'll want to
change
-the boot= and root= entries to point to your partitions, and you'll need to
-set the kernel version correctly).
-
-To run lilo properly, it needs to be chroot'ed into the new system. This
needs
-some directories (/dev, /proc), so we provide a wrapper to set those up for
-you and clean them up again when you're done.
-
-Run the script to get a shell inside the installed system:
-@[ smgl-chroot]
-
-Then run lilo so it updates the boot record:
-@[ /sbin/lilo]
-
-Exit the chroot:
-@[ exit]
-
-Unless you got an error message when you were installing the boot loader,
-you should be done with this step. Type @[next] to go to the next step.
diff --git a/enchantment/modules/lilo.info b/enchantment/modules/lilo.info
deleted file mode 100644
index 69e6cda..0000000
--- a/enchantment/modules/lilo.info
+++ /dev/null
@@ -1 +0,0 @@
-install and configure the lilo bootloader
diff --git a/enchantment/modules/lilo/lilo b/enchantment/modules/lilo/lilo
new file mode 100644
index 0000000..82c49bd
--- /dev/null
+++ b/enchantment/modules/lilo/lilo
@@ -0,0 +1,20 @@
+@[lilo step]:
+Edit @[/mnt/root/etc/lilo.conf] to your setup (especially, you'll want to
change
+the boot= and root= entries to point to your partitions, and you'll need to
+set the kernel version correctly).
+
+To run lilo properly, it needs to be chroot'ed into the new system. This
needs
+some directories (/dev, /proc), so we provide a wrapper to set those up for
+you and clean them up again when you're done.
+
+Run the script to get a shell inside the installed system:
+@[ smgl-chroot]
+
+Then run lilo so it updates the boot record:
+@[ /sbin/lilo]
+
+Exit the chroot:
+@[ exit]
+
+Unless you got an error message when you were installing the boot loader,
+you should be done with this step. Type @[next] to go to the next step.
diff --git a/enchantment/modules/lilo/lilo.info
b/enchantment/modules/lilo/lilo.info
new file mode 100644
index 0000000..69e6cda
--- /dev/null
+++ b/enchantment/modules/lilo/lilo.info
@@ -0,0 +1 @@
+install and configure the lilo bootloader
diff --git a/enchantment/modules/reboot b/enchantment/modules/reboot
deleted file mode 100644
index 5eb2dc9..0000000
--- a/enchantment/modules/reboot
+++ /dev/null
@@ -1,12 +0,0 @@
-@[reboot step]
-You should be all done with the installation! Congratulations! Time to reboot
-into your installed system! Just type:
-
-@[ reboot]
-
-If you installed @[smgl-setup] (installed by default unless changed), be
sure to
-run @[man smgl-setup] when first logging in. It will provide you with
-information on what you can do with your newly installed system.
-
-We don't (yet) eject the CD during shutdown, so be sure to take it out during
-reboot or configure your BIOS not to try and boot from it.
diff --git a/enchantment/modules/reboot.info b/enchantment/modules/reboot.info
deleted file mode 100644
index 9c8e7ef..0000000
--- a/enchantment/modules/reboot.info
+++ /dev/null
@@ -1 +0,0 @@
-reboot into the new system
diff --git a/enchantment/modules/reboot/reboot
b/enchantment/modules/reboot/reboot
new file mode 100644
index 0000000..5eb2dc9
--- /dev/null
+++ b/enchantment/modules/reboot/reboot
@@ -0,0 +1,12 @@
+@[reboot step]
+You should be all done with the installation! Congratulations! Time to reboot
+into your installed system! Just type:
+
+@[ reboot]
+
+If you installed @[smgl-setup] (installed by default unless changed), be
sure to
+run @[man smgl-setup] when first logging in. It will provide you with
+information on what you can do with your newly installed system.
+
+We don't (yet) eject the CD during shutdown, so be sure to take it out during
+reboot or configure your BIOS not to try and boot from it.
diff --git a/enchantment/modules/reboot/reboot.info
b/enchantment/modules/reboot/reboot.info
new file mode 100644
index 0000000..9c8e7ef
--- /dev/null
+++ b/enchantment/modules/reboot/reboot.info
@@ -0,0 +1 @@
+reboot into the new system
diff --git a/enchantment/modules/select-spells
b/enchantment/modules/select-spells
deleted file mode 100644
index 7dbf13e..0000000
--- a/enchantment/modules/select-spells
+++ /dev/null
@@ -1,23 +0,0 @@
-@[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/spells. 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/spells. @[NOTE:] the ISO caches represent ALL spells
installed
-for the ISO runtime, and are selectable for install, regardless of whether
they
-are also included in system.tar.bz2 as well - gcc, glibc, bash, etc. are
-available both in system.tar.bz2 AND in the ISO's /var/cache/sorcery/
-directory. For a list of the spells in system.tar.bz2, see /tmp/rspells.
-
-text menu:
-@[ smgl-spells]
-
-manual:
-@[ $EDITOR /tmp/spells]
-
-You can of course use any editor you like, in case you haven't set $EDITOR.
-
-You can re-edit /tmp/spells any time during the install session and it will
-remember your changes each time. Likewise, you may re-run @[smgl-spells].
-
-When you are finished selecting your spells, type @[next].
diff --git a/enchantment/modules/select-spells.info
b/enchantment/modules/select-spells.info
deleted file mode 100644
index abeb713..0000000
--- a/enchantment/modules/select-spells.info
+++ /dev/null
@@ -1 +0,0 @@
-choose the spells to install
diff --git a/enchantment/modules/select-spells/select-spells
b/enchantment/modules/select-spells/select-spells
new file mode 100644
index 0000000..7dbf13e
--- /dev/null
+++ b/enchantment/modules/select-spells/select-spells
@@ -0,0 +1,23 @@
+@[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/spells. 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/spells. @[NOTE:] the ISO caches represent ALL spells
installed
+for the ISO runtime, and are selectable for install, regardless of whether
they
+are also included in system.tar.bz2 as well - gcc, glibc, bash, etc. are
+available both in system.tar.bz2 AND in the ISO's /var/cache/sorcery/
+directory. For a list of the spells in system.tar.bz2, see /tmp/rspells.
+
+text menu:
+@[ smgl-spells]
+
+manual:
+@[ $EDITOR /tmp/spells]
+
+You can of course use any editor you like, in case you haven't set $EDITOR.
+
+You can re-edit /tmp/spells any time during the install session and it will
+remember your changes each time. Likewise, you may re-run @[smgl-spells].
+
+When you are finished selecting your spells, type @[next].
diff --git a/enchantment/modules/select-spells/select-spells.info
b/enchantment/modules/select-spells/select-spells.info
new file mode 100644
index 0000000..abeb713
--- /dev/null
+++ b/enchantment/modules/select-spells/select-spells.info
@@ -0,0 +1 @@
+choose the spells to install
diff --git a/enchantment/modules/user-setup b/enchantment/modules/user-setup
deleted file mode 100644
index 006ab3d..0000000
--- a/enchantment/modules/user-setup
+++ /dev/null
@@ -1,17 +0,0 @@
-@[user-setup step]
-To set up users, chroot into the target system as for the bootloader step:
-@[ smgl-chroot]
-
-Set a password for the root user (pick a secure one, but not one you'll
forget,
-and bear in mind that it can be bypassed with a screwdriver):
-@[ passwd root]
-
-@[Recommended]: add at least one regular user for daily use:
-@[ useradd -m -d /home/mbolton ]-g users@[ mbolton]
-@[ passwd mbolton]
-
-Replace mbolton with whatever login you want. Don't forget to change
-/home/mbolton accordingly. You may also change the group (-g users).
-
-Finally, exit the chroot to return to the installer:
-@[ exit]
diff --git a/enchantment/modules/user-setup.info
b/enchantment/modules/user-setup.info
deleted file mode 100644
index cd1aea6..0000000
--- a/enchantment/modules/user-setup.info
+++ /dev/null
@@ -1 +0,0 @@
-set root password, create regular users
diff --git a/enchantment/modules/user-setup/user-setup
b/enchantment/modules/user-setup/user-setup
new file mode 100644
index 0000000..006ab3d
--- /dev/null
+++ b/enchantment/modules/user-setup/user-setup
@@ -0,0 +1,17 @@
+@[user-setup step]
+To set up users, chroot into the target system as for the bootloader step:
+@[ smgl-chroot]
+
+Set a password for the root user (pick a secure one, but not one you'll
forget,
+and bear in mind that it can be bypassed with a screwdriver):
+@[ passwd root]
+
+@[Recommended]: add at least one regular user for daily use:
+@[ useradd -m -d /home/mbolton ]-g users@[ mbolton]
+@[ passwd mbolton]
+
+Replace mbolton with whatever login you want. Don't forget to change
+/home/mbolton accordingly. You may also change the group (-g users).
+
+Finally, exit the chroot to return to the installer:
+@[ exit]
diff --git a/enchantment/modules/user-setup/user-setup.info
b/enchantment/modules/user-setup/user-setup.info
new file mode 100644
index 0000000..cd1aea6
--- /dev/null
+++ b/enchantment/modules/user-setup/user-setup.info
@@ -0,0 +1 @@
+set root password, create regular users
diff --git a/enchantment/shell/bashrc b/enchantment/shell/bashrc
index 0f8368a..077705e 100755
--- a/enchantment/shell/bashrc
+++ b/enchantment/shell/bashrc
@@ -83,7 +83,7 @@ function shell_modules() {
done

# output name and info in columns
- echo "$module" | paste - "$ENCHANT_MODULES/${module}.info"
+ echo "$module" | paste - "$ENCHANT_MODULES/$module/${module}.info"
done
}

@@ -108,7 +108,7 @@ function todo() {
shell_header

# output the current module's instructions
- shell_instructions "$ENCHANT_MODULES/$curstep"
+ shell_instructions "$ENCHANT_MODULES/$curstep/$curstep"
}

function next() {



  • [SM-Commit] GIT changes to master cauldron by Justin Boffemmyer (14b341e7a5f44191aff54b0ff7aacc3132e7a6de), Justin Boffemmyer, 03/14/2010

Archive powered by MHonArc 2.6.24.

Top of Page