[Fai-commit] r5272 - branches/lenny/bin branches/lenny/debian trunk/bin trunk/debian
holger at alioth.debian.org
holger at alioth.debian.org
Tue Feb 17 14:17:31 UTC 2009
Author: holger
Date: 2009-02-17 14:17:31 +0000 (Tue, 17 Feb 2009)
New Revision: 5272
Modified:
branches/lenny/bin/fai-mirror
branches/lenny/debian/changelog
trunk/bin/fai-mirror
trunk/debian/changelog
Log:
* fai-mirror: honor $debug and $qflag environment variables, thanks to
Michael Tautschnig. (Closes: #494431)
Modified: branches/lenny/bin/fai-mirror
===================================================================
--- branches/lenny/bin/fai-mirror 2009-02-17 14:08:12 UTC (rev 5271)
+++ branches/lenny/bin/fai-mirror 2009-02-17 14:17:31 UTC (rev 5272)
@@ -193,7 +193,7 @@
echo "Adding packages from base.tgz."
if [ -f $NFSROOT/var/tmp/base-pkgs.lis ]; then
plist=$(< $NFSROOT/var/tmp/base-pkgs.lis)
- apt-get $quiet $aptoptions update >/dev/null
+ apt-get $qflag $aptoptions update >/dev/null
apt-get $qflag -d $aptoptions -y --force-yes --fix-missing install $plist
else
echo "WARNING: $NFSROOT/var/tmp/base-pkgs.lis does not exists."
@@ -249,7 +249,7 @@
echo "$cfdir is not a directory"
exit 6
fi
-[ "$verbose" ] && echo "Using configuration files from $cfdir"
+[ "$verbose" -eq 1 ] && echo "Using configuration files from $cfdir"
. $cfdir/fai.conf
. $cfdir/make-fai-nfsroot.conf
export NFSROOT="$NFSROOT/live/filesystem.dir"
@@ -258,8 +258,6 @@
[ -n "$NFSROOT_PACKAGES" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
[ -n "$exclasses" -a -n "$cclasses" ] && die 3 "Options -x and -c not allowed at the same time."
-debug=0
-[ $debug -eq 0 ] && quiet=-q
mirrordir=$1
if [ -z "$mirrordir" ]; then
@@ -291,7 +289,7 @@
perl -p -e 's/file:/copy:/' $cfdir/apt/sources.list > $aptcache/etc/apt/sources.list
echo "Getting package information"
-apt-get $quiet $aptoptions update >/dev/null
+apt-get $qflag $aptoptions update >/dev/null
set-classes
echo "Downloading packages for classes:" $classes
@@ -314,7 +312,7 @@
CONTENTS=no
PKGCOMP='none gzip'
EOF
-apt-move $quiet -c $aptmovefile update
+apt-move $qflag -c $aptmovefile update
# since Packages.gz from apt-move does not include packages from my
# repository, let's use apt-ftparchive for generiating correct index
# files
Modified: branches/lenny/debian/changelog
===================================================================
--- branches/lenny/debian/changelog 2009-02-17 14:08:12 UTC (rev 5271)
+++ branches/lenny/debian/changelog 2009-02-17 14:17:31 UTC (rev 5272)
@@ -3,6 +3,8 @@
* Added myself to uploaders to avoid NMU warnings.
* Fix typo in fai-do-scripts, thanks to Andrew Ruthven for reporting this.
(Closes: #504662)
+ * fai-mirror: honor $debug and $qflag environment variables, thanks to
+ Michael Tautschnig. (Closes: #494431)
-- Holger Levsen <holger at debian.org> Tue, 17 Feb 2009 14:36:37 +0100
Modified: trunk/bin/fai-mirror
===================================================================
--- trunk/bin/fai-mirror 2009-02-17 14:08:12 UTC (rev 5271)
+++ trunk/bin/fai-mirror 2009-02-17 14:17:31 UTC (rev 5272)
@@ -193,7 +193,7 @@
echo "Adding packages from base.tgz."
if [ -f $NFSROOT/var/tmp/base-pkgs.lis ]; then
plist=$(< $NFSROOT/var/tmp/base-pkgs.lis)
- apt-get $quiet $aptoptions update >/dev/null
+ apt-get $qflag $aptoptions update >/dev/null
apt-get $qflag -d $aptoptions -y --force-yes --fix-missing install $plist
else
echo "WARNING: $NFSROOT/var/tmp/base-pkgs.lis does not exists."
@@ -249,7 +249,7 @@
echo "$cfdir is not a directory"
exit 6
fi
-[ "$verbose" ] && echo "Using configuration files from $cfdir"
+[ "$verbose" -eq 1 ] && echo "Using configuration files from $cfdir"
. $cfdir/fai.conf
. $cfdir/make-fai-nfsroot.conf
export NFSROOT="$NFSROOT/live/filesystem.dir"
@@ -258,8 +258,6 @@
[ -n "$NFSROOT_PACKAGES" ] && die "WARNING: The use of \$packages in make-fai-nfsroot.conf is now deprecated. Please include this information into $cfdir/NFSROOT."
[ -n "$exclasses" -a -n "$cclasses" ] && die 3 "Options -x and -c not allowed at the same time."
-debug=0
-[ $debug -eq 0 ] && quiet=-q
mirrordir=$1
if [ -z "$mirrordir" ]; then
@@ -291,7 +289,7 @@
perl -p -e 's/file:/copy:/' $cfdir/apt/sources.list > $aptcache/etc/apt/sources.list
echo "Getting package information"
-apt-get $quiet $aptoptions update >/dev/null
+apt-get $qflag $aptoptions update >/dev/null
set-classes
echo "Downloading packages for classes:" $classes
@@ -314,7 +312,7 @@
CONTENTS=no
PKGCOMP='none gzip'
EOF
-apt-move $quiet -c $aptmovefile update
+apt-move $qflag -c $aptmovefile update
# since Packages.gz from apt-move does not include packages from my
# repository, let's use apt-ftparchive for generiating correct index
# files
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-02-17 14:08:12 UTC (rev 5271)
+++ trunk/debian/changelog 2009-02-17 14:17:31 UTC (rev 5272)
@@ -1,12 +1,5 @@
fai (3.2.17) UNRELEASED; urgency=low
- * Fix typo in fai-do-scripts, thanks to Andrew Ruthven for reporting this.
- (Closes: #504662)
-
- -- Holger Levsen <holger at debian.org> Tue, 17 Feb 2009 14:41:46 +0100
-
-fai (3.2.17) unstable; urgency=low
-
[ Thomas Lange ]
* ainsl: add test if target file exists
* fai-cd: use a pipe when sending commands to grub
@@ -61,6 +54,12 @@
initialization of encrypted partitions configurable
* setup-storage.8: Document new encryption possibilities
+ [ Holger Levsen ]
+ * Fix typo in fai-do-scripts, thanks to Andrew Ruthven for reporting this.
+ (Closes: #504662)
+ * fai-mirror: honor $debug and $qflag environment variables, thanks to
+ Michael Tautschnig. (Closes: #494431)
+
-- Thomas Lange <lange at debian.org> Mon, 16 Feb 2009 18:51:36 +0100
fai (3.2.16) unstable; urgency=high
More information about the Fai-commit
mailing list