Skip to Content.
Sympa Menu

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

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 (2b7d4a20e618d614c0f9cbc182aec4864a01886c)
  • Date: Sun, 4 Jan 2009 23:24:58 -0600

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

data/rspells.x86 | 4 ++-
iso/usr/share/doc/smgl.install/steps/compile-kernel | 10 ++++-----
iso/usr/share/doc/smgl.install/steps/grub | 21
++++++++++----------
iso/usr/share/doc/smgl.install/steps/install | 2 -
iso/usr/share/doc/smgl.install/steps/iso-kernel | 3 +-
iso/usr/share/doc/smgl.install/steps/lilo | 2 -
iso/usr/share/smgl.install/smgl-kernel | 17 ++++++++++++++++
iso/usr/share/smgl.install/smgl-spells | 11 +++++-----
8 files changed, 46 insertions(+), 24 deletions(-)

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

steps/grub: corrected instructions

Corrected the instructions so that grub will successfully install.

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

steps/lilo: add missing period

Added stray punctuation to the end of a sentence in the instructions.

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

steps/{compile,iso}-kernel: remind bootloader conf

Remind the user to update the bootloader config(s) to point to the new
kernel image. Also cleaned up the compile-kernel instructions a little
bit.

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

smgl.install/smgl-kernel: offer to symlink kernel

Offer the choice of symlinking the installed kernel image to
/boot/vmlinuz for end-user convenience.

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

data/rspells.x86: gcc needs mpfr and gmp

Without mpfr and gmp, recent gcc will fail to function, leaving a
non-working SMGL install.

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

smgl.install/smgl-spells: fix writing /tmp/spells

The spell was previously only adding spells that were turned on, so if a
previously selected spell was turned off that information wasn't saved.
Now the write-to-file implementation is correct.

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

steps/install: opt-spells -> spells

Missed this correction when opt-spells was changed to spells before.

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

smgl.install/smgl.kernel: inc verbosity

Output each file or directory that is being installed to the user's
system so that they know what is being copied over and where it is
going.

diff --git a/data/rspells.x86 b/data/rspells.x86
index e2d99d3..9aed03a 100644
--- a/data/rspells.x86
+++ b/data/rspells.x86
@@ -12,12 +12,13 @@ gawk
gcc
gettext
glibc
+gmp
gnupg
grep
gzip
iana-etc
-init.d
ifupdown
+init.d
installwatch
kbd
libidn
@@ -25,6 +26,7 @@ libtool
locale
make
module-init-tools
+mpfr
nano
ncurses
net-tools
diff --git a/iso/usr/share/doc/smgl.install/steps/compile-kernel
b/iso/usr/share/doc/smgl.install/steps/compile-kernel
index 008660f..cf1864c 100644
--- a/iso/usr/share/doc/smgl.install/steps/compile-kernel
+++ b/iso/usr/share/doc/smgl.install/steps/compile-kernel
@@ -1,6 +1,7 @@
compile-kernel step
You may now set up a custom kernel for your installation by casting the linux
-spell or compiling and installing manually.
+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
@@ -8,10 +9,9 @@ chroot into your system:
spell install:
 cast -r linux

-manual install:
- cd /usr/src
- tar -jxvf linux-2.6.22.tar.bz2 (leave out v to silence tar
output)
- ln -sf /usr/src/linux-2.6.22 /usr/src/linux && cd /usr/src/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-2.6.22
 cp -f .config /boot/config-2.6.22
diff --git a/iso/usr/share/doc/smgl.install/steps/grub
b/iso/usr/share/doc/smgl.install/steps/grub
index 4719b93..2c32a30 100644
--- a/iso/usr/share/doc/smgl.install/steps/grub
+++ b/iso/usr/share/doc/smgl.install/steps/grub
@@ -1,22 +1,23 @@
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.
+To run grub properly, it needs to be chroot'ed into the new system.

-Run the script to get a shell inside the installed system:
+chroot into the system:
 smgl-chroot

