From d6ce8abd89f4288bce9d0472a39c014a839e8628 Mon Sep 17 00:00:00 2001
From: Dirk von Suchodoletz
Date: Mon, 28 Mar 2011 16:35:14 +0200
Subject: add support for ubunut 10.10

---
 .../OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm         |   1 +
 src/initramfs/distro-specs/ubuntu/functions-10.10  |  16 ++
 src/installer/OpenSLX/OSSetup/Distro/Base.pm       |   3 +-
 src/installer/OpenSLX/OSSetup/Engine.pm            |   2 +
 src/lib/OpenSLX/Basics.pm                          |   2 +-
 src/lib/distro-info/ubuntu-10.10/mirrors/base      | 162 +++++++++++++++++++
 .../distro-info/ubuntu-10.10/mirrors/base_security | 162 +++++++++++++++++++
 .../distro-info/ubuntu-10.10/mirrors/base_updates  | 171 +++++++++++++++++++++
 .../distro-info/ubuntu-10.10/prereqfiles/etc/hosts |   1 +
 src/lib/distro-info/ubuntu-10.10/settings.default  |  76 +++++++++
 src/lib/distro-info/ubuntu-10.10/settings.example  |  23 +++
 .../plugins/desktop/OpenSLX/Distro/Ubuntu.pm       |   4 +-
 12 files changed, 619 insertions(+), 4 deletions(-)
 create mode 100644 src/initramfs/distro-specs/ubuntu/functions-10.10
 create mode 100644 src/lib/distro-info/ubuntu-10.10/mirrors/base
 create mode 100644 src/lib/distro-info/ubuntu-10.10/mirrors/base_security
 create mode 100644 src/lib/distro-info/ubuntu-10.10/mirrors/base_updates
 create mode 100644 src/lib/distro-info/ubuntu-10.10/prereqfiles/etc/hosts
 create mode 100644 src/lib/distro-info/ubuntu-10.10/settings.default
 create mode 100644 src/lib/distro-info/ubuntu-10.10/settings.example

(limited to 'src')

diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
index 2c59bbae..ac669bf4 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Distro/Ubuntu.pm
@@ -65,6 +65,7 @@ sub determineMatchingHwinfoVersion
         '9.04' => '15.21',
         '9.10' => '16.0',
         '10.04' => '16.0',
+	'10.04' => '16.0',
     );
     return $versionMap{$distroVersion}
         || $self->SUPER::determineMatchingHwinfoVersion($distroVersion);
