[SCM] debian-live/config-daniel branch, master, updated. 8721f9e53d909e8bb6de81261025a3d4e0ae756b

Daniel Baumann daniel at debian.org
Sat Jan 31 15:34:33 UTC 2009


The following commit has been merged in the master branch:
commit 8721f9e53d909e8bb6de81261025a3d4e0ae756b
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 31 16:34:27 2009 +0100

    Updating.

diff --git a/config/chroot_local-preseed/preseed-rsync-debian-git.preseed b/config/chroot_local-preseed/tftpd-hpa.preseed
similarity index 61%
copy from config/chroot_local-preseed/preseed-rsync-debian-git.preseed
copy to config/chroot_local-preseed/tftpd-hpa.preseed
index ecf853b..a6bebcc 100644
--- a/config/chroot_local-preseed/preseed-rsync-debian-git.preseed
+++ b/config/chroot_local-preseed/tftpd-hpa.preseed
@@ -1,5 +1,6 @@
 ################################################################################
-## preseed-rsync-debian-git
+## tftpd-hpa
 
-#preseed-rsync-debian-git preseed-rsync-debian-git/preseed boolean false
+#tftpd-hpa tftpd-hpa/use_inetd boolean true
+tftpd-hpa tftpd-hpa/use_inetd boolean false
 ################################################################################
diff --git a/scripts/clean.sh b/scripts/clean
similarity index 90%
rename from scripts/clean.sh
rename to scripts/clean
index 2375493..bb0bbe9 100755
--- a/scripts/clean.sh
+++ b/scripts/clean
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-lh_clean autoconfig --all ${@}
+lh_clean noautoconfig --all ${@}
 
 # Remove generated files
 rm -f config/binary config/bootstrap config/chroot config/common config/source
diff --git a/scripts/config.sh b/scripts/config
similarity index 96%
rename from scripts/config.sh
rename to scripts/config
index e01e84d..687be1c 100755
--- a/scripts/config.sh
+++ b/scripts/config
@@ -9,7 +9,7 @@ else
 	MIRROR_SECURITY="http://ftp.ch.debian.org/debian-security/"
 fi
 
-lh_config autoconfig \
+lh_config noautoconfig \
 	--apt-recommends disabled \
 	--debian-installer live \
 	--debian-installer-distribution lenny \

-- 
debian-live/config-daniel



More information about the debian-live-changes mailing list