-Then run grub so you can update the boot record (TODO: use grub-install
here?):
- /sbin/grub
+Copy all the necessary grub files to /boot:
+cp /usr/lib/grub/i386-pc/* /boot/grub

-You'll get a grub shell, where you need to enter the following commands,
-without the > in front (adjust for your disk layout):
+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/menu.list
+
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.
+Type next to go to the next step.
diff --git a/iso/usr/share/doc/smgl.install/steps/install
b/iso/usr/share/doc/smgl.install/steps/install
index 35f04fd..bf04b15 100644
--- a/iso/usr/share/doc/smgl.install/steps/install
+++ b/iso/usr/share/doc/smgl.install/steps/install
@@ -12,7 +12,7 @@ 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 method (uses /tmp/spells):
 smgl-enchant

Enchant can also take a command-line argument to a cache file with a
specified
diff --git a/iso/usr/share/doc/smgl.install/steps/iso-kernel
b/iso/usr/share/doc/smgl.install/steps/iso-kernel
index ef6c1a6..97deedc 100644
--- a/iso/usr/share/doc/smgl.install/steps/iso-kernel
+++ b/iso/usr/share/doc/smgl.install/steps/iso-kernel
@@ -2,7 +2,8 @@
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.
+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
diff --git a/iso/usr/share/doc/smgl.install/steps/lilo
b/iso/usr/share/doc/smgl.install/steps/lilo
index 730962e..da8f45c 100644
--- a/iso/usr/share/doc/smgl.install/steps/lilo
+++ b/iso/usr/share/doc/smgl.install/steps/lilo
@@ -1,7 +1,7 @@
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)
+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
diff --git a/iso/usr/share/smgl.install/smgl-kernel
b/iso/usr/share/smgl.install/smgl-kernel
index 0ae360c..e71b0b2 100755
--- a/iso/usr/share/smgl.install/smgl-kernel
+++ b/iso/usr/share/smgl.install/smgl-kernel
@@ -26,16 +26,33 @@ shift $(($OPTIND - 1))
TARGET="${TARGET:-/mnt/root}"

# Copy the kernel config
+echo "Installing kernel config to $TARGET/boot/config-$(uname -r)"
cp -f /boot/config-$(uname -r) "$TARGET"/boot/config-$(uname -r)

# Copy the kernel image
+echo "Installing kernel to $TARGET/boot/vmlinuz-$(uname -r)"
cp -f /boot/linux "$TARGET"/boot/vmlinuz-$(uname -r)
+while true
+do
+ echo -n "Create /boot/vmlinuz symlink? [yn] "
+ read -n1 input
+ echo ""
+ case $input in
+ "y" ) ln -sf "$TARGET"/boot/vmlinuz-$(uname -r) "$TARGET"/boot/vmlinuz
+ break
+ ;;
+ "n" ) break
+ ;;
+ esac
+done

# Copy all kernel modules
[[ -d "$TARGET"/lib/modules ]] || mkdir -p "$TARGET"/lib/modules
+echo "Installing kernel modules to $TARGET/lib/modules/$(uname -r)"
cp -fr /lib/modules/$(uname -r) "$TARGET"/lib/modules/

[[ ! -d "$TARGET"/etc/modprobe.d ]] && mkdir -p "$TARGET"/etc/modrobe.d
+echo "Installing modprobe blacklist to $TARGET/etc/modprobe.d/blacklist"
cp -f /etc/modprobe.d/blacklist "$TARGET"/etc/modprobe.d/blacklist


diff --git a/iso/usr/share/smgl.install/smgl-spells
b/iso/usr/share/smgl.install/smgl-spells
index c11017a..a9b1b18 100755
--- a/iso/usr/share/smgl.install/smgl-spells
+++ b/iso/usr/share/smgl.install/smgl-spells
@@ -96,7 +96,6 @@ function prompt() {
# if 'n', we want none
if [[ $choice == "n" ]]
then
- echo "none" >&2
for ((i=0; i < $NUM_CACHES; i++))
do
SELECTED[i]=
@@ -139,16 +138,18 @@ function main {
done

# for each selected spell, output it to the spell listing file
+ rm /tmp/spells
for (( i=0; i < $NUM_CACHES; i++ ))
do
- if [[ ${SELECTED[i]} = "*" ]]
+ if [[ ${SELECTED[i]} != "*" ]]
then
- echo ${CACHES[i]} >> /tmp/spells
+ CACHES[i]=
fi
+ echo ${CACHES[i]} >> /tmp/spells
done

# make sure we don't have duplicates
- [[ -e /tmp/spells ]] && sort -u -o /tmp/spells /tmp/spells
+ sort -u -o /tmp/spells /tmp/spells
}

function message() {
@@ -165,13 +166,13 @@ function message() {
fit on one screen you will be able to scroll. When you are satisfied with
your selections, enter 0 (zero) and the list of spells to cast will be
installed.
+
Message
}

message

main
-#clear







Archive powered by MHonArc 2.6.24.

Top of Page