diff --git a/helpers/DATA/tasksel/dns-server b/helpers/DATA/tasksel/dns-server
index c0a2d14e4fbd6b984a5bcf9a18baae8cb2fb1093..61e4c251efafda467dbab265b8b2dce1c6e2e088 100644
--- a/helpers/DATA/tasksel/dns-server
+++ b/helpers/DATA/tasksel/dns-server
@@ -2,6 +2,6 @@ Task: dns-server
Section: server
Description: Bind9 DNS server
Selects the BIND DNS server and its documentation.
+Packages: list
Key:
bind9
-Packages: task-fields
diff --git a/helpers/DATA/tasksel/mail-server b/helpers/DATA/tasksel/mail-server
index 9f86b145602d7b73dda50c9af73c65d599a85184..ec68eb7ac231af7ce55a5b69764eb28c400fd43b 100644
--- a/helpers/DATA/tasksel/mail-server
+++ b/helpers/DATA/tasksel/mail-server
@@ -3,6 +3,6 @@ Section: server
Description: Postfix mail server
This task selects a variety of package useful for a general purpose mail
server system.
+Packages: list
Key:
postfix
-Packages: task-fields
diff --git a/helpers/DATA/tasksel/openssh-server b/helpers/DATA/tasksel/openssh-server
index 6ed8e0e830a13e706eafe429d7169dce42d216d9..e495f0de84ef0cbca8869e7230d83fcdf61f32b7 100644
--- a/helpers/DATA/tasksel/openssh-server
+++ b/helpers/DATA/tasksel/openssh-server
@@ -2,6 +2,6 @@ Task: openssh-server
Section: server
Description: OpenSSH secure shell server
Selects packages needed for an OpenSSH server.
+Packages: list
Key:
openssh-server
-Packages: task-fields
diff --git a/helpers/DATA/tasksel/print-server b/helpers/DATA/tasksel/print-server
index 1bd21c9417bd33e30135dd6331f1b52f6890d510..26642cccab83a9830adfd6f8bef6903ccf1adf2a 100644
--- a/helpers/DATA/tasksel/print-server
+++ b/helpers/DATA/tasksel/print-server
@@ -2,8 +2,8 @@ Task: print-server
Section: server
Description: Cups print server
This task sets up your system to be a print server.
+Packages: list
Key:
cups
cups-bsd
cups-client
-Packages: task-fields
diff --git a/helpers/DATA/tasksel/samba-server b/helpers/DATA/tasksel/samba-server
index 1cdb934dfa1947d8ad20a7837958b6c2f784eebd..e1dfc4101e20a48fee77aabc063b9eecc5185ebe 100644
--- a/helpers/DATA/tasksel/samba-server
+++ b/helpers/DATA/tasksel/samba-server
@@ -3,6 +3,6 @@ Section: server
Description: Samba SMB file server
This task sets up your system to be a Samba file server, which is
especially suitable in networks with both Windows and GNU/Linux systems.
+Packages: list
Key:
samba
-Packages: task-fields
diff --git a/helpers/DATA/tasksel/trisquel-directory b/helpers/DATA/tasksel/trisquel-directory
deleted file mode 100644
index 737c2685297c85ab4a77487f3559707353f26ea2..0000000000000000000000000000000000000000
--- a/helpers/DATA/tasksel/trisquel-directory
+++ /dev/null
@@ -1,9 +0,0 @@
-Task: trisquel-directory
-Section: user
-Description: Trisquel directory server
- This task provides a LDAP based directory server, which allows Trisquel
- to serve user accounts and profiles, policies, applications, email and print management services.
-Packages: list
-Key:
- trisquel-directory-server
- trisquel-base
diff --git a/helpers/DATA/tasksel/trisquel-sugar b/helpers/DATA/tasksel/trisquel-sugar
deleted file mode 100644
index 1ba597f870d7fae5b91e74f04de7ca98cdbb3d08..0000000000000000000000000000000000000000
--- a/helpers/DATA/tasksel/trisquel-sugar
+++ /dev/null
@@ -1,7 +0,0 @@
-Task: trisquel-sugar
-Section: user
-Description: Trisquel On a Sugar TOAST
- This task provides the Trisquel On a Sugar TOAST educational environment
-Packages: list
-Key:
- trisquel-sugar
diff --git a/helpers/DATA/tasksel/web-server b/helpers/DATA/tasksel/web-server
index 65262c6889445726955e423c1d5f051faa4f9fee..dd2d9e5e6023814199d6d144c0b1aa107923dcd2 100644
--- a/helpers/DATA/tasksel/web-server
+++ b/helpers/DATA/tasksel/web-server
@@ -2,7 +2,7 @@ Task: web-server
Section: server
Description: GLAMP web server
Selects a ready-made GNU+Linux/Apache/MySQL/PHP server.
+Packages: list
Key:
apache2
mysql-server
-Packages: list
diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index 11ac1fb26de53ca41e680f3fa13d23ed79976bd6..eff230a39213330e2cfa6cd8e301dd4a45e1d913 100644
--- a/helpers/make-apt-setup
+++ b/helpers/make-apt-setup
@@ -41,7 +41,7 @@ START=$(getline apt-setup/contrib debian/apt-mirror-setup.templates)
END=$(getline "Please choose whether you want this software to be made available to you." debian/apt-mirror-setup.templates)
sed ${START},${END}d debian/apt-mirror-setup.templates -i
-sed '/canonical/d;
+/bin/sed '/canonical/d;
/Canonical/d;
s/main restricted universe multiverse/main/g;
s/dists restricted/dists/g;
@@ -69,7 +69,7 @@ find archive.trisquel.info/ |egrep '(index.html|robots.txt)'|xargs rm
cd ..
rm generators/9[1-9]* generators/50mirror generators/50mirror.ubuntu
-sed -i '/generators\/9[1-9]*/d' debian/*.install
+sed -i '/generators\/9[1-9]*/d' debian/apt-setup-udeb.install
echo "generators/50mirror.trisquel usr/lib/apt-setup/generators
release-files/archive.trisquel.info usr/share/apt-setup/release-files" > debian/apt-mirror-setup.install
diff --git a/helpers/make-debian-installer b/helpers/make-debian-installer
index 988f713601d79165ca37002b801d5635ce99d16e..f7560881db0f175cb67ad26896ac0e680ea66cd0 100644
--- a/helpers/make-debian-installer
+++ b/helpers/make-debian-installer
@@ -21,11 +21,9 @@ VERSION=1
NETINST=true
. ./config
-apt-get install trisquel-keyring
-
cat << EOF > /etc/apt/sources.list
-deb $DEVELMIRROR $UPSTREAM main
-deb-src $DEVELMIRROR $UPSTREAM main
+deb $DEVELMIRROR $CODENAME main
+deb-src $DEVELMIRROR $CODENAME main
deb $LOCALMIRROR $CODENAME main
deb $LOCALMIRROR $CODENAME-updates main
deb-src $LOCALMIRROR $CODENAME main
@@ -37,13 +35,17 @@ EOF
apt-get update
+apt-get install trisquel-keyring
+
find build/pkg-lists -type f | xargs sed -i /media-retriever/d
LASTKERNEL=$(apt-cache showsrc linux-libc-dev|grep ^Version |head -n1|cut -d" " -f2|cut -d. -f1,2,3)
-sed -i "s/3.0.\w*-\w*/$LASTKERNEL/g" ./build/config/i386/netboot/386.cfg ./build/config/i386.cfg ./build/config/amd64.cfg
+/bin/sed -i "s/^BASEVERSION.*/BASEVERSION = $LASTKERNEL/g" ./build/config/i386.cfg ./build/config/amd64.cfg
+sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/i386.cfg ./build/config/amd64.cfg
+
+sed 's/ubuntu-archive-keyring.gpg/trisquel-archive-keyring.gpg/' -i build/config/common
cp $DATA/splash.png build/boot/x86/pics/trisquel.png
-sed -i 's:archive.gpg:archive.gpg\n\tcp -a $(TREE)/usr/share/keyrings/trisquel-archive-keyring.gpg $(TREE)/usr/share/keyrings/ubuntu-archive-keyring.gpg:' build/Makefile
sed -i 's/ubuntu.png/trisquel.png/g' build/config/x86.cfg
cat << EOF > build/sources.list.udeb.local
@@ -52,6 +54,8 @@ deb $LOCALMIRROR $CODENAME-updates main/debian-installer
#deb $LOCALMIRROR $CODENAME-security main/debian-installer
EOF
+rpl 2004-2012 2004-2013 . -R
+rpl 2004-2011 2004-2013 . -R
rpl 2004-2010 2004-2011 . -R
rpl 2004-2009 2004-2011 . -R
rpl 2004-2008 2004-2011 . -R
@@ -75,7 +79,9 @@ rpl ubuntu-archive-keyring trisquel-archive-keyring . -R
#sed -i "s:^To install.*:This is the Trisquel GNU/Linux $TVERSION LTS \"$TCODENAME\" network install CD.:g" build/boot/x86/boot.txt
#sed -i 's:^For the.*:For the default installation, press ENTER, for more help press F1.:g' build/boot/x86/boot.txt
-sed s/tasks=standard/tasks=trisquel-console/ build/boot/x86/syslinux.cfg -i
+#sed s/tasks=standard/tasks=trisquel-console/ build/boot/x86/syslinux.cfg -i
changelog "Rebranded and adapted for Trisquel"
compile
+
+cp build/tmp/netboot/mini.iso build/tmp/netboot/initrd.gz /root/
diff --git a/helpers/make-tasksel b/helpers/make-tasksel
index 40f1a59267c4ed0e21ac101a2ea97047f57ebeea..887b79b70983d5f91cfa486bd4c597d993fcf934 100644
--- a/helpers/make-tasksel
+++ b/helpers/make-tasksel
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=1
+VERSION=2
COMPONENT=main
. ./config