#ANNEXE 18 - Patch debian-newvserver.sh
#======================================
#
# Patch Debian-Secinst (www.entreelibre.com/scastro/debian-secinst/)
# pour accorder debian-newvserver.sh a l'installation documentee.
# http://www.paul.sladen.org/vserver/debian/debian-newvserver.sh
#
--- debian-newvserver.sh        2003-11-02 23:07:33.000000000 +0100
+++ debian-newvserver-ds.sh     2004-07-31 14:08:54.000000000 +0200
@@ -18,7 +18,7 @@
 
 # Packages installed from within the vserver after it has
 # been setup (seperated by "," commas)
-EXTRA_PACKAGES="emacs20,lynx-ssl"
+EXTRA_PACKAGES="lynx-ssl,vim,sudo,file,netcat"
 
 # Packages to remove from the base defaults (seperated by "," commas)
 REMOVE_PACKAGES="dhcp-client,lilo,makedev,pcmcia-cs,ppp,pppconfig,pppoe,pppoeconf,setserial,syslinux,nano,fdutils,iptables,libpcap0,pciutils"
@@ -34,7 +34,9 @@
 DIST="woody"
 
 # Local or nearest location of a debian mirror (must include the `/debian')
-MIRROR="http://ftp.uk.debian.org/debian"
+#MIRROR="http://http.us.debian.org/debian"
+# French mirror / Change the sources.list too
+MIRROR="http://ftp.fr.debian.org/debian/"
 
 # Default network interface for vservers:
 INTERFACE="eth0"
@@ -301,13 +303,13 @@
 
 # check for /vserver/$VHOST/etc/ incase we are on pre-mounted LVM partition
 # (used to just check for "/vserver/$VHOST/" existing
-if [ -d "$VSERVER_ROOT/$VHOST/etc/" -o -f "/etc/vservers/$VHOST.conf" ] ; then
-  cat << EOF 1>&2
-${0##*/} error: Virtual Server "$VHOST" appears to already exist
-  check "/etc/vservers/$VHOST.conf" or "/vservers/$VHOST/etc/";
-EOF
-  exit 1
-fi
+#if [ -d "$VSERVER_ROOT/$VHOST/etc/" -o -f "/etc/vservers/$VHOST.conf" ] ; then
+#  cat << EOF 1>&2
+#${0##*/} error: Virtual Server "$VHOST" appears to already exist
+#  check "/etc/vservers/$VHOST.conf" or "/vservers/$VHOST/etc/";
+#EOF
+#  exit 1
+#fi
 
 # This is used to keep a cache of the downloaded .deb packges for next install
 if [ -d "$VSERVER_ROOT/ARCHIVES" ]; then
@@ -334,10 +336,14 @@
 deb $MIRROR/ stable main non-free contrib
 deb-src $MIRROR/ stable main non-free contrib
 
-deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
-deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+#deb http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
 
-deb http://security.debian.org stable/updates main contrib non-free
+# French mirrors
+deb http://ftp.fr.debian.org/debian-non-US/ stable/non-US main non-free
+deb-src http://ftp.fr.debian.org/debian-non-US/ stable/non-US main non-free
+
+deb http://security.debian.org/ stable/updates main contrib non-free
 
 EOF
 
@@ -512,8 +518,6 @@
 
 dpkg-reconfigure passwd
 
-tasksel
-
 rm -f /etc/exim/exim.conf
 eximconfig
 
@@ -543,7 +547,7 @@
 fi
 
 # Install the vreboot/rebootmgr utility--hopefully this will disappear soon
-VREBOOT_LOCATION="/usr/lib/vserver/vreboot"
+VREBOOT_LOCATION="/usr/local/lib/vserver/vreboot"
 if [ "$COPY_VREBOOT" == "true" -a -x "$VREBOOT_LOCATION" ]; then
     cp -a "$VREBOOT_LOCATION" "$VSERVER_ROOT/$VHOST/usr/local/sbin/"
     chmod 750 "$VSERVER_ROOT/$VHOST/usr/local/sbin/vreboot"