Source Mage code commit list

[Justin Boffemmyer <scm AT sourcemage.org>]

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

 data/initrd.files     |   38 +++++++++++++++++++++-----------------
 initrd/sbin/smgl.init |    4 ++--
 scripts/mkiso.sh      |   17 +++++++++++++----
 scripts/mkrelease.sh  |   12 ++++++++----
 4 files changed, 44 insertions(+), 27 deletions(-)

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

    scripts/mkiso.sh: updated usage() info
    
    Updated the usage() info to explain the compression options as well as
    the proper usage of the chown option.

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

    scripts/mk{iso,release}.sh: fix chown cmds
    
    Fixed the implementation of the chown usage in both scripts.

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

    initrd/sbin/smgl.init: don't force iso9660
    
    This should prevent the initrd from explicitly forcing iso9660 on
    attempted mounts, and should allow the "ISO" to boot from more devices.
    See bug #14929.

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

    data/initrd.files: update for newer udev
    
    Updated the initrd.files to match the files required by newer udev. This
    file still has too much hardcoded for udev and needs to be improved on.

diff --git a/data/initrd.files b/data/initrd.files
index 1bee8ec..6764446 100644
--- a/data/initrd.files
+++ b/data/initrd.files
@@ -21,42 +21,46 @@ rmmod
 pidof
 killall5
 udevadm
-udevcontrol
 udevd
 udevinfo
-udevsettle
-udevtrigger
 /etc/modprobe.d/udev
 /etc/scsi_id.config
 /etc/udev/rules.d/40-alsa.rules
-/etc/udev/rules.d/50-default.rules
-/etc/udev/rules.d/50-udev-default.rules
+/etc/udev/rules.d/51-udev-default.rules
 /etc/udev/rules.d/52-modules.rules
-/etc/udev/rules.d/60-cdrom_id.rules
-/etc/udev/rules.d/60-persistent-input.rules
-/etc/udev/rules.d/60-persistent-storage-tape.rules
-/etc/udev/rules.d/60-persistent-storage.rules
-/etc/udev/rules.d/61-persistent-storage-edd.rules
-/etc/udev/rules.d/70-cdrom_perms.rules
-/etc/udev/rules.d/75-cd-aliases-generator.rules
-/etc/udev/rules.d/75-persistent-net-generator.rules
-/etc/udev/rules.d/80-drivers.rules
-/etc/udev/rules.d/95-udev-late.rules
+/etc/udev/rules.d/76-cdrom_perms.rules
 /etc/udev/rules.d/README
 /etc/udev/rules.d/rules.examples
 /etc/udev/udev.conf
 /etc/udev/udev.missing
-/lib/libvolume_id.so.0
-/lib/libvolume_id.so.0.82.0
+/lib/libudev.so.0
+/lib/libudev.so.0.0.2
+/lib/libvolume_id.so.1
+/lib/libvolume_id.so.1.0.2
 /lib/udev/ata_id
 /lib/udev/cdrom_id
 /lib/udev/create_floppy_devices
 /lib/udev/edd_id
 /lib/udev/firmware.sh
+/lib/udev/fstab_import
+/lib/udev/path_id
 /lib/udev/rule_generator.functions
+/lib/udev/rules.d/50-udev-default.rules
+/lib/udev/rules.d/60-cdrom_id.rules
+/lib/udev/rules.d/60-persistent-input.rules
+/lib/udev/rules.d/60-persistent-storage-tape.rules
+/lib/udev/rules.d/60-persistent-storage.rules
+/lib/udev/rules.d/60-persistent-v4l.rules
+/lib/udev/rules.d/61-persistent-storage-edd.rules
+/lib/udev/rules.d/75-cd-aliases-generator.rules
+/lib/udev/rules.d/75-persistent-net-generator.rules
+/lib/udev/rules.d/79-fstab_import.rules
+/lib/udev/rules.d/80-drivers.rules
+/lib/udev/rules.d/95-udev-late.rules
 /lib/udev/scsi_id
 /lib/udev/usb_id
 /lib/udev/vol_id
 /lib/udev/write_cd_rules
 /lib/udev/write_net_rules
