Skip to Content.
Sympa Menu

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

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 (1a0e67d88fa4d420ba8e661db46d6065460bd07d)
  • Date: Sat, 9 Aug 2008 13:07:54 -0500

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

iso/usr/share/doc/smgl.install/steps/copy-base | 5 ++-
iso/usr/share/doc/smgl.install/steps/disk-format | 14 +++++-----
iso/usr/share/doc/smgl.install/steps/disk-mount | 22
++++++++--------
iso/usr/share/doc/smgl.install/steps/disk-partition | 7 ++---
iso/usr/share/doc/smgl.install/steps/edit-confs | 2 -
iso/usr/share/doc/smgl.install/steps/error | 2 -
iso/usr/share/doc/smgl.install/steps/grub | 8 ++---
iso/usr/share/doc/smgl.install/steps/init | 1
iso/usr/share/doc/smgl.install/steps/install-opt-spells | 3 +-
iso/usr/share/doc/smgl.install/steps/lilo | 11 +++-----
iso/usr/share/doc/smgl.install/steps/reboot | 6 ++--
11 files changed, 42 insertions(+), 39 deletions(-)

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

formatting changes

Added single-space indent to the commands the user should run, and
made the step titling consistent. Some other minor formatting changes
as well. Hopefully this will achieve a slightly better "pretty-print",
until we have options for booting with and without ANSI color.

diff --git a/iso/usr/share/doc/smgl.install/steps/copy-base
b/iso/usr/share/doc/smgl.install/steps/copy-base
index 8e9090b..ffe4774 100644
--- a/iso/usr/share/doc/smgl.install/steps/copy-base
+++ b/iso/usr/share/doc/smgl.install/steps/copy-base
@@ -1,3 +1,4 @@
+copy-base step
Now, it's time to set up the basic smgl installation.
Don't forget to mount any partitions you need first (this depends on your
partition scheme; i.e. if you have a separate partition that you intend to
@@ -5,12 +6,12 @@ mount as /var, mount that now). You may need to create the
directories for
the mount points you intend to mount.

Run the following command:
-tar -xjvf /system.tar.bz2 -C /mnt/root
+ tar -xjvf /system.tar.bz2 -C /mnt/root
(if BearPerson gets his lazy ass in gear, we might have an alias for this
soon to cut down on typing)

If you don't need to see output rushing by to give you the feeling that
something is going on, leave out the v (turning -xjvf into
-xjf)
-to make tar shut up unless there's errors.
+to make tar shut up (unless there's errors).

When the command has completed, type next as usual.
diff --git a/iso/usr/share/doc/smgl.install/steps/disk-format
b/iso/usr/share/doc/smgl.install/steps/disk-format
index 7c8c4fd..18d6df9 100644
--- a/iso/usr/share/doc/smgl.install/steps/disk-format
+++ b/iso/usr/share/doc/smgl.install/steps/disk-format
@@ -4,14 +4,14 @@ 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/hda1
-mkfs.ext3 /dev/hda1
-mkreiserfs /dev/hda1
-mkfs.jfs /dev/hda1
-mkfs.xfs /dev/hda1
+ mke2fs /dev/hda1
+ mkfs.ext3 /dev/hda1
+ mkreiserfs /dev/hda1
+ mkfs.jfs /dev/hda1
+ mkfs.xfs /dev/hda1

-# swap:
-mkswap /dev/hda2
+You probably want a swap partition:
+ mkswap /dev/hda2

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
diff --git a/iso/usr/share/doc/smgl.install/steps/disk-mount
b/iso/usr/share/doc/smgl.install/steps/disk-mount
index c529f5a..8046a80 100644
--- a/iso/usr/share/doc/smgl.install/steps/disk-mount
+++ b/iso/usr/share/doc/smgl.install/steps/disk-mount
@@ -1,23 +1,23 @@
disk-mount step
-Now, you need to mount the filesystems. We'll be installing to /mnt/root,
-so mount the filesystem that will be / onto /mnt/root.
+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/hda1 /mnt/root
-mount -t reiserfs /dev/hda1 /mnt/root
-mount -t xfs /dev/hda1 /mnt/root
+ mount -t ext2 /dev/hda1 /mnt/root
+ mount -t reiserfs /dev/hda1 /mnt/root
+ mount -t xfs /dev/hda1 /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 just formatted the / partition). Make sure you mount / first.
+(assuming you formatted the / partition). Make sure you mount / first.