diff --git a/src/initramfs/distro-specs/ubuntu/functions-10.10 b/src/initramfs/distro-specs/ubuntu/functions-10.10
new file mode 100644
index 00000000..95844a3d
--- /dev/null
+++ b/src/initramfs/distro-specs/ubuntu/functions-10.10
@@ -0,0 +1,16 @@
+# Copyright (c) 2010 - OpenSLX GmbH
+#
+# This program/file is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your feedback to feedback@openslx.org
+#
+# General information about OpenSLX can be found under http://openslx.org
+#
+# Configuration script for Ubuntu 10.10 configure OpenSLX Linux stateless
+# clients (merged in stage2 with ubuntu/functions-default - and loaded within
+# initial ramfs - stage3) It may overwrite settings from the default config
+# file (/etc/functions)
+
+# no changes from default (as this is default at the moment)
diff --git a/src/installer/OpenSLX/OSSetup/Distro/Base.pm b/src/installer/OpenSLX/OSSetup/Distro/Base.pm
index c356e6d9..3f640f7c 100644
--- a/src/installer/OpenSLX/OSSetup/Distro/Base.pm
+++ b/src/installer/OpenSLX/OSSetup/Distro/Base.pm
@@ -80,7 +80,8 @@ sub initialize
         - /var/opt/openslx
         - /var/lib/vmware
         - /var/lib/ntp/*
-        - /var/run/*
+	- /var/lib/xkb/*
+	- /var/run/*
         + /var/run/screen
         - /var/log/*
         + /var/log/apt
diff --git a/src/installer/OpenSLX/OSSetup/Engine.pm b/src/installer/OpenSLX/OSSetup/Engine.pm
index 4de9ce41..b34ca2c1 100644
--- a/src/installer/OpenSLX/OSSetup/Engine.pm
+++ b/src/installer/OpenSLX/OSSetup/Engine.pm
@@ -74,6 +74,8 @@ use vars qw(%supportedDistros);
     'ubuntu-9.10_amd64' => 'clone,update,shell',
     'ubuntu-10.04'      => 'clone,install,update,shell',
     'ubuntu-10.04_amd64'=> 'clone,update,shell',
+    'ubuntu-10.10'      => 'clone,install,update,shell',
+    'ubuntu-10.10_amd64'=> 'clone,update,shell',
 );
 
 my %localHttpServers;
diff --git a/src/lib/OpenSLX/Basics.pm b/src/lib/OpenSLX/Basics.pm
index 4ac40166..3110d9fc 100644
--- a/src/lib/OpenSLX/Basics.pm
+++ b/src/lib/OpenSLX/Basics.pm
@@ -668,7 +668,7 @@ The I<$params>-hashref supports the following entries:
 =item distroName
 
 Specifies the name of the distro as it was retrieved from the vendor-OS
-(e.g. 'suse-10.2' or 'ubuntu-8.04_amd64').
+(e.g. 'suse-11.3_amd64' or 'ubuntu-10.10').
 
 =item distroScope
 
diff --git a/src/lib/distro-info/ubuntu-10.10/mirrors/base b/src/lib/distro-info/ubuntu-10.10/mirrors/base
new file mode 100644
index 00000000..cddbef70
--- /dev/null
+++ b/src/lib/distro-info/ubuntu-10.10/mirrors/base
@@ -0,0 +1,162 @@
+http://archive.ubuntu.com.ba/ubuntu
+http://archive.ubuntu.com/ubuntu
+ftp://br.archive.ubuntu.com/ubuntu
+ftp://bw.archive.ubuntu.com/ubuntu
+http://cl.archive.ubuntu.com/ubuntu
+http://cudlug.cudenver.edu/ubuntu
+http://cz.archive.ubuntu.com/ubuntu
+ftp://darkstar.ist.utl.pt/pub/ubuntu/archive
+http://darkstar.ist.utl.pt/ubuntu/archive
+http://de.archive.ubuntu.com/ubuntu
+http://debian.charite.de/ubuntu
+http://debian.linux.org.tw/ubuntu
+http://dk.archive.ubuntu.com/ubuntu
+http://es.archive.ubuntu.com/ubuntu
+http://espelhos.edugraf.ufsc.br/ubuntu
+ftp://free.nchc.org.tw/ubuntu
+http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu
+http://ftp-stud.hs-esslingen.de/ubuntu
+http://ftp.belnet.be/linux/ubuntu/ubuntu
+http://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu
+http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu
+http://ftp.chg.ru/pub/Linux/ubuntu/archive
+ftp://ftp.ciril.fr/pub/linux/ubuntu/archives
+http://ftp.citylink.co.nz/ubuntu
+http://ftp.crihan.fr/ubuntu
+ftp://ftp.cw.net/pub/linux/ftp.ubuntu.com/ubuntu
+http://ftp.cw.net/ubuntu
+http://ftp.dateleco.es/ubuntu
+http://ftp.dei.uc.pt/pub/linux/ubuntu/archive
+http://ftp.duth.gr/pub/ubuntu
+http://ftp.ecc.u-tokyo.ac.jp/ubuntu
+http://ftp.estpak.ee/ubuntu
+ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu
+http://ftp.freepark.org/ubuntu
+ftp://ftp.fu-berlin.de/linux/ubuntu
+ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com
+http://ftp.gil.di.uminho.pt/ubuntu
+ftp://ftp.gtlib.gatech.edu/pub/ubuntu
+http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu
+http://ftp.heanet.ie/pub/ubuntu
+http://ftp.hosteurope.de/mirror/archive.ubuntu.com
+ftp://ftp.iinet.net.au/pub/ubuntu
+ftp://ftp.iitm.ac.in/ubuntu
+http://ftp.kaist.ac.kr/pub/ubuntu
+http://ftp.kfki.hu/linux/ubuntu
+ftp://ftp.kfki.hu/pub/linux/ubuntu
+http://ftp.leg.uct.ac.za/pub/linux/ubuntu
+http://ftp.linux.edu.lv/ubuntu
+ftp://ftp.linux.org.tr/pub/ubuntu
+http://ftp.lug.ro/ubuntu
+ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu
+ftp://ftp.mipt.ru/mirror/ubuntu
+ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu
+http://ftp.netspace.net.au/pub/ubuntu
+http://ftp.ntua.gr/pub/linux/ubuntu
+ftp://ftp.oleane.net/ubuntu
+ftp://ftp.otenet.gr/ubuntu
+http://ftp.port80.se/ubuntu
+http://ftp.pwr.wroc.pl/ubuntu
+ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
+ftp://ftp.science.nus.edu.sg/pub/ubuntu
+http://ftp.science.nus.edu.sg/ubuntu
+http://ftp.stw-bonn.de/ubuntu
+http://ftp.ticklers.org/archive.ubuntu.org/ubuntu
+ftp://ftp.tiscali.nl/pub/mirror/ubuntu
+http://ftp.tiscali.nl/ubuntu
+http://ftp.tu-chemnitz.de/pub/linux/ubuntu
+ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com
+http://ftp.tuke.sk/ubuntu
+http://ftp.twaren.net/Linux/Ubuntu/ubuntu
+http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu
+ftp://ftp.uasw.edu/linux/ubuntu/archive
+http://ftp.ucr.ac.cr/ubuntu
+http://ftp.udc.es/ubuntu
+http://ftp.uni-kl.de/pub/linux/ubuntu
+http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu
+http://ftp.unina.it/pub/linux/distributions/ubuntu
+http://ftp.uninett.no/ubuntu
+http://ftp.usf.edu/pub/ubuntu
+http://ftp.ussg.iu.edu/linux/ubuntu
+ftp://ftp.vectranet.pl/ubuntu
+http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives
+ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com
+http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive
+http://godel.cs.bilgi.edu.tr/ubuntu
+http://gulus.USherbrooke.ca/ubuntu
+http://hr.archive.ubuntu.com/ubuntu
+http://ie.archive.ubuntu.com/ubuntu
+http://klid.dk/ftp/ubuntu
+ftp://klid.dk/ubuntu
+http://kr.archive.ubuntu.com/ubuntu
+http://lug.mtu.edu/ubuntu
+http://mir1.ovh.net/ubuntu
+http://mirror.anl.gov/pub/ubuntu
+http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive
+http://mirror.cs.umn.edu/ubuntu
+http://mirror.hgkz.ch/ubuntu
+http://mirror.imbrandon.com/ubuntu
+http://mirror.lcsee.wvu.edu/ubuntu
+http://mirror.letsopen.com/os/ubuntu
+http://mirror.lupaworld.com/ubuntu/archive
+http://mirror.nttu.edu.tw/ubuntu
+http://mirror.optus.net/ubuntu
+http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu
+http://mirror.pacific.net.au/linux/ubuntu
+http://mirror.rootguide.org/ubuntu
+http://mirror.switch.ch/ftp/mirror/ubuntu
+ftp://mirror.switch.ch/mirror/ubuntu
+http://mirror.uni-c.dk/ubuntu
+http://mirror.utdlug.org/linux/distributions/ubuntu/packages
+http://mirrors.cat.pdx.edu/ubuntu
+http://mirrors.ccs.neu.edu/archive.ubuntu.com
+ftp://mirrors.ccs.neu.edu/net/mirrors/archive.ubuntu.com
+http://mirrors.cs.wmich.edu/ubuntu
+ftp://mirrors.easynews.com/linux/ubuntu
+http://mirrors.kernel.org/ubuntu
+http://mirrors.nic.funet.fi/ubuntu
+http://mirrors.shlug.org/ubuntu
+ftp://mirrors.virginmedia.com/mirrors/ubuntu/archive
+http://mirrors.xmission.com/ubuntu
+http://mt.archive.ubuntu.com/ubuntu
+http://na.mirror.garr.it/mirrors/ubuntu-archive
+ftp://neacm.fe.up.pt/pub/ubuntu
+http://neacm.fe.up.pt/ubuntu
+http://nl.archive.ubuntu.com/ubuntu
+http://nl2.archive.ubuntu.com/ubuntu
+http://nz2.archive.ubuntu.com/ubuntu
+http://packages.midian.hu//pub/linux/distributions/ubuntu
+http://se.archive.ubuntu.com/ubuntu
+http://sft.if.usp.br/ubuntu
+http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu
+http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu
+ftp://sunsite.informatik.rwth-aachen.de/pub/linux/ubuntu/ubuntu
+http://tezcatl.fciencias.unam.mx/ubuntu
+http://th.archive.ubuntu.com/ubuntu
+ftp://tw.archive.ubuntu.com/ubuntu
+http://ubuntu-archive.datahop.it/ubuntu
+http://ubuntu.c3sl.ufpr.br/ubuntu
+http://ubuntu.cn99.com/ubuntu
+http://ubuntu.cs.utah.edu/ubuntu
+http://ubuntu.csie.nctu.edu.tw/ubuntu
+http://ubuntu.eriders.ge/ubuntu
+http://ubuntu.fastbull.org/ubuntu
+http://ubuntu.indika.net.id/ubuntu
+http://ubuntu.inode.at/ubuntu
+http://ubuntu.intergenia.de/ubuntu
+http://ubuntu.ipacct.com/ubuntu
+http://ubuntu.lhi.is/ubuntu
+http://ubuntu.linux-bg.org/ubuntu
+http://ubuntu.mirror.frontiernet.net/ubuntu
+http://ubuntu.mirror.rafal.ca/ubuntu
+http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu
+http://ubuntu.snet.uz/ubuntu
+http://ubuntu.supp.name/ubuntu
+http://ubuntu.task.gda.pl/ubuntu
+http://ubuntu.univ-nantes.fr/ubuntu
+http://ubuntu.uz/ubuntu
+http://ubuntu.ynet.sk/ubuntu
+http://www.gtlib.gatech.edu/pub/ubuntu
+http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu
+http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com
+ftp://yu.archive.ubuntu.com/ubuntu
diff --git a/src/lib/distro-info/ubuntu-10.10/mirrors/base_security b/src/lib/distro-info/ubuntu-10.10/mirrors/base_security
new file mode 100644
index 00000000..3617b3dd
--- /dev/null
+++ b/src/lib/distro-info/ubuntu-10.10/mirrors/base_security
@@ -0,0 +1,162 @@
+http://archive.ubuntu.com.ba/ubuntu
+http://archive.ubuntu.com/ubuntu
+http://br.archive.ubuntu.com/ubuntu
+http://bw.archive.ubuntu.com/ubuntu
+http://cl.archive.ubuntu.com/ubuntu
+http://cudlug.cudenver.edu/ubuntu
+ftp://cz.archive.ubuntu.com/MIRRORS/archive.ubuntu.com/mirror/ubuntu
+http://cz.archive.ubuntu.com/ubuntu
+ftp://darkstar.ist.utl.pt/pub/ubuntu/archive
+http://darkstar.ist.utl.pt/ubuntu/archive
+http://de.archive.ubuntu.com/ubuntu
+http://debian.charite.de/ubuntu
+http://debian.linux.org.tw/ubuntu
+http://dk.archive.ubuntu.com/ubuntu
+http://es.archive.ubuntu.com/ubuntu
+http://espelhos.edugraf.ufsc.br/ubuntu
+http://free.nchc.org.tw/ubuntu
+http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu
+http://ftp-stud.hs-esslingen.de/ubuntu
+http://ftp.belnet.be/linux/ubuntu/ubuntu
+http://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu
+http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu
+http://ftp.chg.ru/pub/Linux/ubuntu/archive
+ftp://ftp.ciril.fr/pub/linux/ubuntu/archives
+http://ftp.citylink.co.nz/ubuntu
+http://ftp.crihan.fr/ubuntu
+ftp://ftp.cw.net/pub/linux/ftp.ubuntu.com/ubuntu
+http://ftp.cw.net/ubuntu
+http://ftp.dateleco.es/ubuntu
+http://ftp.dei.uc.pt/pub/linux/ubuntu/archive
+http://ftp.duth.gr/pub/ubuntu
+http://ftp.ecc.u-tokyo.ac.jp/ubuntu
+http://ftp.estpak.ee/ubuntu
+ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu
+http://ftp.freepark.org/ubuntu
+ftp://ftp.fu-berlin.de/linux/ubuntu
+ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com
+http://ftp.gil.di.uminho.pt/ubuntu
+http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu
+http://ftp.halifax.rwth-aachen.de/ubuntu
+http://ftp.heanet.ie/pub/ubuntu
+http://ftp.hosteurope.de/mirror/archive.ubuntu.com
+http://ftp.iinet.net.au/pub/ubuntu
+http://ftp.iitm.ac.in/ubuntu
+http://ftp.kaist.ac.kr/pub/ubuntu
+http://ftp.kfki.hu/linux/ubuntu
+ftp://ftp.kfki.hu/pub/linux/ubuntu
+http://ftp.leg.uct.ac.za/pub/linux/ubuntu
+http://ftp.linux.edu.lv/ubuntu
+http://ftp.lug.ro/ubuntu
+ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu
+ftp://ftp.mipt.ru/mirror/ubuntu
+ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu
+http://ftp.netspace.net.au/pub/ubuntu
+http://ftp.ntua.gr/pub/linux/ubuntu
+ftp://ftp.oleane.net/ubuntu
+ftp://ftp.otenet.gr/ubuntu
+http://ftp.pwr.wroc.pl/ubuntu
+ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
+http://ftp.science.nus.edu.sg/ubuntu
+http://ftp.stw-bonn.de/ubuntu
+http://ftp.ticklers.org/archive.ubuntu.org/ubuntu
+ftp://ftp.tiscali.nl/pub/mirror/ubuntu
+http://ftp.tiscali.nl/ubuntu
+http://ftp.tu-chemnitz.de/pub/linux/ubuntu
+ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com
+http://ftp.tuke.sk/ubuntu
+http://ftp.twaren.net/Linux/Ubuntu/ubuntu
+http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu
+ftp://ftp.uasw.edu/linux/ubuntu/archive
+http://ftp.ucr.ac.cr/ubuntu
+http://ftp.udc.es/ubuntu
+http://ftp.uni-kl.de/pub/linux/ubuntu
+http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu
+http://ftp.unina.it/pub/linux/distributions/ubuntu
+http://ftp.uninett.no/ubuntu
+http://ftp.usf.edu/pub/ubuntu
+http://ftp.ussg.iu.edu/linux/ubuntu
+ftp://ftp.vectranet.pl/ubuntu
+http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives
+ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com
+http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive
+http://godel.cs.bilgi.edu.tr/ubuntu
+http://gulus.USherbrooke.ca/ubuntu
+http://hr.archive.ubuntu.com/ubuntu
+http://ie.archive.ubuntu.com/ubuntu
+http://kr.archive.ubuntu.com/ubuntu
+http://lug.mtu.edu/ubuntu
+http://mir1.ovh.net/ubuntu
+http://mirror.anl.gov/pub/ubuntu
+http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive
+http://mirror.cs.umn.edu/ubuntu
+http://mirror.hgkz.ch/ubuntu
+http://mirror.imbrandon.com/ubuntu
+http://mirror.lcsee.wvu.edu/ubuntu
+http://mirror.letsopen.com/os/ubuntu
+http://mirror.lupaworld.com/ubuntu/archive
+http://mirror.nttu.edu.tw/ubuntu
+http://mirror.optus.net/ubuntu
+http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu
+http://mirror.pacific.net.au/linux/ubuntu
+http://mirror.rootguide.org/ubuntu
+http://mirror.switch.ch/ftp/mirror/ubuntu
+ftp://mirror.switch.ch/mirror/ubuntu
+http://mirror.uni-c.dk/ubuntu
+http://mirror.utdlug.org/linux/distributions/ubuntu/packages
+http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive
+http://mirrors.cat.pdx.edu/ubuntu
+http://mirrors.ccs.neu.edu/archive.ubuntu.com
+http://mirrors.cs.wmich.edu/ubuntu
+http://mirrors.easynews.com/linux/ubuntu
+http://mirrors.kernel.org/ubuntu
+http://mirrors.nic.funet.fi/ubuntu
+http://mirrors.shlug.org/ubuntu
+ftp://mirrors.virginmedia.com/mirrors/ubuntu/archive
+http://mirrors.xmission.com/ubuntu
+http://mt.archive.ubuntu.com/ubuntu
+http://na.mirror.garr.it/mirrors/ubuntu-archive
+ftp://neacm.fe.up.pt/pub/ubuntu
+http://neacm.fe.up.pt/ubuntu
+http://nl.archive.ubuntu.com/ubuntu
+http://nl2.archive.ubuntu.com/ubuntu
+http://nz2.archive.ubuntu.com/ubuntu
+http://packages.midian.hu//pub/linux/distributions/ubuntu
+http://se.archive.ubuntu.com/ubuntu
+http://sft.if.usp.br/ubuntu
+http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu
+http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu
+ftp://sunsite.informatik.rwth-aachen.de/pub/linux/ubuntu/ubuntu
+http://tezcatl.fciencias.unam.mx/ubuntu
+http://th.archive.ubuntu.com/ubuntu
+http://tw.archive.ubuntu.com/ubuntu
+http://ubuntu-archive.datahop.it/ubuntu
+http://ubuntu.c3sl.ufpr.br/ubuntu
+http://ubuntu.cn99.com/ubuntu
+http://ubuntu.cs.uaf.edu/ubuntu
+http://ubuntu.cs.utah.edu/ubuntu
+http://ubuntu.csie.nctu.edu.tw/ubuntu
+http://ubuntu.eriders.ge/ubuntu
+http://ubuntu.fastbull.org/ubuntu
+http://ubuntu.indika.net.id/ubuntu
+http://ubuntu.inode.at/ubuntu
+http://ubuntu.intergenia.de/ubuntu
+http://ubuntu.ipacct.com/ubuntu
+http://ubuntu.lhi.is/ubuntu
+http://ubuntu.linux-bg.org/ubuntu
+http://ubuntu.mirror.ac.za/ubuntu-archive
+http://ubuntu.mirror.frontiernet.net/ubuntu
+http://ubuntu.mirror.rafal.ca/ubuntu
+http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu
+http://ubuntu.org.ua/ubuntu
+http://ubuntu.snet.uz/ubuntu
+http://ubuntu.supp.name/ubuntu
+http://ubuntu.task.gda.pl/ubuntu
+http://ubuntu.univ-nantes.fr/ubuntu
+http://ubuntu.uz/ubuntu
+http://ubuntu.ynet.sk/ubuntu
+http://www.gtlib.gatech.edu/pub/ubuntu
+http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu
+http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com
+http://wwwftp.ciril.fr/pub/linux/ubuntu/archives
+ftp://yu.archive.ubuntu.com/ubuntu
diff --git a/src/lib/distro-info/ubuntu-10.10/mirrors/base_updates b/src/lib/distro-info/ubuntu-10.10/mirrors/base_updates
new file mode 100644
index 00000000..3b936ecf
--- /dev/null
+++ b/src/lib/distro-info/ubuntu-10.10/mirrors/base_updates
@@ -0,0 +1,171 @@
+http://archive.ubuntu.com.ba/ubuntu
+http://archive.ubuntu.com/ubuntu
+ftp://br.archive.ubuntu.com/ubuntu
+ftp://bw.archive.ubuntu.com/ubuntu
+http://cl.archive.ubuntu.com/ubuntu
+http://cudlug.cudenver.edu/ubuntu
+ftp://cz.archive.ubuntu.com/MIRRORS/archive.ubuntu.com/mirror/ubuntu
+http://cz.archive.ubuntu.com/ubuntu
+ftp://darkstar.ist.utl.pt/pub/ubuntu/archive
+http://darkstar.ist.utl.pt/ubuntu/archive
+http://de.archive.ubuntu.com/ubuntu
+http://debian.charite.de/ubuntu
+http://debian.linux.org.tw/ubuntu
+http://dk.archive.ubuntu.com/ubuntu
+http://es.archive.ubuntu.com/ubuntu
+http://espelhos.edugraf.ufsc.br/ubuntu
+ftp://free.nchc.org.tw/ubuntu
+http://ftp-stud.fht-esslingen.de/Mirrors/ubuntu
+http://ftp-stud.hs-esslingen.de/ubuntu
+http://ftp.belnet.be/linux/ubuntu/ubuntu
+http://ftp.belnet.be/pub/mirror/ubuntu.com/ubuntu
+http://ftp.caliu.info/pub/distribucions/ubuntu/ubuntu
+http://ftp.chg.ru/pub/Linux/ubuntu/archive
+ftp://ftp.ciril.fr/pub/linux/ubuntu/archives
+http://ftp.citylink.co.nz/ubuntu
+http://ftp.crihan.fr/ubuntu
+ftp://ftp.cw.net/pub/linux/ftp.ubuntu.com/ubuntu
+http://ftp.cw.net/ubuntu
+http://ftp.dateleco.es/ubuntu
+http://ftp.dei.uc.pt/pub/linux/ubuntu/archive
+http://ftp.duth.gr/pub/ubuntu
+http://ftp.ecc.u-tokyo.ac.jp/ubuntu
+http://ftp.estpak.ee/ubuntu
+ftp://ftp.free.fr/mirrors/ftp.ubuntu.com/ubuntu
+http://ftp.freepark.org/ubuntu
+ftp://ftp.fu-berlin.de/linux/ubuntu
+ftp://ftp.funet.fi/pub/mirrors/archive.ubuntu.com
+http://ftp.gil.di.uminho.pt/ubuntu
+ftp://ftp.gtlib.gatech.edu/pub/ubuntu
+http://ftp.gui.uva.es/sites/ubuntu.com/ubuntu
+http://ftp.halifax.rwth-aachen.de/ubuntu
+http://ftp.heanet.ie/pub/ubuntu
+http://ftp.hosteurope.de/mirror/archive.ubuntu.com
+ftp://ftp.iinet.net.au/pub/ubuntu
+ftp://ftp.iitm.ac.in/ubuntu
+http://ftp.kaist.ac.kr/pub/ubuntu
+http://ftp.kfki.hu/linux/ubuntu
+ftp://ftp.kfki.hu/pub/linux/ubuntu
+http://ftp.leg.uct.ac.za/pub/linux/ubuntu
+http://ftp.linux.edu.lv/ubuntu
+ftp://ftp.linux.org.tr/pub/ubuntu
+http://ftp.lug.ro/ubuntu
+ftp://ftp.man.szczecin.pl/pub/Linux/ubuntu
+ftp://ftp.mipt.ru/mirror/ubuntu
+ftp://ftp.mirrorservice.org/sites/archive.ubuntu.com/ubuntu
+http://ftp.netspace.net.au/pub/ubuntu
+http://ftp.ntua.gr/pub/linux/ubuntu
+ftp://ftp.oleane.net/ubuntu
+ftp://ftp.otenet.gr/ubuntu
+ftp://ftp.polytechnic.edu.na/pub/ubuntu
+http://ftp.port80.se/ubuntu
+http://ftp.pwr.wroc.pl/ubuntu
+ftp://ftp.rrzn.uni-hannover.de/pub/mirror/linux/ubuntu
+ftp://ftp.science.nus.edu.sg/pub/ubuntu
+http://ftp.science.nus.edu.sg/ubuntu
+http://ftp.stw-bonn.de/ubuntu
+http://ftp.ticklers.org/archive.ubuntu.org/ubuntu
+ftp://ftp.tiscali.nl/pub/mirror/ubuntu
+http://ftp.tiscali.nl/ubuntu
+http://ftp.tu-chemnitz.de/pub/linux/ubuntu
+ftp://ftp.tudelft.nl/pub/Linux/archive.ubuntu.com
+http://ftp.tuke.sk/ubuntu
+http://ftp.twaren.net/Linux/Ubuntu/ubuntu
+http://ftp.u-picardie.fr/mirror/ubuntu/ubuntu
+ftp://ftp.uasw.edu/linux/ubuntu/archive
+http://ftp.ucr.ac.cr/ubuntu
+http://ftp.udc.es/ubuntu
+http://ftp.uni-kl.de/pub/linux/ubuntu
+http://ftp.uni-muenster.de/pub/mirrors/ftp.ubuntu.com/ubuntu
+http://ftp.unina.it/pub/linux/distributions/ubuntu
+http://ftp.uninett.no/ubuntu
+http://ftp.usf.edu/pub/ubuntu
+http://ftp.ussg.iu.edu/linux/ubuntu
+ftp://ftp.vectranet.pl/ubuntu
+http://ftp.yz.yamagata-u.ac.jp/pub/linux/ubuntu/archives
+ftp://ftpserv.tudelft.nl/pub/Linux/archive.ubuntu.com
+http://gd.tuwien.ac.at/opsys/linux/ubuntu/archive
+http://godel.cs.bilgi.edu.tr/ubuntu
+http://gulus.USherbrooke.ca/ubuntu
+http://hr.archive.ubuntu.com/ubuntu
+http://ie.archive.ubuntu.com/ubuntu
+http://klid.dk/ftp/ubuntu
+ftp://klid.dk/ubuntu
+http://kr.archive.ubuntu.com/ubuntu
+http://lug.mtu.edu/ubuntu
+http://mir1.ovh.net/ubuntu
+http://mirror.anl.gov/pub/ubuntu
+http://mirror.cc.columbia.edu/pub/linux/ubuntu/archive
+http://mirror.cs.umn.edu/ubuntu
+http://mirror.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive
+http://mirror.hgkz.ch/ubuntu
+http://mirror.imbrandon.com/ubuntu
+http://mirror.lcsee.wvu.edu/ubuntu
+http://mirror.letsopen.com/os/ubuntu
+http://mirror.lupaworld.com/ubuntu/archive
+http://mirror.nttu.edu.tw/ubuntu
+http://mirror.optus.net/ubuntu
+http://mirror.ox.ac.uk/sites/archive.ubuntu.com/ubuntu
+http://mirror.pacific.net.au/linux/ubuntu
+http://mirror.rootguide.org/ubuntu
+http://mirror.switch.ch/ftp/mirror/ubuntu
+ftp://mirror.switch.ch/mirror/ubuntu
+http://mirror.uni-c.dk/ubuntu
+http://mirror.utdlug.org/linux/distributions/ubuntu/packages
+http://mirror2.etf.bg.ac.yu/distributions/ubuntu/ubuntu-archive
+http://mirrors.cat.pdx.edu/ubuntu
+http://mirrors.ccs.neu.edu/archive.ubuntu.com
+ftp://mirrors.ccs.neu.edu/net/mirrors/archive.ubuntu.com
+http://mirrors.cs.wmich.edu/ubuntu
+ftp://mirrors.easynews.com/linux/ubuntu
+http://mirrors.kernel.org/ubuntu
+http://mirrors.nic.funet.fi/ubuntu
+http://mirrors.shlug.org/ubuntu
+ftp://mirrors.virginmedia.com/mirrors/ubuntu/archive
+http://mirrors.xmission.com/ubuntu
+http://mt.archive.ubuntu.com/ubuntu
+http://na.mirror.garr.it/mirrors/ubuntu-archive
+ftp://neacm.fe.up.pt/pub/ubuntu
+http://neacm.fe.up.pt/ubuntu
+http://nl.archive.ubuntu.com/ubuntu
+http://nl2.archive.ubuntu.com/ubuntu
+http://nz2.archive.ubuntu.com/ubuntu
+http://packages.midian.hu//pub/linux/distributions/ubuntu
+http://se.archive.ubuntu.com/ubuntu
+http://sft.if.usp.br/ubuntu
+http://snert.mi.hs-heilbronn.de/pub/ubuntu/ubuntu
+http://sunsite.informatik.rwth-aachen.de/ftp/pub/Linux/ubuntu/ubuntu
+ftp://sunsite.informatik.rwth-aachen.de/pub/linux/ubuntu/ubuntu
+http://tezcatl.fciencias.unam.mx/ubuntu
+http://th.archive.ubuntu.com/ubuntu
+ftp://tw.archive.ubuntu.com/ubuntu
+http://ubuntu-archive.datahop.it/ubuntu
+http://ubuntu.c3sl.ufpr.br/ubuntu
+http://ubuntu.cn99.com/ubuntu
+http://ubuntu.cs.uaf.edu/ubuntu
+http://ubuntu.cs.utah.edu/ubuntu
+http://ubuntu.csie.nctu.edu.tw/ubuntu
+http://ubuntu.eriders.ge/ubuntu
+http://ubuntu.fastbull.org/ubuntu
+http://ubuntu.indika.net.id/ubuntu
+http://ubuntu.inode.at/ubuntu
+http://ubuntu.intergenia.de/ubuntu
+http://ubuntu.ipacct.com/ubuntu
+http://ubuntu.lhi.is/ubuntu
+http://ubuntu.linux-bg.org/ubuntu
+ftp://ubuntu.mirror.ac.za/ubuntu-archive
+http://ubuntu.mirror.frontiernet.net/ubuntu
+http://ubuntu.mirror.rafal.ca/ubuntu
+http://ubuntu.mirrors.skynet.be/pub/ubuntu.com/ubuntu
+http://ubuntu.org.ua/ubuntu
+http://ubuntu.snet.uz/ubuntu
+http://ubuntu.supp.name/ubuntu
+http://ubuntu.task.gda.pl/ubuntu
+http://ubuntu.univ-nantes.fr/ubuntu
+http://ubuntu.uz/ubuntu
+http://ubuntu.ynet.sk/ubuntu
+http://www.gtlib.gatech.edu/pub/ubuntu
+http://www.mirrorservice.org/sites/archive.ubuntu.com/ubuntu
+http://www.nic.funet.fi/pub/mirrors/archive.ubuntu.com
+http://wwwftp.ciril.fr/pub/linux/ubuntu/archives
+ftp://yu.archive.ubuntu.com/ubuntu
diff --git a/src/lib/distro-info/ubuntu-10.10/prereqfiles/etc/hosts b/src/lib/distro-info/ubuntu-10.10/prereqfiles/etc/hosts
new file mode 100644
index 00000000..75721cd5
--- /dev/null
+++ b/src/lib/distro-info/ubuntu-10.10/prereqfiles/etc/hosts
@@ -0,0 +1 @@
+127.0.0.1 localhost
diff --git a/src/lib/distro-info/ubuntu-10.10/settings.default b/src/lib/distro-info/ubuntu-10.10/settings.default
new file mode 100644
index 00000000..0d802d55
--- /dev/null
+++ b/src/lib/distro-info/ubuntu-10.10/settings.default
@@ -0,0 +1,76 @@
+arch = i386
+package-subdir = pool
+prereq-packages = main/d/debootstrap/debootstrap_1.0.23_all.deb
+release-name = maverick
+<repository base>
+    components = main restricted
+    distribution = maverick
+    name = Ubuntu 10.10
+    repo-subdir = dists
+    file-for-speedtest = dists/maverick/main/binary-i386/Packages.bz2
+</repository>
+<repository base_security>
+    components = main restricted
+    distribution = maverick-security
+    name = Ubuntu 10.10 Security
+    repo-subdir = dists
+    file-for-speedtest = dists/maverick-security/main/binary-i386/Packages.bz2
+</repository>
+<repository base_updates>
+    components = main restricted
+    distribution = maverick-updates
+    name = Ubuntu 10.10 Updates
+    repo-subdir = dists
+    file-for-speedtest = dists/maverick-updates/main/binary-i386/Packages.bz2
+</repository>
+<selection minimal>
+    packages = <<END
+        language-pack-de
+        linux-image-generic
+    END
+</selection>
+<selection standard>
+    base = minimal
+    packages = <<END
+        ubuntu-standard
+    END
+</selection>
+<selection gnome>
+    base = minimal
+    packages = <<END
+        ubuntu-desktop
+    END
+</selection>
+<selection kde>
+    base = minimal
+    packages = <<END
+        kubuntu-desktop
+    END
+</selection>
+<selection xfce>
+    base = minimal
+    packages = <<END
+        xubuntu-desktop
+    END
+</selection>
+<selection edubuntu-server>
+    base = minimal
+    packages = <<END
+        edubuntu-server
+    END
+</selection>
+<selection edubuntu-gnome>
+    base = minimal
+    packages = <<END
+        edubuntu-desktop-gnome
+    END
+</selection>
+<selection edubuntu-kde>
+    base = minimal
+    packages = <<END
+        edubuntu-desktop-kde
+    END
+</selection>
+<selection default>
+    base = minimal
+</selection>
diff --git a/src/lib/distro-info/ubuntu-10.10/settings.example b/src/lib/distro-info/ubuntu-10.10/settings.example
new file mode 100644
index 00000000..31881c4c
--- /dev/null
+++ b/src/lib/distro-info/ubuntu-10.10/settings.example
@@ -0,0 +1,23 @@
+# rename this file to 'settings' and edit it as you please
+# 
+# for a list of all options, have a look at the corresponding 
+# settings.default in /opt/openslx/share/distro-info
+
+# use local installation source
+#<repository base>
+#    local-url = /srv/ftp/pub/ubuntu
+#</repository>
+#<repository base_updates>
+#    local-url = /srv/ftp/pub/ubuntu
+#</repository>
+#<repository base_security>
+#    local-url = /srv/ftp/pub/ubuntu
+#</repository>
+
+# add a new selection:
+#<selection my_kde>
+#    base = kde
+#    packages = <<END
+#        kinternet
+#    END
+#</selection>
diff --git a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
index d222c102..d8461b86 100644
--- a/src/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
+++ b/src/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm
@@ -66,8 +66,8 @@ sub setupGDMScript
           /usr/bin/gnome-session
         # gdm does not like AUFS/UnionFS on its var directory
         rm -rf /mnt/var/lib/gdm
-        mkdir -m 1770 /mnt/var/lib/gdm
-        chown root:gdm /mnt/var/lib/gdm
+        mkdir -m 1770 /mnt/var/lib/gdm/.config
+        chown -R gdm:gdm /mnt/var/lib/gdm
         #sed '/^\\[daemon\\]/ a\\BaseXsession=/etc/gdm/Xsession' \
         #  -i /mnt$configFile
     End-of-Here
-- 
cgit v1.2.3-55-g7522