+/usr/lib/libudev.so
 /usr/lib/libvolume_id.so
diff --git a/initrd/sbin/smgl.init b/initrd/sbin/smgl.init
index 9410122..d213658 100755
--- a/initrd/sbin/smgl.init
+++ b/initrd/sbin/smgl.init
@@ -7,7 +7,7 @@ shell() {
 
 test_cdrom() {
   local found=false
-  mount -n -r -t iso9660 $1 $MOUNT 2>/dev/null
+  mount -n -r $1 $MOUNT 2>/dev/null
   if [ -f $ID ] ;then
     found=true
   fi
@@ -92,7 +92,7 @@ main()  {
 
     echo "Attempting to boot from $SMGL_CD..."
 
-       ROOT=$SMGL_CD
+       ROOT="${ROOT:-$SMGL_CD}"
     VFSTYPE=iso9660
     OPTIONS="defaults,ro"
 
diff --git a/scripts/mkiso.sh b/scripts/mkiso.sh
index 2cd2467..bbc12c3 100755
--- a/scripts/mkiso.sh
+++ b/scripts/mkiso.sh
@@ -25,18 +25,27 @@ Required:
            the command to execute, or to set the command to be /bin/bash -l
            some_command_without_abs_path). Defaults to "/bin/bash -l".
 Options:
-       -u  Change ownership of output files to $UID:$GID
+       -u  Change ownership of output files to $UID:$GID. You must specify 
the
+           $UID:$GID pair as a string such as root:root or 0:0 or the script
+           will fail.
+
+       -z  Compress the resulting ISO with bzip2.
+
+       -k  Keep the original ISO file in addition to the compressed version
+           when compressing. Implies -z.
 
        -h  Shows this help information
 EndUsage
        exit 1
 } >&2
 
-while getopts ":kuzh" Options
+while getopts ":ku:zh" Options
 do
        case $Options in
                k ) KEEP="-k" ;;
-               u ) ISOCHOWN=true ;;
+               u ) ISOCHOWN=true
+                       CHOWNSTR="$OPTARG"
+                       ;;
                z ) COMPRESS=true ;;
                h ) usage ;;
                * ) echo "Unrecognized option" >&2 && usage ;;
@@ -66,5 +75,5 @@ then
        $SUODOCMD bzip2 -f -v $KEEP "${ISO_VERSION}.iso"
 fi
 
-[[ $ISOCHOWN ]] &&  chown $UID:$GID ${ISO_VERSION}.iso*
+[[ $ISOCHOWN ]] &&  chown "$CHOWNSTR" "${ISO_VERSION}".iso*
 
diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index 8a9cd2d..be93c09 100755
--- a/scripts/mkrelease.sh
+++ b/scripts/mkrelease.sh
@@ -25,17 +25,21 @@ Required:
            resulting in smgl-VERSION.iso for the final ISO output.
 
 Options:
-       -u  chown output files to $UID:$GID
+       -u  Change ownership of output files to $UID:$GID. You must specify 
the
+           $UID:$GID pair as a string such as root:root or 0:0 or the script
+           will fail.
 
        -h  Shows this help information
 EndUsage
        exit 1
 } >&2
 
-while getopts ":uh" Option
+while getopts ":u:h" Option
 do
        case $Option in
-               u ) ISOCHOWN="-u" ;;
+               u ) ISOCHOWN="-u"
+                       CHOWNSTR="$OPTARG"
+                       ;;
                h ) usage ;;
                * ) echo "Unrecognized option." >&2 && usage ;;
        esac
@@ -71,5 +75,5 @@ done
 sed -i "s/@GRIMOIRE_VERSION@/$GRIMOIRE_VER/" "$TARGET"/isolinux/isolinux.msg
 
 # Generate the release ISO. Currently we force KEEP and COMPRESSION.
-$(dirname $0)/mkiso.sh $ISOCHOWN -kz "$TARGET" "smgl-$VERSION"
+$(dirname $0)/mkiso.sh "$ISOCHOWN $CHOWNSTR" -kz "$TARGET" "smgl-$VERSION"