For example, if you created /dev/hda2 for /usr:
-mkdir /mnt/root/usr
-mount -t ext2 /dev/hda2 /mnt/root/usr
+ mkdir /mnt/root/usr
+ mount -t ext2 /dev/hda2 /mnt/root/usr
(or, for example, if it's a jfs partition)
-mount -t jfs /dev/hda1 /mnt/root
+ mount -t jfs /dev/hda1 /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/hda2
+ swapon /dev/hda2
diff --git a/iso/usr/share/doc/smgl.install/steps/disk-partition
b/iso/usr/share/doc/smgl.install/steps/disk-partition
index 36b994e..08ffd10 100644
--- a/iso/usr/share/doc/smgl.install/steps/disk-partition
+++ b/iso/usr/share/doc/smgl.install/steps/disk-partition
@@ -1,3 +1,4 @@
+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
(TODO: describe how to find that out).
@@ -5,13 +6,13 @@ SMGL to. You'll need to know the device of your hard disk
to do this
This image ships with several popular programs for partitioning:

cfdisk is probably the most popular, a curses-based menu system:
-cfdisk /dev/hda
+ cfdisk /dev/hda

parted is also menu-based, can resize partitions, but may be a tad confusing:
-parted /dev/hda
+ parted /dev/hda

Then for the purists there's plain line-based fdisk. Can be a bit hard to
use:
-fdisk /dev/hda
+ fdisk /dev/hda

The iso also ships with sfdisk, if you're insane enough to want to use
it.
diff --git a/iso/usr/share/doc/smgl.install/steps/edit-confs
b/iso/usr/share/doc/smgl.install/steps/edit-confs
index 5452d82..e9449a0 100644
--- a/iso/usr/share/doc/smgl.install/steps/edit-confs
+++ b/iso/usr/share/doc/smgl.install/steps/edit-confs
@@ -1,4 +1,4 @@
-editing basic configuration files
+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.
diff --git a/iso/usr/share/doc/smgl.install/steps/error
b/iso/usr/share/doc/smgl.install/steps/error
index 9b9e0bd..d81e770 100644
--- a/iso/usr/share/doc/smgl.install/steps/error
+++ b/iso/usr/share/doc/smgl.install/steps/error
@@ -1 +1 @@
-I got confused. wtf. well, hope for the best, type "next" to start over...
+I got confused. WTF. Well, hope for the best and type "next" to start over...
diff --git a/iso/usr/share/doc/smgl.install/steps/grub
b/iso/usr/share/doc/smgl.install/steps/grub
index e74f269..4719b93 100644
--- a/iso/usr/share/doc/smgl.install/steps/grub
+++ b/iso/usr/share/doc/smgl.install/steps/grub
@@ -1,13 +1,13 @@
-grub instructions:
+grub step:
To run grub 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
+ smgl-chroot

Then run grub so you can update the boot record (TODO: use grub-install
here?):
-/sbin/grub
+ /sbin/grub

You'll get a grub shell, where you need to enter the following commands,
without the > in front (adjust for your disk layout):
@@ -16,7 +16,7 @@ without the > in front (adjust for your disk layout):
> quit

Exit the chroot:
-exit
+ 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/iso/usr/share/doc/smgl.install/steps/init
b/iso/usr/share/doc/smgl.install/steps/init
index 9b508f6..91dbfeb 100644
--- a/iso/usr/share/doc/smgl.install/steps/init
+++ b/iso/usr/share/doc/smgl.install/steps/init
@@ -1 +1,2 @@
+init step
enter next.
diff --git a/iso/usr/share/doc/smgl.install/steps/install-opt-spells
b/iso/usr/share/doc/smgl.install/steps/install-opt-spells
index 075d123..d095955 100644
--- a/iso/usr/share/doc/smgl.install/steps/install-opt-spells
+++ b/iso/usr/share/doc/smgl.install/steps/install-opt-spells
@@ -1,4 +1,5 @@
-At this point, you'll be installing other spells that might come in handy.
+install-opt-spells step
+At this point, you would be installing other spells that might come in handy.

Except that this version of the iso doesn't actually ship with any yet,
so just hit that next.
diff --git a/iso/usr/share/doc/smgl.install/steps/lilo
b/iso/usr/share/doc/smgl.install/steps/lilo
index 370eb10..730962e 100644
--- a/iso/usr/share/doc/smgl.install/steps/lilo
+++ b/iso/usr/share/doc/smgl.install/steps/lilo
@@ -1,4 +1,4 @@
-lilo instructions:
+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)
@@ -8,14 +8,13 @@ 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
+ smgl-chroot

Then run lilo so it updates the boot record:
-/sbin/lilo
+ /sbin/lilo

Exit the chroot:
-exit
+ 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.
+you should be done with this step. Type next to go to the next step.
diff --git a/iso/usr/share/doc/smgl.install/steps/reboot
b/iso/usr/share/doc/smgl.install/steps/reboot
index 8d6ff88..051802d 100644
--- a/iso/usr/share/doc/smgl.install/steps/reboot
+++ b/iso/usr/share/doc/smgl.install/steps/reboot
@@ -1,4 +1,4 @@
-Finished!
+reboot step
You should be all done with the installation! Congratulations!

Now it is time to umount all of your partitions. For all partitions you
mounted
@@ -13,8 +13,8 @@ umount /mnt/root/var/spool
umount /mnt/root/var
umount /mnt/root

-Now, reboot via something like
-shutdown -r now "install finished"
+Now, reboot via something like:
+ shutdown -r now "install finished"

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.



  • [SM-Commit] GIT changes to master cauldron by Justin Boffemmyer (1a0e67d88fa4d420ba8e661db46d6065460bd07d), Justin Boffemmyer, 08/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page