[SCM] debian-live/config-webc branch, squeeze, updated. 622e7bb5ae6d9224d502bf0456f996dbcc54d4d0
Daniel Baumann
daniel at debian.org
Wed Sep 15 21:21:26 UTC 2010
The following commit has been merged in the squeeze branch:
commit 622e7bb5ae6d9224d502bf0456f996dbcc54d4d0
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Sep 15 23:20:40 2010 +0200
Updating auto scripts for live-build 2.0~a28.
diff --git a/webconverger/auto/clean b/webconverger/auto/clean
index 90634ac..bfe3e9e 100755
--- a/webconverger/auto/clean
+++ b/webconverger/auto/clean
@@ -1,17 +1,7 @@
#!/bin/sh
-rm -f build.log
+lb clean noauto ${@}
-# Remove generated files
rm -f config/binary config/bootstrap config/chroot config/common config/source
-# Remove empty directories in config tree
-if ls config/*/ > /dev/null 2>&1
-then
- rmdir --ignore-fail-on-non-empty config/*/
-fi
-
-if [ -d config ]
-then
- rmdir --ignore-fail-on-non-empty config
-fi
+rm -f binary.log
diff --git a/webconverger/auto/config b/webconverger/auto/config
index 8a0e0bc..04cd1e4 100755
--- a/webconverger/auto/config
+++ b/webconverger/auto/config
@@ -3,7 +3,7 @@
#MIRROR_DEBIAN="ftp://mirror.hetzner.de/ftp.de.debian.org/debian/"
MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
-lh config noauto \
+lh config noauto --clean \
--apt-recommends false \
--bootappend-live "quiet homepage=http://portal.webconverger.com nonetworking splash video=vesa:ywrap,mtrr vga=788 nopersistent quickreboot noroot" \
--cache-stages "bootstrap rootfs" \
--
debian-live/config-webc
More information about the debian-live-changes
mailing list