New commits:
commit 7719dadc94e40afbb3dc7ec70ff4d8a0da43e281
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
smgl.init: use udev for booting
Updated the initrd init script to make use of udev to load modules and
populate /dev at boot time. This provides automatic hardware
detection, which can be rather useful on the ISO.
commit d8ca9eb2ec7f6422a358f7cbdd7d09a707c1558a
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
cleaniso.sh: ISO cleaning script
cleaniso.sh prunes the ISO filesystem of things it doesn't need. This
includes the build environment (gcc, g++, etc.). However, gcc and g++
both provide libraries that some binaries rely on during runtime, so a
simple "dispel $SPELL" would be overly destructive. The cleaners are
simple text listings of files/directories to be removed, one per line.
The format is exactly the same as the output from gaze install $SPELL,
except that the lines pertaining to files that need to remain on the
ISO are removed so that they won't be cleaned.
commit 081836732b4062ed1bf9f95a92565253d5875c3d
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
steps/compile-kernel: Updated to include casting
Updated the compile-kernel step information to include instructions
for casting the linux spell in addition to manually compiling and
installing it. Also cleaned up the manual instructions a bit.
KERNEL=`uname -r`
MOUNT=/mnt/cdrom
diff --git a/iso/usr/share/doc/smgl.install/steps/compile-kernel
b/iso/usr/share/doc/smgl.install/steps/compile-kernel
index d82143c..1fa08eb 100644
--- a/iso/usr/share/doc/smgl.install/steps/compile-kernel
+++ b/iso/usr/share/doc/smgl.install/steps/compile-kernel
@@ -1,21 +1,22 @@
[1mcompile-kernel[m
This step is optional but recommended. You may now set up a custom kernel for
-your installation. To do so, run the following commands.
+your installation. You can either do this by casting the spell or
+compiling and installing manually.
chroot into your system:
[1m smgl-chroot[m
-Unpack the kernel sources:
+spell install:
+[1m cast -r linux[m
+
+manual install:
[1m cd /usr/src[m
[1m tar -jxvf linux-2.6.22.tar.bz2[m (leave out [1mv[m to silence tar
output)
-
-Symlink to /usr/src/linux and change directory
[1m ln -sf /usr/src/linux-2.6.22 /usr/src/linux && cd /usr/src/linux[m
-
-Configure, make, and install:
-[1m make menuconfig[m
-[1m make && make modules_install[m
-[1m cp -f /usr/src/linux/arch/i386/boot/bzImage /boot/vmlinuz-2.6.22[m
+[1m make menuconfig && make && make modules_install[m
+[1m cp -f arch/i386/boot/bzImage /boot/vmlinuz-2.6.22[m
+[1m cp -f .config /boot/config-2.6.22[m
+[1m cp -f System.map /boot/System.map-2.6.22[m
Exit the chroot:
[1mexit[m
diff --git a/scripts/cleaniso.sh b/scripts/cleaniso.sh
new file mode 100755
index 0000000..5538e5e
--- /dev/null
+++ b/scripts/cleaniso.sh
@@ -0,0 +1,44 @@
+#/bin/bash
+
+# CLEANFILEs are located in cauldron/data/cleaners
+
+if [[ $# -lt 2 ]]
+then
+ echo ""
+ echo "Usage: $0 iso_chroot cleaner(s)"
+ echo ""
+ echo "For each cleaner specified as an argument, cleans the"
+ echo "files and directories listed therein from iso_chroot."
+ echo "A cleaner is the ouput of 'gaze install \$SPELL' minus"
+ echo "whatever you don't want removed."
+ echo ""
+ exit 1
+fi >&2
+
+# location of ISO chroot to clean from
+ISOCHROOT="$1"
+shift
+
+for CLEANER in "$@"
+do
+ # Reverse sort ensures that the gaze install output we have lists
files
+ # before directories, so that directories can be cleaned using rmdir
+ # after the files are cleaned first. This is safer, since it avoids
the
+ # mighty 'rm -fr' oopses.
+ for i in $(sort -r "$CLEANFILE")
+ do
+ # test if current listing is a dir, should only be true after
+ # the files under the dir are already cleaned
+ if [[ -d "$i" ]]
+ then
+ # chroot and clean a directory using rmdir
+ echo "Attempting to remove directory $i..."
+ chroot "$ISOCHROOT" rmdir "$i"
+ else
+ # chroot and clean an individual file
+ echo "Deleting $i"
+ chroot "$ISOCHROOT" rm "$i"
+ fi
+ done
+done
+
[SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (7719dadc94e40afbb3dc7ec70ff4d8a0da43e281),
Justin Boffemmyer, 09/30/2008