unity/scripts/respin.sh | 47 +++++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 20 deletions(-)
New commits:
commit 0fa15dbfebee32683d39538a53dcd5cfb678d57a
Author: Jeroen van Meeuwen (Fedora Unity) <kana...@fedoraunity.org>
Date: Fri Mar 6 03:13:07 2009 +0100
Some more updates to respin.sh
diff --git a/unity/scripts/respin.sh b/unity/scripts/respin.sh
index b50fef7..7a0a9a8 100755
--- a/unity/scripts/respin.sh
+++ b/unity/scripts/respin.sh
@@ -25,7 +25,7 @@
# # bind mount plugin is enabled by default but has no configured directories
to mount
# # config_opts['plugin_conf']['bind_mount_enable'] = True
# config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/selinux/',
'/selinux/' ))
-#
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/srv/revisor/',
'/srv/revisor/' ))
+#
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('${REVISORDIR}/',
'${REVISORDIR}/' ))
# # (optional, saves you a lot of downloads if you run the default revisor
setup and are respinning
# # in batch)
#
config_opts['plugin_conf']['bind_mount_opts']['dirs'].append(('/var/tmp/revisor-yumcache/',
'/var/tmp/revisor-yumcache/' ))
@@ -39,6 +39,19 @@
# - torrentifying live media
#
+# Who to notify on failure, or success, and where to send the message from.
+NOTIFICATION_FAILURE="kana...@kanarip.com"
+NOTIFICATION_SUCCESS="kana...@kanarip.com"
+NOTIFICATION_FROMADD="kana...@kanarip.com"
+
+# The temp directory to use. Defaults to /tmp
+#TMPDIR=/tmp
+
+# Where do you store your torrents?
+export TORRENTDIR=/data/bittorrent/
+# What is the base directory for all revisor products?
+export REVISORDIR=/data/revisor/
+
function usage() {
echo "$0 [options]"
echo ""
@@ -74,9 +87,6 @@ INSTALL=0
JUST_LIST=0
cleanup=1
-export TORRENTDIR=/data/bittorrent/
-export REVISORDIR=/srv/revisor/
-
##
## Get the options
##
@@ -171,9 +181,6 @@ fi
# Some variables, for the message content and the emailaddresses to notify,
etc.
MESSAGE_END="\\n\\nThe size of the iso image is: %b.\\n\\nGo to
http://$WEB_HOSTNAME/revisor/%b/%b/ for more details.\\n\\nKind
regards,\\n\\nJeroen van Meeuwen\\n-kanarip"
-NOTIFICATION_FAILURE="kana...@kanarip.com"
-NOTIFICATION_SUCCESS="kana...@kanarip.com"
-NOTIFICATION_FROMADD="kana...@kanarip.com"
# Cheat our way through spin-kickstarts
if [ -d ${TMPDIR:-/tmp}/spin-kickstarts ]; then
@@ -237,19 +244,19 @@ for version in ${VERSIONS}; do
# The log files that were there get confusing if you are
currently composing,
# you know ;-)
#
- sudo rm -rf /srv/revisor/$datestamp/$spin/log/
+ sudo rm -rf ${REVISORDIR}/$datestamp/$spin/{*.torrent,log/}
# Execute Revisor
${revisor_cmd} --config
/etc/revisor-unity/${real_version}-live-respin.conf \
--model $spin --debug 9 --clean-up $cleanup \
- --destination-directory
/srv/revisor/$datestamp/ \
+ --destination-directory
${REVISORDIR}/$datestamp/ \
--report-sizes > revisor-$spin.log 2>&1
retval=$?
# Damn that was freaking awesome. Now let's see what our
product looks like.
# Find the iso image, and get it's size so we can add it to
the message we send out.
- isoimage=`find /srv/revisor/$datestamp/$spin/live/ -name
"*.iso"`
+ isoimage=`find ${REVISORDIR}/$datestamp/$spin/live/ -name
"*.iso"`
[ ! -z "$isoimage" ] && isosize=`ls -lh $isoimage | awk
'{print $5}'` || isosize="0M"
@@ -265,8 +272,8 @@ for version in ${VERSIONS}; do
-r $NOTIFICATION_FROMADD \
$NOTIFICATION_SUCCESS
- sudo mkdir -p /srv/revisor/$datestamp/$spin/log/
- sudo mv revisor-$spin.log /srv/revisor/$datestamp/$spin/log/
+ sudo mkdir -p ${REVISORDIR}/$datestamp/$spin/log/
+ sudo mv revisor-$spin.log ${REVISORDIR}/$datestamp/$spin/log/
# Now that it is done, run some more reporting on the spin
if [ ! -z "${isoimage}" ]; then
@@ -275,18 +282,18 @@ for version in ${VERSIONS}; do
sudo mount -o loop,ro
${TMPDIR:-/tmp}/loopmount_iso/LiveOS/squashfs.img
${TMPDIR:-/tmp}/loopmount_squashfs && \
sudo mount -o loop,ro
${TMPDIR:-/tmp}/loopmount_squashfs/LiveOS/ext3fs.img
${TMPDIR:-/tmp}/loopmount_ext3fs && \
sudo chroot ${TMPDIR:-/tmp}/loopmount_ext3fs/ rpm -qa --qf
"%{SIZE}\t%{NAME}.%{ARCH}\n" | sort -n -r > rpms-$spin.log && \
- sudo mv rpms-$spin.log /srv/revisor/$datestamp/$spin/log/
+ sudo mv rpms-$spin.log ${REVISORDIR}/$datestamp/$spin/log/
sudo umount ${TMPDIR:-/tmp}/loopmount_ext3fs && \
sudo umount ${TMPDIR:-/tmp}/loopmount_squashfs && \
sudo umount ${TMPDIR:-/tmp}/loopmount_iso
# Now that we have today's spin, if we have yesterday's
spin, we can compare
yesterday=`date --date=yesterday +"%Y%m%d"`
- rpms_log_yesterday=`find
/srv/revisor/$yesterday/$spin/log/ -name "rpms-*.log" 2>/dev/null`
- rpms_log_today=`find /srv/revisor/$datestamp/$spin/log/
-name "rpms-*.log" 2>/dev/null`
+ rpms_log_yesterday=`find
${REVISORDIR}/$yesterday/$spin/log/ -name "rpms-*.log" 2>/dev/null`
+ rpms_log_today=`find ${REVISORDIR}/$datestamp/$spin/log/
-name "rpms-*.log" 2>/dev/null`
if [ ! -z "$rpms_log_yesterday" -a ! -z "$rpms_log_today"
]; then
`pwd`/unity/scripts/live-respin-size-diff.py
$rpms_log_yesterday $rpms_log_today > rpms-diff-$yesterday-$datestamp.log && \
- sudo mv rpms-diff-$yesterday-$datestamp.log
/srv/revisor/$datestamp/$spin/log/
+ sudo mv rpms-diff-$yesterday-$datestamp.log
${REVISORDIR}/$datestamp/$spin/log/
fi
# Make some torrents
@@ -330,7 +337,7 @@ for version in ${VERSIONS}; do
# Let's make sure we remove the entire directory before we attempt
a respin.
# The log files get confusing, you know ;-)
#
- sudo rm -rf
/srv/revisor/$datestamp/${real_version}-$arch-respin/log/
+ sudo rm -rf
${REVISORDIR}/$datestamp/${real_version}-$arch-respin/{*.torrent,log/}
mock -v -r fedora-$version-$arch clean >
revisor-${real_version}-$arch-respin.log 2>&1 && \
mock -v -r fedora-$version-$arch init >>
revisor-${real_version}-$arch-respin.log 2>&1 && \
@@ -340,7 +347,7 @@ for version in ${VERSIONS}; do
./switchhere --yes; \\
find /var/lib/rpm/ -name '__db.*' -delete; \\
./revisor.py --cli --config
unity/conf/${real_version}-install-respin.conf \\
- --destination-directory /srv/revisor/$datestamp/ \\
+ --destination-directory ${REVISORDIR}/$datestamp/ \\
--model ${real_version}-$arch-respin --debug 9 \\
--clean-up $cleanup\n" | mock -v -r fedora-$version-$arch
shell >> revisor-${real_version}-$arch-respin.log 2>&1
@@ -358,8 +365,8 @@ for version in ${VERSIONS}; do
-r $NOTIFICATION_FROMADD \
$NOTIFICATION_SUCCESS
- sudo mkdir -p
/srv/revisor/$datestamp/${real_version}-$arch-respin/log/
- sudo mv revisor-${real_version}-$arch-respin.log
/srv/revisor/$datestamp/${real_version}-$arch-respin/log/
+ sudo mkdir -p
${REVISORDIR}/$datestamp/${real_version}-$arch-respin/log/
+ sudo mv revisor-${real_version}-$arch-respin.log
${REVISORDIR}/$datestamp/${real_version}-$arch-respin/log/
# Make some torrents
_______________________________________________
revisor-devel mailing list
revisor-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/revisor-devel
