Revision: 2205
Author: bmsleight
Date: 2006-04-23 08:40:31 -0700 (Sun, 23 Apr 2006)
ViewCVS: http://svn.sourceforge.net/morphix/?rev=2205&view=rev
Log Message:
-----------
adding morphmini <bootoption>
Modified Paths:
--------------
trunk/morph-scripts/debian/add_to_iso.1
trunk/morph-scripts/debian/changelog
trunk/morph-scripts/debian/isomorph.1
trunk/morph-scripts/debian/make-iso.1
trunk/morph-scripts/debian/minimod-gen.1
trunk/morph-scripts/debian/module-builder.1
trunk/morph-scripts/debian/module-extractor.1
trunk/morph-scripts/debian/morphmini.1
trunk/morph-scripts/morphmini/example.xml
trunk/morph-scripts/morphmini/morphmini
trunk/morph-scripts/morphmini/templates/MorphixMini-Firefox.xml
Modified: trunk/morph-scripts/debian/add_to_iso.1
===================================================================
--- trunk/morph-scripts/debian/add_to_iso.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/add_to_iso.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -62,5 +62,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/debian/changelog
===================================================================
--- trunk/morph-scripts/debian/changelog 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/changelog 2006-04-23 15:40:31 UTC (rev 2205)
@@ -1,3 +1,9 @@
+morph-scripts (0.2-20) unstable; urgency=low
+
+ * adding morphmini <bootoption>
+
+ -- bmsleight <[email protected]> Sun, 23 Apr 2006 16:30:00 +0100
+
morph-scripts (0.2-19) unstable; urgency=low
* Moved man pages in to their respective packages.
Modified: trunk/morph-scripts/debian/isomorph.1
===================================================================
--- trunk/morph-scripts/debian/isomorph.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/isomorph.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -244,5 +244,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/debian/make-iso.1
===================================================================
--- trunk/morph-scripts/debian/make-iso.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/make-iso.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -62,5 +62,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/debian/minimod-gen.1
===================================================================
--- trunk/morph-scripts/debian/minimod-gen.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/minimod-gen.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -83,5 +83,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/debian/module-builder.1
===================================================================
--- trunk/morph-scripts/debian/module-builder.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/module-builder.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -33,21 +33,25 @@
.SH "OPTIONS"
.TP
-\-l LABEL
+\fI\-l LABEL\fR
set the CD label if no label is given (default: Morphix)
.TP
-\-t FSTYPE
+\fI\-b\fR
+flag for create_compressed_fs, best compression
+
+.TP
+\fI\-t FSTYPE\fR
set the file system type (default: iso9660)
.RS
.TP
-ext3
+\fIext3\fR
slower buildtime, better compression, cowloop\-overlayable
.TP
-iso9660
+\fIiso9660\fR
faster, default\&. Only overlayable with translucency/mini_fo
.RE
@@ -85,5 +89,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/debian/module-extractor.1
===================================================================
--- trunk/morph-scripts/debian/module-extractor.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/module-extractor.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -62,5 +62,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/debian/morphmini.1
===================================================================
--- trunk/morph-scripts/debian/morphmini.1 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/debian/morphmini.1 2006-04-23 15:40:31 UTC (rev 2205)
@@ -43,6 +43,7 @@
<description>MorphMini Example</description>
<minitag>Example</minitag>
<maintag>ALL</maintag>
+ <bootoption>ALL</bootoption> <!\-\- Only run the minimodule when this bootoption is used\&. Special case run ALL the time\-\->
<filelist> <!\-\- files to be added to minimod available as $1/morphix/files/ \-\->
<local>
<file>/home/morph/test\&.jpg</file>
@@ -104,5 +105,5 @@
.SH "SEE ALSO"
-\fImodule\-builder, module\-extractor, make\-iso, isomorph, mmaker, isomaker, make\-mini, install2mainmod, minimod\-gen, addtoiso\fR
+\fIaddtoiso, install2mainmod, isomaker, isomorph, make\-iso, make\-mini, minimod\-gen, mmaker, module\-builder, module\-extractor, morphmini\fR
Modified: trunk/morph-scripts/morphmini/example.xml
===================================================================
--- trunk/morph-scripts/morphmini/example.xml 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/morphmini/example.xml 2006-04-23 15:40:31 UTC (rev 2205)
@@ -4,7 +4,8 @@
<version>0.0.1</version>
<description>MorphMini Example</description>
<minitag>Example</minitag>
- <maintag>ALL</maintag>
+ <maintag>ALL</maintag>
+ <bootoption>ALL</bootoption> <!-- Only run the minimodule when this bootoption is used. Special case run ALL the time-->
<filelist> <!-- files to be added to minimod available as $1/morphix/files/ -->
<local>
<file>/home/morph/test.jpg</file>
Modified: trunk/morph-scripts/morphmini/morphmini
===================================================================
--- trunk/morph-scripts/morphmini/morphmini 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/morphmini/morphmini 2006-04-23 15:40:31 UTC (rev 2205)
@@ -15,6 +15,8 @@
TMP_FILE=/tmp/morphixmini.$$.tmp
TMP_FILE_2=/tmp/morphixmini.$$.2.tmp
RETURN_VALUE=""
+ DOLLAR="$"
+ DOLLAR1=$DOLLAR"1"
}
set_up_module_build ()
@@ -55,6 +57,39 @@
echo "$RETURN_VALUE" >>$TMP_DIR/minimod/morphix/mini_module
}
+process_bootoption ()
+{
+xml_get "//minimod" "minitag" "maintag" $TEMPLATE
+MINITAG=$RETURN_VALUE
+xml_get "//minimod" "bootoption" "bootoption" $TEMPLATE
+if [ -n "$RETURN_VALUE" ]
+ then
+ cat >>$TMP_DIR/minimod/morphix/loadmod.sh <<EOF
+MINIMODBOOTOPTION="${RETURN_VALUE}"
+BOOTOPTIONOK=""
+CMDLINE="$DOLLAR(cat /proc/cmdline)"
+
+NORMAL="[0;39m"
+# RED: Failure or error message
+RED="[1;31m"
+# GREEN: Success message
+GREEN="[1;32m"
+# Reset fb color mode
+RESET="]R"
+NORMAL="[0;39m"
+
+case "$DOLLAR{CMDLINE}" in *\ $DOLLAR{MINIMODBOOTOPTION}*) BOOTOPTIONOK="yes"; ;; esac
+if [ "$DOLLAR{MINIMODBOOTOPTION}" != "ALL" ]; then
+ if [ -z "$DOLLAR{BOOTOPTIONOK}" ]; then
+ echo " $DOLLAR{GREEN}*$DOLLAR{NORMAL} Boot Option $DOLLAR{RED}$DOLLAR{MINIMODBOOTOPTION}$DOLLAR{NORMAL} not found. Skipping MiniModule: $DOLLAR{RED}${MINITAG}$DOLLAR{NORMAL}"
+ exit
+ fi
+fi
+EOF
+fi
+}
+
+
process_filelist ()
{
xml_get_tmp //minimod/filelist local file $TEMPLATE
@@ -89,9 +124,7 @@
echo "#!/bin/sh " >$TMP_DIR/minimod/morphix/commandsX.sh
cat $TMP_FILE >>$TMP_DIR/minimod/morphix/commandsX.sh
chmod a+x $TMP_DIR/minimod/morphix/commandsX.sh
- DOLLAR="$"
DOLLARSTARTX=$DOLLAR"STARTX"
- DOLLAR1=$DOLLAR"1"
DOLLARUSER=$DOLLAR"USER"
cat >>$TMP_DIR/minimod/morphix/loadmod.sh <<EOF
USER=$DOLLAR(cat /etc/sysconfig/username)
@@ -113,8 +146,6 @@
#Alex will hate this
#This will make sure that commandsPostX.sh has correct $1 from minimodule
- DOLLAR="$"
- DOLLAR1=$DOLLAR"1"
echo "echo \"#!/bin/sh \" > /morphix/rc.m/S11PostX11.sh " >>$TMP_DIR/minimod/morphix/loadmod.sh
echo "echo \"$DOLLAR1/morphix/commandsPostX.sh $DOLLAR1 \" >> /morphix/rc.m/S11PostX11.sh " >>$TMP_DIR/minimod/morphix/loadmod.sh
echo "chmod a+x /morphix/rc.m/S11PostX11.sh " >>$TMP_DIR/minimod/morphix/loadmod.sh
@@ -160,7 +191,9 @@
get_global_variables
set_up_module_build
+#Test xml file error check.
write_tags_and_desciptions
+process_bootoption
process_filelist
process_command_prex
process_command_postx
Modified: trunk/morph-scripts/morphmini/templates/MorphixMini-Firefox.xml
===================================================================
--- trunk/morph-scripts/morphmini/templates/MorphixMini-Firefox.xml 2006-04-17 19:31:33 UTC (rev 2204)
+++ trunk/morph-scripts/morphmini/templates/MorphixMini-Firefox.xml 2006-04-23 15:40:31 UTC (rev 2205)
@@ -5,6 +5,7 @@
<description>MorphMini launch firefox</description>
<minitag>MorphixMini-Firefox</minitag>
<maintag>ALL</maintag>
+ <bootoption>ALL</bootoption> <!-- Only run the minimodule when this bootoption is used. Special case run ALL the time-->
<commandlist> <!-- Commands to be started from minimodule -->
<X> <!-- Commands to run in X windows -->
<command>firefox http://www.morphix.org & </command><!-- & is xml foramt for & -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.