Update upload_isos.sh and config file

diff --git a/buildd/grml-buildd.conf b/buildd/grml-buildd.conf
index 05fe9f9..b97849c 100644 (file)
--- a/buildd/grml-buildd.conf
+++ b/buildd/grml-buildd.conf
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Oct 22 19:18:59 CEST 2007 [mika]
+# Latest change: Mon Oct 22 19:51:57 CEST 2007 [mika]
 ################################################################################
 
 # where do you want to store chroot/ISOs/...? Must be set!
@@ -17,6 +17,10 @@
 # default: root@localhost
 #FROM=root@localhost
 
+# where do you want to upload ISOs to?
+# see /usr/share/grml-live/buildd/upload_isos.sh
+#RSYNC_MIRROR=grml-build@localhost:/path/to/grml/isos/daily/
+
 # which directory should be cleaned up?
 # used for example inside /usr/share/grml-live/buildd/cleanup.sh
 #MIRROR_DIRECTORY=/home/ftp/www.grml.org/daily

diff --git a/buildd/upload_isos.sh b/buildd/upload_isos.sh
index 02630f5..25a33fd 100755 (executable)
--- a/buildd/upload_isos.sh
+++ b/buildd/upload_isos.sh
@@ -4,12 +4,14 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Mon Oct 22 19:11:33 CEST 2007 [mika]
+# Latest change: Mon Oct 22 19:50:36 CEST 2007 [mika]
 ################################################################################
 
-. /usr/share/grml-live/buildd/functions.sh || exit 1
+. /etc/grml/grml-buildd.conf || exit 1
 [ -n "$RSYNC_MIRROR" ] || exit 2
-cd $ISO_DIR || exit 3
+[ -n "$ISO_DIR" ] || exit 3
+
+cd $ISO_DIR || exit 4
 
 umask 002
 for file in *.iso ; do