diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize
deleted file mode 100755
index cda5b05f7026836cf245591dcd44bd010b0bf1b4..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-#is this true for all uck versions??
-SCRIPT_DIR=`dirname "$0"`
-
-#source common functions (e.g. patch_all)
-if [ -e "$SCRIPT_DIR/customize_common" ]; then
- source "$SCRIPT_DIR/customize_common"
-fi
-
-function prepare_install()
-{
- if [ -e "$SCRIPT_DIR/lip_sources.list" ]; then
- cp -v "$SCRIPT_DIR/lip_sources.list" "/etc/apt/sources.list"
- fi
-
- echo "# offline repository of the linux install party
-deb [ trusted=yes ] file:/cdrom/archives precise lip" > /etc/apt/sources.list.d/lipoffline.list
-
- add-apt-repository -y ppa:texlive-backports/ppa
-
- apt-get update
-}
-
-function install_packages()
-{
- apt-get upgrade --assume-yes --force-yes
- apt-get install aptitude -y
-
- aptitude full-upgrade -y # make sure we have the newest versions
- # Some daily images do not have a kernel ?!?
- aptitude reinstall linux-image-generic-lts-quantal -y
- apt-cache depends linux-image-generic-lts-quantal | tail -n+2 | awk '{print $NF}' | xargs aptitude reinstall -y
-
- aptitude install automake cmake aspell-de build-essential ffmpeg htop hunspell lvm2 mencoder screen tofrodos efibootmgr gdisk linux-headers vlc moreutils network-manager-vpnc-gnome vim -y # install general packages
- aptitude install --without-recommends mdadm -y # install mdadm without mailserver
- aptitude install cm-super context feynmf fragmaster info latex-beamer latex-xcolor latexmk pgf psutils t1utils texinfo texlive-base texlive-bibtex-extra texlive-binaries texlive-common texlive-doc-base texlive-doc-de texlive-doc-en texlive-extra-utils texlive-font-utils texlive-fonts-extra texlive-fonts-extra-doc texlive-fonts-recommended texlive-fonts-recommended-doc texlive-formats-extra texlive-games texlive-generic-extra texlive-humanities texlive-humanities-doc texlive-lang-german texlive-latex-base texlive-latex-base-doc texlive-latex-extra texlive-latex-extra-doc texlive-latex-recommended texlive-latex-recommended-doc texlive-latex3 texlive-luatex texlive-math-extra texlive-metapost texlive-metapost-doc texlive-music texlive-omega texlive-pictures texlive-pictures-doc texlive-plain-extra texlive-pstricks texlive-pstricks-doc texlive-publishers texlive-publishers-doc texlive-science texlive-science-doc texlive-xetex -y # install stripped version of texlive without all kinds of documentation in foreign languages
-
- aptitude install hunspell-de-de language-pack-de language-pack-support-de wngerman wogerman wswiss poppler-data libreoffice-l10n-de libreoffice-help-de hyphen-de mythes-de thunderbird-locale-de firefox-locale-de -y # install german language support
-
- MISSING_LANG_PKG="$(check-language-support -l de_DE)"
- MISSING_LANG_PKG="$(check-language-support -l en_US) $MISSING_LANG_PKG" # check for missing packages for de_DE and en_US
-
- if [ -n "$MISSING_LANG_PKG" ]; then
- aptitude install $MISSING_LANG_PKG -y
- fi
-
- EXTRA_LANG_PKG="$(dpkg-query --show | cut -f1 | grep -E '^(language-pack|language-support|firefox-locale|thunderbird-locale|libreoffice-help|libreoffice-l10n)' | grep -Ev "[-](de|en)\>")" # remove extra language packages
-
- if [ -n "$EXTRA_LANG_PKG" ]; then
- aptitude purge $EXTRA_LANG_PKG -y
- fi
-
-}
-
-function finalize()
-{
- echo -n "Europe/Berlin" > /etc/timezone
-
- rm -rf /var/crash/*
-}
-
-prepare_install
-install_packages
-
-cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop" /usr/share/applications/
-
-#patch rootfs
-patch_all "$SCRIPT_DIR/rootfs-patches/" "/"
-finalize
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_common b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_common
deleted file mode 100755
index 288a7691e8ad59f46d98904715975c202fa6dbac..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_common
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-function patch_all()
-{
- PATCH_DIR="$1"
- TARGET_DIR="$2"
-
- if [ ! -d "$PATCH_DIR" ]; then
- echo "Nothing to patch here!"
- return 0
- fi
-
- if [ -z "$TARGET_DIR" ]; then
- echo "No target directory given, assuming /"
- TARGET_DIR="/"
- fi
-
- echo "Patching $TARGET_DIR ..."
- for p in "$PATCH_DIR/"*
- do
- cat "$p" | patch -d "$TARGET_DIR" -p1
- done
- echo "done."
-}
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_initrd
deleted file mode 100755
index 3bc7e759f5e64e6553616fefa9c0e7eeb3598ded..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_initrd
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-###################################################################################
-# UCK - Ubuntu Customization Kit #
-# Copyright (C) 2006-2010 UCK Team #
-# #
-# UCK is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# UCK is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with UCK. If not, see <http://www.gnu.org/licenses/>. #
-###################################################################################
-
-REMASTER_HOME=$1
-REMASTER_DIR="$REMASTER_HOME/remaster-root"
-INITRD_REMASTER_DIR="$REMASTER_HOME/remaster-initrd"
-
-echo "Using REMASTER_DIR=$REMASTER_DIR, INITRD_REMASTER_DIR=$INITRD_REMASTER_DIR"
-
-IRD="$INITRD_REMASTER_DIR"
-SCRIPT_DIR="`dirname $0`"
-
-if [ -e "$SCRIPT_DIR/customize_common" ]; then
- source "$SCRIPT_DIR/customize_common"
-fi
-
-function install_nmtelekinese()
-{
- mkdir -p "$IRD/nm"
- cp "$SCRIPT_DIR/nmtelekinese/nmtelekinese.desktop" "$IRD/nm"
- cp "$SCRIPT_DIR/nmtelekinese/nmtelekinese.py" "$IRD/nm"
- cp "$SCRIPT_DIR/nmtelekinese/ORDER" "$IRD/scripts/casper-bottom/"
- cp "$SCRIPT_DIR/nmtelekinese/26mopsmops" "$IRD/scripts/casper-bottom/"
- chmod +x "$IRD/scripts/casper-bottom/26mopsmops"
-}
-
-function add_no_bootloader_icon()
-{
- cp "$SCRIPT_DIR/no-bootloader-icon/25adduser" "$IRD/scripts/casper-bottom/"
- chmod +x "$IRD/scripts/casper-bottom/25adduser"
-}
-
-install_nmtelekinese
-add_no_bootloader_icon
-patch_all "$SCRIPT_DIR/initrd-patches/" "$IRD"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_iso b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_iso
deleted file mode 100755
index 0140ffa76973b9c83d18881ee54384c6a57a6d1b..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/customize_iso
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=`dirname "$0"`
-REMASTER_HOME=${1:-~/tmp}
-ISO_REMASTER_DIR="$REMASTER_HOME/remaster-iso"
-REMASTER_DIR="$REMASTER_HOME/remaster-root"
-
-if [ -e "$SCRIPT_DIR/customize_common" ]; then
- source "$SCRIPT_DIR/customize_common"
-fi
-
-function create_md5sums()
-{
- pushd "$REMASTER_DIR"
- find . -type f -print0 | sort -z | xargs -0 md5sum > "$REMASTER_HOME/rootfs.md5"
- popd
-}
-
-create_md5sums
-
-patch_all "$SCRIPT_DIR/iso-patches/" "$ISO_REMASTER_DIR/"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/iso-patches/ubiquity-keep-installed.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/iso-patches/ubiquity-keep-installed.patch
deleted file mode 100644
index 64e330e6f8534a58add656596d7445457cf101ab..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/iso-patches/ubiquity-keep-installed.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/preseed/ubuntu.seed 2013-02-13 23:21:04.000000000 +0100
-+++ b/preseed/ubuntu.seed 2013-04-07 14:11:15.429958827 +0200
-@@ -6,5 +6,5 @@
- # application packages pulled in by language packs. Given that we clearly
- # have the space to include them on the DVD, they're useful and we might as
- # well keep them installed.
--ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org
-+ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org gparted kpartx kpartx-boot libgtkmm apt-clone cryptsetup dpkg-repack gir1.2-json-1.0 gir1.2-xkl-1.0 gir1.2-timezonemap-1.0 keyutils libnss3-1d python-pyicu realpath
- d-i base-installer/kernel/altmeta string lts-quantal
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/clean_desktop_manifest b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/clean_desktop_manifest
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/clean_desktop_manifest
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/clean_desktop_manifest
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_common b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_common
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_common
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_common
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_initrd
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_iso b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_iso
similarity index 54%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_iso
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_iso
index c440fe05f4de5cb519efe9a9ec39a3b3072644c7..4565c03a90c58a4a04dd0fc1422a6108206ef826 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_iso
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_iso
@@ -3,6 +3,7 @@ SCRIPT_DIR=`dirname "$0"`
REMASTER_HOME=${1:-~/tmp}
ISO_REMASTER_DIR="$REMASTER_HOME/remaster-iso"
REMASTER_DIR="$REMASTER_HOME/remaster-root"
+ISO_DESCRIPTION_PREFIX_FILE="$SCRIPT_DIR/iso_description_prefix"
if [ -e "$SCRIPT_DIR/customize_common" ]; then
source "$SCRIPT_DIR/customize_common"
@@ -15,6 +16,22 @@ function create_md5sums()
popd
}
+function write_iso_description()
+{
+ ISO_ARCH="32Bit"
+ if [ "$(uname -m)" == "x86_64" ]; then
+ ISO_ARCH="64Bit"
+ fi
+
+ ISO_PREFIX="LIP ISO"
+ if [ -e "$ISO_DESCRIPTION_PREFIX_FILE" ]; then
+ ISO_PREFIX="$(cat $ISO_DESCRIPTION_PREFIX_FILE)"
+ fi
+
+ echo "$ISO_PREFIX $ISO_ARCH" > "$SCRIPT_DIR/iso_description"
+}
+
#create_md5sums
+write_iso_description
patch_all "$SCRIPT_DIR/iso-patches/" "$ISO_REMASTER_DIR/"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/debs/lipstuff_0.1-0ubuntu1_all.deb b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/debs/lipstuff_0.1-0ubuntu1_all.deb
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/debs/lipstuff_0.1-0ubuntu1_all.deb
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/debs/lipstuff_0.1-0ubuntu1_all.deb
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/hybrid b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/hybrid
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/hybrid
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/hybrid
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/01unionstack.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/01unionstack.patch
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/01unionstack.patch
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/01unionstack.patch
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/02overlayed-rofs.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/02overlayed-rofs.patch
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/02overlayed-rofs.patch
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/02overlayed-rofs.patch
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/24liphook b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/24liphook
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/24liphook
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/24liphook
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/ORDER b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/ORDER
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso-patches/ubiquity-keep-installed.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/iso-patches/ubiquity-keep-installed.patch
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso-patches/ubiquity-keep-installed.patch
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/iso-patches/ubiquity-keep-installed.patch
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/iso_description_prefix b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/iso_description_prefix
new file mode 100644
index 0000000000000000000000000000000000000000..7ed434399e28097993eafa3a3d93f5bd5ad0f8a7
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/iso_description_prefix
@@ -0,0 +1 @@
+LIP SS14
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_initrd_extraction b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_initrd_extraction
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_initrd_extraction
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_initrd_extraction
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_iso_cache b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_iso_cache
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_iso_cache
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_iso_cache
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_iso_extraction b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_iso_extraction
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_iso_extraction
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_iso_extraction
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_root_home b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_root_home
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_root_home
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_root_home
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_rootfs_cache b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_rootfs_cache
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_rootfs_cache
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_rootfs_cache
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_rootfs_extraction b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_rootfs_extraction
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/keep_rootfs_extraction
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/keep_rootfs_extraction
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/language_packs b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/language_packs
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/language_packs
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/language_packs
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/lip_sources.list b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/lip_sources.list
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/lip_sources.list
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/lip_sources.list
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/livecd_locale b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/livecd_locale
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/livecd_locale
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/livecd_locale
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/livecd_locales b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/livecd_locales
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/livecd_locales
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/livecd_locales
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/26mopsmops b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/nmtelekinese/26mopsmops
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/26mopsmops
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/nmtelekinese/26mopsmops
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/nmtelekinese.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/nmtelekinese/nmtelekinese.desktop
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/nmtelekinese.desktop
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/nmtelekinese/nmtelekinese.desktop
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/nmtelekinese.py b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/nmtelekinese/nmtelekinese.py
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/nmtelekinese.py
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/nmtelekinese/nmtelekinese.py
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/no-bootloader-icon/25adduser b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/25adduser
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/no-bootloader-icon/25adduser
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/25adduser
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/remove_win32_files b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/remove_win32_files
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/remove_win32_files
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/remove_win32_files
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/rootfs-patches/default-wallpaper.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/rootfs-patches/default-wallpaper.patch
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/rootfs-patches/default-wallpaper.patch
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/rootfs-patches/default-wallpaper.patch
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/rootfs-patches/ubiquity-apt-clone-fix.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/rootfs-patches/ubiquity-apt-clone-fix.patch
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip-testing/rootfs-patches/ubiquity-apt-clone-fix.patch
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/rootfs-patches/ubiquity-apt-clone-fix.patch
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/run_manual_customizations b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/run_manual_customizations
similarity index 100%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/run_manual_customizations
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/run_manual_customizations
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
deleted file mode 100755
index ebb1e1bc15163b81c6003170e64e8aa93d34193d..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-#is this true for all uck versions??
-SCRIPT_DIR=`dirname "$0"`
-
-#source common functions (e.g. patch_all)
-if [ -e "$SCRIPT_DIR/customize_common" ]; then
- source "$SCRIPT_DIR/customize_common"
-fi
-
-function prepare_install()
-{
- if [ -e "$SCRIPT_DIR/lip_sources.list" ]; then
- cp -v "$SCRIPT_DIR/lip_sources.list" "/etc/apt/sources.list"
- fi
-
- #moved to liprepoctl.sh
- #echo "# offline repository of the linux install party
-#deb [ trusted=yes ] file:/cdrom/archives precise lip" > /etc/apt/sources.list.d/lipoffline.list
-
- add-apt-repository -y ppa:texlive-backports/ppa
-
- apt-get update
-}
-
-function install_packages()
-{
- apt-get upgrade --assume-yes --force-yes
- apt-get install aptitude -y
-
- aptitude full-upgrade -y # make sure we have the newest versions
- # Some daily images do not have a kernel ?!?
- aptitude reinstall linux-image-generic-lts-raring -y
- apt-cache depends linux-image-generic-lts-raring | tail -n+2 | awk '{print $NF}' | xargs aptitude reinstall -y
-
- aptitude install automake cmake aspell-de build-essential ffmpeg htop hunspell lvm2 mencoder screen tofrodos efibootmgr gdisk linux-headers vlc moreutils network-manager-vpnc-gnome vim -y # install general packages
- aptitude install --without-recommends mdadm -y # install mdadm without mailserver
- aptitude install cm-super context feynmf fragmaster info latex-beamer latex-xcolor latexmk pgf psutils t1utils texinfo texlive-base texlive-bibtex-extra texlive-binaries texlive-common texlive-doc-base texlive-doc-de texlive-doc-en texlive-extra-utils texlive-font-utils texlive-fonts-extra texlive-fonts-extra-doc texlive-fonts-recommended texlive-fonts-recommended-doc texlive-formats-extra texlive-games texlive-generic-extra texlive-humanities texlive-humanities-doc texlive-lang-german texlive-latex-base texlive-latex-base-doc texlive-latex-extra texlive-latex-extra-doc texlive-latex-recommended texlive-latex-recommended-doc texlive-latex3 texlive-luatex texlive-math-extra texlive-metapost texlive-metapost-doc texlive-music texlive-omega texlive-pictures texlive-pictures-doc texlive-plain-extra texlive-pstricks texlive-pstricks-doc texlive-publishers texlive-publishers-doc texlive-science texlive-science-doc texlive-xetex -y # install stripped version of texlive without all kinds of documentation in foreign languages
-
- aptitude install hunspell-de-de language-pack-de language-pack-support-de wngerman wogerman wswiss poppler-data libreoffice-l10n-de libreoffice-help-de hyphen-de mythes-de thunderbird-locale-de firefox-locale-de -y # install german language support
-
- MISSING_LANG_PKG="$(check-language-support -l de_DE)"
- MISSING_LANG_PKG="$(check-language-support -l en_US) $MISSING_LANG_PKG" # check for missing packages for de_DE and en_US
-
- if [ -n "$MISSING_LANG_PKG" ]; then
- aptitude install $MISSING_LANG_PKG -y
- fi
-
- EXTRA_LANG_PKG="$(dpkg-query --show | cut -f1 | grep -E '^(language-pack|language-support|firefox-locale|thunderbird-locale|libreoffice-help|libreoffice-l10n)' | grep -Ev "[-](de|en)\>")" # remove extra language packages
-
- if [ -n "$EXTRA_LANG_PKG" ]; then
- aptitude purge $EXTRA_LANG_PKG -y
- fi
-
- install_debs "$SCRIPT_DIR/debs/"
-}
-
-function finalize()
-{
- echo -n "Europe/Berlin" > /etc/timezone
-
- rm -rf /var/crash/*
-}
-
-prepare_install
-install_packages
-
-#moved to initrd
-#cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop" /usr/share/applications/
-
-#patch rootfs
-patch_all "$SCRIPT_DIR/rootfs-patches/" "/"
-
-#i.e. required for applying default-wallpaper patch
-echo "compiling glib2 schemas..."
-glib-compile-schemas /usr/share/glib-2.0/schemas
-
-finalize
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso_description b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso_description
deleted file mode 100644
index 705e7f7546e07e5a3b7e4866696fca2b8ebed633..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso_description
+++ /dev/null
@@ -1 +0,0 @@
-LIP WS1314 32bit
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/lip_sources.list b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/lip_sources.list
deleted file mode 100644
index c85e9921570ef850653b34e3cf04377287998940..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/lip_sources.list
+++ /dev/null
@@ -1,54 +0,0 @@
-# deb cdrom:[Ubuntu 12.04 LTS _Precise Pangolin_ - Release i386 (20120423)]/ precise main restricted
-
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise main restricted
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates main restricted
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates main restricted
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise universe
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise universe
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates universe
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates universe
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise multiverse
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise multiverse
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates multiverse
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security main restricted
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security main restricted
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security universe
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security universe
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security multiverse
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security multiverse
-
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu precise partner
-# deb-src http://archive.canonical.com/ubuntu precise partner
-
-## This software is not part of Ubuntu, but is offered by third-party
-## developers who want to ship their latest software.
-deb http://extras.ubuntu.com/ubuntu precise main
-deb-src http://extras.ubuntu.com/ubuntu precise main
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/ORDER b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/ORDER
deleted file mode 100644
index d58e948145edfcb1801400ab52388ebb3024c915..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/ORDER
+++ /dev/null
@@ -1,78 +0,0 @@
-/scripts/casper-bottom/01integrity_check
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/05mountpoints
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/05mountpoints_lupin
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/07remove_oem_config
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/10custom_installation
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/10ntfs_3g
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/12fstab
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/13swap
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/14locales
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/15autologin
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/18hostname
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/19keyboard
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/20xconfig
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22gnome_panel_data
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22screensaver
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22serialtty
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22sslcert
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/23etc_modules
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/23networking
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/24preseed
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/25adduser
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/25configure_init
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/26disable_user_menu
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/26mopsmops
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/30accessibility
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/31disable_update_notifier
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/32disable_hibernation
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/33enable_apport_crashes
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/34disable_kde_services
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/35fix_language_selector
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/36disable_trackerd
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/40install_driver_updates
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/41apt_cdrom
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/43disable_updateinitramfs
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/44pk_allow_ubuntu
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/45jackd2
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/48kubuntu_disable_restart_notifications
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/49kubuntu_mobile_session
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/50ubiquity-bluetooth-agent
-[ -e /conf/param.conf ] && . /conf/param.conf
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/rootfs-patches/ubiquity-apt-clone-fix.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/rootfs-patches/ubiquity-apt-clone-fix.patch
deleted file mode 100644
index 94c0ff23562b679913335764a1ea6ffcc53b98ab..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/rootfs-patches/ubiquity-apt-clone-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/partman/finish.d/01apt_clone_save 2013-01-12 03:31:22.000000000 +0000
-+++ b/lib/partman/finish.d/01apt_clone_save 2013-04-06 16:23:16.103678237 +0000
-@@ -39,6 +39,9 @@
- close_dialog
- done
-
-+#lip patch to prevent the apt-clone save call
-+root=""
-+
- if [ -z "$root" ]; then
- # The partition is going to be formatted; there's nothing to preserve.
- exit 0
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/clean_desktop_manifest b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/clean_desktop_manifest
deleted file mode 100644
index 7cfab5b05d620d8c6f386273d5d507975cef115f..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/clean_desktop_manifest
+++ /dev/null
@@ -1 +0,0 @@
-yes
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_common b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_common
deleted file mode 100755
index 9e7bd586d0a60294dbf929a957cbbf2478117120..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_common
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-function patch_all()
-{
- PATCH_DIR="$1"
- TARGET_DIR="$2"
-
- if [ ! -d "$PATCH_DIR" ]; then
- echo "Nothing to patch here!"
- return 0
- fi
-
- if [ -z "$TARGET_DIR" ]; then
- echo "No target directory given, assuming /"
- TARGET_DIR="/"
- fi
-
- echo "Patching $TARGET_DIR ..."
- for p in "$PATCH_DIR/"*
- do
- cat "$p" | patch -d "$TARGET_DIR" -p1
- done
- echo "done."
-}
-
-function install_debs()
-{
- DEB_DIR="$1"
-
- if [ ! -d "$DEB_DIR" ]; then
- echo "Nothing to install here!"
- return 0
- fi
-
- for p in "$DEB_DIR/"*
- do
- echo "installing $p..."
- dpkg -i "$p"
- echo "done."
- done
-}
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_initrd
deleted file mode 100755
index 31b754e14940f8711a45cfc8172c0dee2caad4ed..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_initrd
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-###################################################################################
-# UCK - Ubuntu Customization Kit #
-# Copyright (C) 2006-2010 UCK Team #
-# #
-# UCK is free software: you can redistribute it and/or modify #
-# it under the terms of the GNU General Public License as published by #
-# the Free Software Foundation, either version 3 of the License, or #
-# (at your option) any later version. #
-# #
-# UCK is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU General Public License for more details. #
-# #
-# You should have received a copy of the GNU General Public License #
-# along with UCK. If not, see <http://www.gnu.org/licenses/>. #
-###################################################################################
-
-REMASTER_HOME=$1
-REMASTER_DIR="$REMASTER_HOME/remaster-root"
-INITRD_REMASTER_DIR="$REMASTER_HOME/remaster-initrd"
-
-echo "Using REMASTER_DIR=$REMASTER_DIR, INITRD_REMASTER_DIR=$INITRD_REMASTER_DIR"
-
-IRD="$INITRD_REMASTER_DIR"
-SCRIPT_DIR="`dirname $0`"
-
-if [ -e "$SCRIPT_DIR/customize_common" ]; then
- source "$SCRIPT_DIR/customize_common"
-fi
-
-function install_nmtelekinese()
-{
- mkdir -p "$IRD/lip/nm"
- cp "$SCRIPT_DIR/nmtelekinese/nmtelekinese.desktop" "$IRD/lip/nm"
- cp "$SCRIPT_DIR/nmtelekinese/nmtelekinese.py" "$IRD/lip/nm"
- cp "$SCRIPT_DIR/nmtelekinese/26mopsmops" "$IRD/scripts/casper-bottom/"
- chmod +x "$IRD/scripts/casper-bottom/26mopsmops"
-}
-
-function add_no_bootloader_icon()
-{
- mkdir -p "$IRD/lip/no-bootloader-icon"
- cp "$SCRIPT_DIR/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop" "$IRD/lip/no-bootloader-icon/"
-
- cp "$SCRIPT_DIR/no-bootloader-icon/25adduser" "$IRD/scripts/casper-bottom/"
- chmod +x "$IRD/scripts/casper-bottom/25adduser"
-}
-
-mkdir -p "$IRD/lip"
-install_nmtelekinese
-add_no_bootloader_icon
-
-#copy custom lip hook
-cp "$SCRIPT_DIR/initrd_hook/24liphook" "$IRD/scripts/casper-bottom/"
-chmod +x "$IRD/scripts/casper-bottom/24liphook"
-cp "$SCRIPT_DIR/initrd_hook/ORDER" "$IRD/scripts/casper-bottom/"
-
-patch_all "$SCRIPT_DIR/initrd-patches/" "$IRD"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_iso b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_iso
deleted file mode 100755
index c440fe05f4de5cb519efe9a9ec39a3b3072644c7..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_iso
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=`dirname "$0"`
-REMASTER_HOME=${1:-~/tmp}
-ISO_REMASTER_DIR="$REMASTER_HOME/remaster-iso"
-REMASTER_DIR="$REMASTER_HOME/remaster-root"
-
-if [ -e "$SCRIPT_DIR/customize_common" ]; then
- source "$SCRIPT_DIR/customize_common"
-fi
-
-function create_md5sums()
-{
- pushd "$REMASTER_DIR"
- find . -type f -print0 | sort -z | xargs -0 md5sum > "$REMASTER_HOME/rootfs.md5"
- popd
-}
-
-#create_md5sums
-
-patch_all "$SCRIPT_DIR/iso-patches/" "$ISO_REMASTER_DIR/"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/debs/lipstuff_0.1-0ubuntu1_all.deb b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/debs/lipstuff_0.1-0ubuntu1_all.deb
deleted file mode 100644
index f498bbff565b8efd628ad10f730fa4e91c853d0f..0000000000000000000000000000000000000000
Binary files a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/debs/lipstuff_0.1-0ubuntu1_all.deb and /dev/null differ
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/hybrid b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/hybrid
deleted file mode 100644
index 7cfab5b05d620d8c6f386273d5d507975cef115f..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/hybrid
+++ /dev/null
@@ -1 +0,0 @@
-yes
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/01unionstack.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/01unionstack.patch
deleted file mode 100644
index 2a3117892a9f9c10300fcb5e1f6b5621cc04df36..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/01unionstack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/scripts/casper.org 2013-04-03 10:09:07.000000000 +0200
-+++ b/scripts/casper 2013-04-03 00:51:26.000000000 +0200
-@@ -43,6 +43,8 @@
- export PERSISTENT_PATH="${x#persistent-path=}" ;;
- union=*)
- export UNIONFS="${x#union=}";;
-+ unionstack=*)
-+ export UNIONSTACK="${x#unionstack=}";;
- ip=*)
- STATICIP=${x#ip=}
- if [ "${STATICIP}" = "" ]; then
-@@ -407,6 +409,12 @@
- for image_type in "ext2" "squashfs" "dir" ; do
- for image in "${image_directory}"/*."${image_type}"; do
- imagename=$(basename "${image}")
-+ if [ -n "$UNIONSTACK" ]; then
-+ if [ "$(echo $UNIONSTACK | sed "s/$imagename//";)" == "$UNIONSTACK" ]; then
-+ log_warning_msg "Filesystem image $imagename not in UNIONSTACK. Ignored."
-+ continue
-+ fi
-+ fi
- if [ -d "${image}" ]; then
- # it is a plain directory: do nothing
- rofsstring="${image}=${roopt}:${rofsstring}"
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/02overlayed-rofs.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/02overlayed-rofs.patch
deleted file mode 100644
index 08190d24422951d7a566651f2c14203b2b2e9503..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/02overlayed-rofs.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/scripts/casper 2013-04-04 19:09:09.349995163 +0200
-+++ b/scripts/casper 2013-04-04 16:25:34.000000000 +0200
-@@ -450,6 +450,10 @@
- fi
-
- mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || panic "Can not mount $cowdevice on /cow"
-+
-+ overlay_mount_dir=/overlay
-+ mkdir -p "$overlay_mount_dir"
-+
-
- case ${UNIONFS} in
- unionfs-fuse)
-@@ -463,8 +463,10 @@
- overlayfs)
- # Mount the layers pairwise from the bottom onto rootmnt,
- # for the second and later layers rootmnt forms the lower layer.
-+
-+ #overlay all readonly file systems first
- mounts=""
-- for mount in /cow $rofslist
-+ for mount in $rofslist
- do
- mounts="$mount $mounts"
- done
-@@ -476,9 +482,12 @@
- continue
- fi
- mount -t overlayfs -o "upperdir=$mount,lowerdir=$lower" \
-- "$mount" "$rootmnt"
-- lower="$rootmnt"
-+ "$mount" "$overlay_mount_dir"
-+ lower="$overlay_mount_dir"
- done
-+
-+ mount -t overlayfs -o "upperdir=/cow,lowerdir=$lower" \
-+ "$mount" "$rootmnt"
- ;;
- esac
-
-@@ -519,15 +528,17 @@
- fi
-
- # move the first mount; no head in busybox-initramfs
-- for d in $(mount -t squashfs | cut -d\ -f 3); do
-- mkdir -p "${rootmnt}/rofs"
-- if [ "${UNIONFS}" = unionfs-fuse ]; then
-- mount -o bind "${d}" "${rootmnt}/rofs"
-- else
-- mount -o move "${d}" "${rootmnt}/rofs"
-- fi
-- break
-- done
-+ #for d in $(mount -t squashfs | cut -d\ -f 3); do
-+ # mkdir -p "${rootmnt}/rofs"
-+ # if [ "${UNIONFS}" = unionfs-fuse ]; then
-+ # mount -o bind "${d}" "${rootmnt}/rofs"
-+ # else
-+ # mount -o move "${d}" "${rootmnt}/rofs"
-+ # fi
-+ # break
-+ #done
-+ mkdir -p "${rootmnt}/rofs"
-+ mount -o move "$lower" "${rootmnt}/rofs"
- }
-
- check_dev ()
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/24liphook b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/24liphook
deleted file mode 100755
index 35a7f5ba96b372c70f2c30f9bdf9d213d90820ce..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/24liphook
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="lip specific stuff"
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-load_confmodule
-
-log_begin_msg "$DESCRIPTION"
-
-#copy desktop file for the no-bootloader-icon (required in 25adduser)
-cp /lip/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop /root/usr/share/applications/
-
-#TODO: install ubiquity here?
-
-log_end_msg
-
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/ORDER b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/ORDER
deleted file mode 100644
index 689624a64f8de2dc067f1dd3e7a2f0661610cd99..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/ORDER
+++ /dev/null
@@ -1,80 +0,0 @@
-/scripts/casper-bottom/01integrity_check
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/05mountpoints
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/05mountpoints_lupin
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/07remove_oem_config
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/10custom_installation
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/10ntfs_3g
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/12fstab
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/13swap
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/14locales
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/15autologin
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/18hostname
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/19keyboard
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/20xconfig
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22gnome_panel_data
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22screensaver
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22serialtty
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/22sslcert
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/23etc_modules
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/23networking
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/24preseed
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/24liphook
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/25adduser
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/25configure_init
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/26disable_user_menu
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/26mopsmops
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/30accessibility
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/31disable_update_notifier
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/32disable_hibernation
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/33enable_apport_crashes
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/34disable_kde_services
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/35fix_language_selector
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/36disable_trackerd
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/40install_driver_updates
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/41apt_cdrom
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/43disable_updateinitramfs
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/44pk_allow_ubuntu
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/45jackd2
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/48kubuntu_disable_restart_notifications
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/49kubuntu_mobile_session
-[ -e /conf/param.conf ] && . /conf/param.conf
-/scripts/casper-bottom/50ubiquity-bluetooth-agent
-[ -e /conf/param.conf ] && . /conf/param.conf
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso-patches/ubiquity-keep-installed.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso-patches/ubiquity-keep-installed.patch
deleted file mode 100644
index 0b2048ba5ea0a350c414907709685998cf596974..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso-patches/ubiquity-keep-installed.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/preseed/ubuntu.seed 2013-02-13 23:21:04.000000000 +0100
-+++ b/preseed/ubuntu.seed 2013-04-07 14:11:15.429958827 +0200
-@@ -6,5 +6,5 @@
- # application packages pulled in by language packs. Given that we clearly
- # have the space to include them on the DVD, they're useful and we might as
- # well keep them installed.
--ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org
-+ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org gparted kpartx kpartx-boot libgtkmm apt-clone cryptsetup dpkg-repack gir1.2-json-1.0 gir1.2-xkl-1.0 gir1.2-timezonemap-1.0 keyutils libnss3-1d python-pyicu realpath
- d-i base-installer/kernel/altmeta string lts-raring
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso_description b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso_description
deleted file mode 100644
index a2914a3f5b75f262cc9d5aba4f0f5308ca37a59e..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso_description
+++ /dev/null
@@ -1 +0,0 @@
-LIP WS1314 64bit
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_initrd_extraction b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_initrd_extraction
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_iso_cache b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_iso_cache
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_iso_extraction b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_iso_extraction
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_root_home b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_root_home
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_rootfs_cache b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_rootfs_cache
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_rootfs_extraction b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/keep_rootfs_extraction
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/language_packs b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/language_packs
deleted file mode 100644
index 996888bcd6d56f1a032f598d7ed3916d347f4fa5..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/language_packs
+++ /dev/null
@@ -1,2 +0,0 @@
-de
-en
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list
deleted file mode 100644
index c85e9921570ef850653b34e3cf04377287998940..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list
+++ /dev/null
@@ -1,54 +0,0 @@
-# deb cdrom:[Ubuntu 12.04 LTS _Precise Pangolin_ - Release i386 (20120423)]/ precise main restricted
-
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise main restricted
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates main restricted
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates main restricted
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise universe
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise universe
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates universe
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates universe
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise multiverse
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise multiverse
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates multiverse
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-updates multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security main restricted
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security main restricted
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security universe
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security universe
-deb http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security multiverse
-deb-src http://ftp.halifax.rwth-aachen.de/ubuntu/ precise-security multiverse
-
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu precise partner
-# deb-src http://archive.canonical.com/ubuntu precise partner
-
-## This software is not part of Ubuntu, but is offered by third-party
-## developers who want to ship their latest software.
-deb http://extras.ubuntu.com/ubuntu precise main
-deb-src http://extras.ubuntu.com/ubuntu precise main
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locale b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locale
deleted file mode 100644
index c574d073d1e394c90481ad201a5aad6a153c28e2..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locale
+++ /dev/null
@@ -1 +0,0 @@
-en
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locales b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locales
deleted file mode 100644
index 996888bcd6d56f1a032f598d7ed3916d347f4fa5..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/livecd_locales
+++ /dev/null
@@ -1,2 +0,0 @@
-de
-en
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops
deleted file mode 100755
index c1c047d116741b66ba524d8ae30b0e9c0dff6b83..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Enforcing MoPS disconnect"
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-load_confmodule
-
-log_begin_msg "$DESCRIPTION"
-
-# Starting nmtelekinese with the MoPS network
-cp /lip/nm/nmtelekinese.py /root/usr/bin/
-chroot /root mkdir -m 755 -p /home/${USERNAME}/.config/autostart
-cp /lip/nm/nmtelekinese.desktop /root/home/${USERNAME}/.config/autostart
-chroot /root chmod 755 /home/${USERNAME}/.config/autostart/nmtelekinese.desktop
-chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.config
-
-# Denying all connections to redirector.wlan.rwth-aachen.de
-mount -t proc none /root/proc
-chroot /root modprobe ip_tables
-chroot /root modprobe iptable_filter
-chroot /root modprobe ipt_REJECT
-chroot /root iptables -I OUTPUT 1 -d 137.226.8.34 -j REJECT --reject-with icmp-host-prohibited
-chroot /root iptables -I OUTPUT 1 -d 137.226.8.34 -p tcp -j REJECT --reject-with tcp-rst
-umount /root/proc
-
-log_end_msg
-
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/nmtelekinese.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/nmtelekinese.desktop
deleted file mode 100644
index 3f90e6fc778b25cd0a319f812927aeca5b9ee627..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/nmtelekinese.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-
-[Desktop Entry]
-Type=Application
-Exec=/usr/bin/python /usr/bin/nmtelekinese.py 134.61.32.0/21
-Hidden=false
-NoDisplay=false
-X-GNOME-Autostart-enabled=true
-Name[de_DE]=NM Telekinese
-Name=NM Telekinese
-Comment[de_DE]=Verdindert das Verbinden zu gefärlichen Netzwerken
-Comment=Verdindert das Verbinden zu gefärlichen Netzwerken
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/nmtelekinese.py b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/nmtelekinese.py
deleted file mode 100755
index acf413c53f7af75a78a625375feda3bfba195347..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/nmtelekinese.py
+++ /dev/null
@@ -1,436 +0,0 @@
-#! /usr/bin/python
-# -*- coding: UTF-8 -*-
-"""
-Network Manager Telekinesis - Interdicts connections to unwanted networks
-
-This program controls NetworkManager via DBUS
-in order to prevent it from connecting to certain networks.
-
-(Copyleft) 2012 Mmoebius/ALUG
-License: GPLv3 http://www.gnu.org/licenses/gpl.html
-
-Version 1.0a - Fragt nicht nach dem Abschalten des Mops-Netz-Killers
-"""
-
-###
-### Configuration
-###
-#now: Cmdline Parameter
-#IPv4unwanted = [
-# '134.61.32.0/21' # MoPS range
-#]
-IPv4unwantedRng=[]
-DoDisableUnwanted=True # set to false to stop turning off the network
-
-###
-### /Configuration
-###
-
-SessionBusListener=None # gets set if waiting for the user to dismiss the action
-
-from pprint import pformat,pprint
-import logging
-logger = logging.getLogger(__name__)
-logging.basicConfig(level=logging.INFO)
-
-import dbus, sys
-from time import sleep
-
-# Need a Mainloop for signals
-from dbus.mainloop.glib import DBusGMainLoop
-import gobject
-DBusGMainLoop(set_as_default=True)
-
-# Need struct for network byte order handling
-from struct import pack,unpack
-
-#Parse comdline options
-import argparse
-
-parser = argparse.ArgumentParser(description='Control NetworkManager to stay off some networks')
-parser.add_argument('ipranges', metavar='IPv4range', type=str, nargs='+',
- help='IPv4 range/mask to disconnect automatically. e.g. "10.11.12.0/24"')
-parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
- help='Set debug level to DEBUG (default INFO)')
-
-parser.description="""Network Manager Telekinesis - Interdicts connections to unwanted networks"""
-parser.epilog="""(Copyleft) 2012 Mmoebius/ALUG
-License: GPLv3 http://www.gnu.org/licenses/gpl.html"""
-
-args = parser.parse_args()
-
-if args.verbose:
- logger.level=logging.DEBUG
- logger.debug('Verbose debug messages')
-
-IPv4unwanted=args.ipranges
-
-NMdevtype = { 1: "Ethernet",
- 2: "Wi-Fi",
- 5: "Bluetooth",
- 6: "OLPC",
- 7: "WiMAX",
- 8: "Modem",
- 9: "InfiniBand",
- 10: "Bond",
- 11: "VLAN",
- 12: "ADSL" }
-
-NMstate = { 0: "Unknown",
- 10: "Unmanaged",
- 20: "Unavailable",
- 30: "Disconnected",
- 40: "Prepare",
- 50: "Config",
- 60: "Need Auth",
- 70: "IP Config",
- 80: "IP Check",
- 90: "Secondaries",
- 100: "Activated",
- 110: "Deactivating",
- 120: "Failed" }
-
-bus = dbus.SystemBus()
-
-# Get a proxy for the base NetworkManager object
-proxy = bus.get_object("org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager")
-manager = dbus.Interface(proxy, "org.freedesktop.NetworkManager")
-
-def handle_Carrier(sender=None,**kwargs):
- logger.debug("handle_Carrier from %s with %s",sender,pformat(kwargs))
-
-def handle_PropertiesChanged(sender=None,**kwargs):
- logger.debug("handle_PropertiesChanged from %s with %s",sender,pformat(kwargs))
-
-def getProp(oPath,propIface,propName):
- """Gets a 'org.freedesktop.DBus.Properties' from any interface on any object path 'org.freedesktop.NetworkManager' serves """
- proxy = bus.get_object("org.freedesktop.NetworkManager", oPath)
- proxy_if = dbus.Interface(proxy, "org.freedesktop.DBus.Properties")
- props = proxy_if.Get(propIface, propName)
- return props
-
-def getAllProps(oPath,propIface):
- """Gets all 'org.freedesktop.DBus.Properties' from any interface on any object path 'org.freedesktop.NetworkManager' serves """
- proxy = bus.get_object("org.freedesktop.NetworkManager", oPath)
- proxy_if = dbus.Interface(proxy, "org.freedesktop.DBus.Properties")
- props = proxy_if.GetAll(propIface)
- return props
-
-#IP Address format conversions:
-def IpDbus2Tuple(IpDbus):
- return unpack('>BBBB',pack('>L',IpDbus)) #dbus order to tuple
-
-def IpDbus2Int(IpDbus):
- return unpack('=L',pack('>L',IpDbus))[0] #dbus order to and'able int
-
-def IpInt2Tuple(IpInt):
- return unpack('>BBBB',pack('=L',IpInt))
-
-def IpStr2Tuple(IpStr):
- return map(int,IpStr.split('.',3))
-
-def IpTuple2String(IpTuple):
- return ".".join(map(str,IpTuple[::-1]))
-
-def IpTuple2Int(IpTuple):
- ipa=0
- for i in [0,1,2,3]:
- ipa+=int(IpTuple[i])<<(24-8*i)
- return ipa
-
-def IpMaskStr2StrA(IpMaskStr):
- return IpMaskStr.rsplit('/',1)
-
-def IpStr2Tuple(IpStr):
- tupl=map(int,IpStr.split('.',3))
- for i in tupl:
- if (0>i) or (255<i):
- raise ValueError("Ip address quad not in range 0..255: %d"%i)
- return tupl
-
-def IpGetMasked(adr,mask):
- # mask two IP addresses in 'int' - style. All host-specific bits cleared
- return adr&(2**32-2**(32-mask)) #cutting at the right end
-
-def IpGetAntiMasked(adr,mask):
- # return all nonmasked bits set '1'. All host-specific bits set
- return adr|(2**(32-mask)-1) #cutting at the right end
-
-def handle_NotifyUserAction(replaces_id,ActionStrA):
- global SessionBusListener
- global DoDisableUnwanted
- logger.debug('handle_NotifyUserAction: got %s %s',str(replaces_id),str(ActionStrA))
- if 'Mops-off-wantMops' in ActionStrA:
- DoDisableUnwanted=False
- logger.warn('User stops disabling networks.')
-
-def NotifyUser():
- global SessionBusListener
- global DoDisableUnwanted
- sbus = dbus.SessionBus()
- oNotifier = sbus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications")
- iNotifier=dbus.Interface(oNotifier, "org.freedesktop.Notifications")
-
-
- if SessionBusListener is None:
- SessionBusListener = sbus.add_signal_receiver(handle_NotifyUserAction, signal_name="ActionInvoked",
- dbus_interface="org.freedesktop.Notifications" )
- logger.debug('Added Dbus listener for session bus: %s',str(SessionBusListener))
-
- NotifyOptionsArray=[]
-# Uncomment these 4 Lines if you want to be able to turn off disconnecting MoPS Networks
-# if DoDisableUnwanted:
-# NotifyOptionsArray=[
-# 'Mops-off-Ok', 'Ok',
-# 'Mops-off-wantMops','MoPS nicht mehr trennen'
-# ]
-
- sleep(3) # Wait until nm-dispatcher sends it smessage, do not overflood the NotifyOS, try not to get buried.
-
- iNotifier.Notify(
- "nmtelekinesis", # Applicateion Identifier
- 0, # replaces_id (hardcoded)
- # Note: if replaces_id is 0, the return value is a UINT32 that represent the notification.
- "network-error", # "notification-network-disconnected",
- "Forced MoPS disconnect",
- u"""Das MoPS Netzwerk ist während der Installation
-unerwuenscht. Es wurde automatisch getrennt.
-
-Bitte aktiviere das Eduroam-Netzwerk gemäß
-Anleitung mit 802.1X Authentifikation.
-
-Frage ein Installhelferhörnchen,
-falls Du dabei Hilfe brauchst.""",
- NotifyOptionsArray,
- {}, #Application specific hint parameter
- 30000 # OSD Notifier will not take long times
- )
-
-def WarnUser():
- sbus = dbus.SessionBus()
- oNotifier = sbus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications")
- iNotifier=dbus.Interface(oNotifier, "org.freedesktop.Notifications")
- sleep(3)
- iNotifier.Notify(
- "nmtelekinesis", # Applicateion Identifier
- 0, # replaces_id (hardcoded)
- # Note: if replaces_id is 0, the return value is a UINT32 that represent the notification.
- "network", # "notification-network-disconnected",
- "MoPS discovered",
- u"""Das MoPS Netzwerk ist während der Installation
-unerwuenscht. Du bist gewarnt.
-
-Bitte aktiviere das Eduroam-Netzwerk gemäß
-Anleitung mit 802.1X Authentifikation.
-
-Frage ein Installhelferhörnchen,
-falls Du dabei Hilfe brauchst.""",
- [],
- {}, #Application specific hint parameter
- 30000 # OSD Notifier will not take long times
- )
-
-def DisableAutoConnect(oConn):
- """Disable AutoConnect for the currently active setting object in oConn"""
- try:
- Psetting=getProp(oConn,"org.freedesktop.NetworkManager.Connection.Active",'Connection')
- proxy = bus.get_object("org.freedesktop.NetworkManager", Psetting)
- proxy_if = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Settings.Connection")
- props = proxy_if.GetSettings() # read
- logger.debug('DisableAutoConnect: Got settings %s',pformat(props))
- props['connection']['autoconnect']=0 # modify
- proxy_if.Update(props) # write. Simple.
- except Exception as err:
- logger.warn('Error setting Autocconnect false for %s: (%s)',oConn,str(err))
-
-
-def DisconnectDevice(oPath, oConn):
- global DoDisableUnwanted
- if DoDisableUnwanted:
- logger.debug('Disconnecting %s',str(oPath))
- proxy = bus.get_object("org.freedesktop.NetworkManager", oPath)
- proxy_if = dbus.Interface(proxy, "org.freedesktop.NetworkManager.Device")
- # about to disconnect something.
- # See if there is a setting that can be set to "autoconnect=false" along with this
- DisableAutoConnect(oConn)
- #result = "Demo-NoDisconnect"
- result = "failed"
- result = proxy_if.Disconnect()
- logger.info('Disconnected %s result %s',str(oPath),result)
- NotifyUser()
- else:
- WarnUser()
- logger.info('Not disconnecting %s (DoDisableUnwanted is false)',str(oPath))
-
-def ScanIp4Config2(oIp4Config, oDevice, oConn):
- try:
- Pip4 = getProp(oIp4Config,"org.freedesktop.NetworkManager.IP4Config",'Addresses')
- except dbus.exceptions.DBusException:
- logger.debug("ScanIp4Config2(oDevice %s, oIp4Config %s, oConn %s): no IP4Config",oIp4Config, oDevice, oConn)
- return
-
- CanDisconnect=False
- for addr in Pip4:
- logger.debug(
- 'IP Address: %s/%d gw:%s',
- IpTuple2String(IpDbus2Tuple(addr[0])),
- addr[1],
- IpTuple2String(IpDbus2Tuple(addr[2]))
- )
- # check ip range against known unwanted range
- ipa=IpDbus2Int(addr[0])
- if (0>ipa) or (2**32<ipa):
- logger.warn('IPv4 address exceeds range: %d',ipa)
- return
-
- for (iplo,iphi) in IPv4unwantedRng:
- if (ipa>=iplo) and (ipa<=iphi):
- logger.info('Detected ip in unwanted range: %s <= %s <= %s on %s',
- IpTuple2String(IpInt2Tuple(iplo)),
- IpTuple2String(IpInt2Tuple(ipa)),
- IpTuple2String(IpInt2Tuple(iphi)),
- str(oDevice)
- )
- CanDisconnect=True
- if CanDisconnect:
- DisconnectDevice(oDevice, oConn)
- return CanDisconnect
-
-def ScanActiveDevice2(adev,aconn):
- logger.debug("Examining device: %s", str(adev))
- # IPv4Config may not be available instantly
- pDev = getAllProps(adev,"org.freedesktop.NetworkManager.Device")
- logger.debug('dev props %s',pDev)
- if pDev.has_key('Ip4Config'):
- oIPv4=pDev['Ip4Config']
- logger.debug('dev props ipv4config %s',oIPv4)
- ScanIp4Config2(oIPv4,adev,aconn)
-
-def ScanActiveConnections2(ActiveConnections):
- """Scans an array of connection objects for unwanted IP addresses"""
- for aconn in ActiveConnections:
- try:
- logger.debug("Examining connection: %s", str(aconn))
- # read props from the Active Connection
- Pconn = getProp(aconn,"org.freedesktop.NetworkManager.Connection.Active",'Devices')
- Pmaster = getProp(aconn,"org.freedesktop.NetworkManager.Connection.Active",'Master')
- if str(Pmaster) in map(str,ActiveConnections):
- logger.debug("connection: %s has a master device %s that is examined elsewhere. Stop.",
- str(aconn),
- str(Pmaster)
- )
- logger.debug("other location is %s in %s",sAconn,str(map(str,aconn)))
- Pconn=[]
- break
-
- for adev in Pconn:
- ScanActiveDevice2(adev,aconn)
-
- except Exception as err:
- logger.warn('Exception while examining connection %s: >>>%s<<<',
- str(aconn),
- str(err),
- )
-
-def handle_NmPropertiesChanged(sender=None,*args,**kwargs):
- logger.debug("handle_NmPropertiesChanged with %s and %s and %s",str(sender),str(args),str(kwargs))
- logger.debug("handle_NmPropertiesChanged keys %s",str(sender.keys()))
- # check if new connection active
- if sender.has_key('ActiveConnections'):
- conn=sender['ActiveConnections']
- logger.info("Scanning ActiveConnections: %s",str(conn))
- ScanActiveConnections2(conn)
- if sender.has_key('Ip4Config'):
- ipv4cfg=sender['Ip4Config']
- logger.info("Scanning Ip4Config: %s",str(ipv4cfg))
- ScanIp4Config2(ipv4cfg)
- if sender.has_key('State'):
- try:
- StateHint=NMstate[sender['State']]
- except KeyError:
- StateHint='<unknown>'
- logger.debug('State Change to >>>%s<<< (%s)',str(sender['State']),StateHint)
-
-def NmStateStr(iState):
- try:
- return NMstate[iState]
- except KeyError:
- return '<unknown>'
-
-def handle_NmDeviceStateChanged(sNew,sOld,sReason,**kwargs):
- logger.debug("handle_NmDeviceStateChanged with %s",str(kwargs))
- logger.debug("handle_NmDeviceStateChanged %s (%d) -> %s (%d) Reason: %d",
- NmStateStr(sOld), sOld, NmStateStr(sNew), sNew, sReason )
- if kwargs.has_key('oPath'):
- oPath=kwargs['oPath']
- if 100 == sNew:
- logger.info("Scanning Activated Device: %s",str(oPath))
- # need aconn so scan.
- oAConn=getProp(oPath,'org.freedesktop.NetworkManager.Device','ActiveConnection')
- ScanActiveDevice2(oPath,oAConn)
-
-#Device-Add is not yet required to be watch for
-#def handle_addDevice(oDev,*args):
-# logger.debug("handle_addDevice from %s with %s",str(oDev),str(args))
-
-def ParseIPv4unwantedRng(IpStrList):
- """filling IPv4unwantedRng from IPv4unwanted"""
- global IPv4unwantedRng
- for s in IpStrList:
- try:
- logger.debug('Unwanted IP: parsing >>>%s<<<',s)
- [ips,masks]=IpMaskStr2StrA(s)
- mask=int(masks)
- ip=IpTuple2Int(IpStr2Tuple(ips))
- #logger.debug('Unwanted IP %s / %d',str(ip),mask)
- if (0>mask) or (32<mask):
- raise ValueError('Mask range 0..32 error')
- if (0>ip) or (2**32<ip):
- raise ValueError('ip range 0..2^32 error')
- iplow=IpGetMasked(ip,mask)
- iphigh=IpGetAntiMasked(ip,mask)
- logger.info('Unwanted IP range %s - %s',IpTuple2String(IpInt2Tuple(iplow)),IpTuple2String(IpInt2Tuple(iphigh)))
- IPv4unwantedRng.append((iplow,iphigh))
- except ValueError as err:
- logger.warn('That is not a valid ip/mask: >>>%s<<< (%s)',str(s),err.message)
-
-logger.debug("Startup - preparing unwanted address ranges")
-ParseIPv4unwantedRng(IPv4unwanted)
-
-if len(IPv4unwantedRng)<1:
- logger.warn('No unwanted IP range given. Quit.')
- quit(1)
-
-# Adding bus signal receivers
-# See interface spec at http://projects.gnome.org/NetworkManager/developers/api/09/spec.html#org.freedesktop.NetworkManager
-# Chapter "Signal" -> defines "DeviceAdded" on the interface "org.freedesktop.NetworkManager"
-
-#Device-Add is not yet required to be watch for
-#bus.add_signal_receiver(handle_addDevice, signal_name="DeviceAdded",
-# dbus_interface="org.freedesktop.NetworkManager" )
-
-bus.add_signal_receiver(handle_NmPropertiesChanged, signal_name="PropertiesChanged",
- dbus_interface="org.freedesktop.NetworkManager" )
-
-# see path_keyword etc. in http://dbus.freedesktop.org/doc/dbus-python/api/dbus.service-module.html
-bus.add_signal_receiver(handle_NmDeviceStateChanged, signal_name="StateChanged",
- dbus_interface="org.freedesktop.NetworkManager.Device",
- path_keyword='oPath')
-
-#Device-Add is not yet required to be watch for
-## Adding all devices via the DeviceAdded callback
-#Devices=manager.GetDevices()
-#logger.debug("Startup - getting Devices: %s",str(Devices))
-#for oDev in Devices:
-# handle_addDevice(oDev)
-
-ConnAct=getProp('/org/freedesktop/NetworkManager','org.freedesktop.NetworkManager','ActiveConnections')
-logger.debug("Startup - getting active Connections: %s",str(ConnAct))
-# plug that into the active connection changed handler
-ScanActiveConnections2(ConnAct)
-
-loop = gobject.MainLoop()
-logger.debug("Entering MainLoop")
-loop.run() # To stop, call loop.quit().
-
-#end;
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/no-bootloader-icon/25adduser b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/no-bootloader-icon/25adduser
deleted file mode 100755
index 555cecffa2e79db48967f49e2681130269496827..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/no-bootloader-icon/25adduser
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/bin/sh
-
-PREREQ=""
-DESCRIPTION="Adding live session user..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-. /scripts/casper-functions
-load_confmodule
-
-log_begin_msg "$DESCRIPTION"
-
-debconf_backup () {
- local question backup
- for question; do
- backup="$question-casper-backup"
- db_register debian-installer/dummy "$backup"
- db_get "$question"
- db_set "$backup" "$RET"
- db_fget "$question" seen
- db_fset "$backup" seen "$RET"
- done
-}
-
-debconf_restore () {
- local question backup
- for question; do
- backup="$question-casper-backup"
- db_get "$backup"
- db_set "$question" "$RET"
- db_fget "$backup" seen
- db_fset "$question" seen "$RET"
- db_unregister "$backup"
- done
-}
-
-debconf_backup \
- passwd/root-password-crypted \
- passwd/root-password passwd/root-password-again \
- passwd/user-password-crypted \
- passwd/user-password passwd/user-password-again \
- passwd/user-fullname passwd/username passwd/user-uid
-
-# U6aMy0wojraho is just a blank password
-db_set passwd/root-password-crypted '*'
-db_set passwd/user-password-crypted U6aMy0wojraho
-db_set passwd/user-fullname "$USERFULLNAME"
-db_set passwd/username "$USERNAME"
-db_set passwd/user-uid 999
-
-chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
-
-# Clear out debconf database again to avoid confusing ubiquity later.
-debconf_restore \
- passwd/root-password-crypted \
- passwd/root-password passwd/root-password-again \
- passwd/user-password-crypted \
- passwd/user-password passwd/user-password-again \
- passwd/user-fullname passwd/username passwd/user-uid
-
-if [ -f /root/etc/sudoers ]; then
- echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers
-fi
-
-# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-
-LTS="$(cut -d' ' -f3 /root/cdrom/.disk/info 2>/dev/null)" || LTS=
-RELEASE="$(cut -d' ' -f1-2 /root/cdrom/.disk/info 2>/dev/null)" || RELEASE=
-if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
- RELEASE="$RELEASE LTS"
-fi
-for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/ubiquity-gtkui-no-bootloader.desktop; do
- if [ -f "/root/$file" ]; then
- sed -i "s/RELEASE/$RELEASE/" "/root$file"
- chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
- chroot /root install -D -o $USERNAME -g $USERNAME $file /home/$USERNAME/Desktop/$(basename "$file")
- fi
-done
-
-if [ -L /root/home/$USERNAME/Examples ]; then
- chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
- mv /root/home/$USERNAME/Examples /root/home/$USERNAME/Desktop/
-fi
-
-if [ -f /root/home/$USERNAME/examples.desktop ]; then
- chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
- mv /root/home/$USERNAME/examples.desktop /root/home/$USERNAME/Desktop/
-fi
-
-#Kubuntu
-if [ -f "/root/usr/bin/plasma" ]; then
- if [ -f "/root/usr/share/kde4/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop" ]; then
- chroot /root install -d -o $USERNAME -g $USERNAME /home/$USERNAME/Desktop
- chroot /root install -D -o $USERNAME -g $USERNAME /usr/share/kde4/apps/khelpcenter/plugins/kubuntu/about-kubuntu.desktop /home/$USERNAME/Desktop/about-kubuntu.desktop
- fi
-fi
-
-#Ubuntu MID wants to be installed with --automatic
-if [ -f "/root/usr/share/ubuntu-mid-default-settings/mid-gui-start" ]; then
- if [ -f "/root/usr/share/applications/ubiquity-gtkui.desktop" ]; then
- sed -i 's/--desktop/--automatic --desktop/' "/root/usr/share/applications/ubiquity-gtkui.desktop"
- fi
-fi
-
-#Ubuntu MID uses kourou, and the ubiquity icon should be easy to find
-if [ -f "/root/usr/lib/hildon-desktop/kourou.py" ]; then
- if [ -f "/root/etc/xdg/menus/home.menu" ]; then
- sed -i '/<\/Include>/i\ <Filename>ubiquity-gtkui.desktop</Filename>' "/root/etc/xdg/menus/home.menu"
- fi
-fi
-
-log_end_msg
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop
deleted file mode 100644
index 5cd4718f7f716d3b6dbdb73a5866b36aa487548e..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop
+++ /dev/null
@@ -1,130 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-# Do not translate the word "RELEASE". It is used as a marker by casper.
-Name=Install RELEASE (No bootloader)
-Name[am]=የተለቀቀውን መግጠሚያ
-Name[ar]=ثبّت RELEASE
-Name[ast]=Instalar RELEASE
-Name[be]=Усталяваць RELEASE
-Name[bg]=Инсталиране на RELEASE
-Name[bn]=RELEASE ইনস্টল করুন
-Name[bs]=Instaliraj izdanje
-Name[ca]=Instal·la la versió RELEASE
-Name[cs]=Nainstalovat RELEASE
-Name[da]=Installér RELEASE
-Name[de]=RELEASE installieren (kein Bootloader)
-Name[el]=Εγκατάσταση RELEASE
-Name[eo]=Instali RELEASE
-Name[es]=Instalar RELEASE
-Name[et]=Paigalda RELEASE
-Name[eu]=Instalatu RELEASE
-Name[fi]=Asenna RELEASE
-Name[fr]=Installer RELEASE
-Name[ga]=Suiteáil RELEASE
-Name[gl]=Instalar RELEASE
-Name[gu]=રિલીઝ નું સ્થાપન કરો.
-Name[he]=התקנת RELEASE
-Name[hi]=प्रकाशन को संस्थापित करें
-Name[hr]=Instaliraj RELEASE
-Name[hu]=RELEASE telepítése
-Name[id]=Pasang RELEASE
-Name[it]=Installa RELEASE
-Name[ja]=RELEASE のインストール
-Name[ka]=RELEASE-ის დაყენება
-Name[kk]=RELEASE орнату
-Name[km]=ដំឡើងឯកសារចេញផ្សាយ
-Name[ko]=RELEASE 설치
-Name[ku]=RELEASE saz bike
-Name[lt]=Įdiegti RELEASE į kompiuterį
-Name[lv]=Instalēt RELEASE
-Name[mk]=Инсталирај RELEASE
-Name[ml]=RELEASE സജ്ജമാക്കുക
-Name[mr]=स्थापित RELEASE
-Name[nl]=RELEASE installeren
-Name[pa]=RELEASE ਰੀਲਿਜ਼
-Name[pl]=Zainstaluj RELEASE
-Name[pt]=Instalar RELEASE
-Name[pt_BR]=Instalar o RELEASE
-Name[ro]=Instalare RELEASE
-Name[ru]=Установить RELEASE
-Name[sk]=Inštalovať RELEASE
-Name[sl]=Namesti RELEASE
-Name[sq]=Instalo RELEASE
-Name[sr]=Инсталирајте RELEASE
-Name[sv]=Installera RELEASE
-Name[ta]=RELEASEஐ நிறுவு
-Name[th]=ติดตั้ง RELEASE
-Name[tl]=Iluklok ang RELEASE
-Name[tr]=RELEASE Kur
-Name[uk]=Встановити RELEASE
-Name[vi]=Cài đặt RELEASE
-Name[zh_CN]=安装 RELEASE
-Name[zh_TW]=安裝 RELEASE
-Comment=Install this system permanently to your hard disk
-Comment[am]=ይኼን ሲስተም ሀርድ ዲስክዎ ላይ በቋሚነት ይጫኑት
-Comment[ar]=ثبّت هذا النظام على القرص الصلب
-Comment[ast]=Instalar permanentemente esti sistema nel to discu duru
-Comment[be]=Усталяваць сістэму на жорсткі дыск
-Comment[bg]=Инсталиране на тази система за постоянно на твърдия диск
-Comment[bn]=এই সিস্টেমটি আপনার হার্ডডিস্কে স্থায়ীভাবে ইনস্টল করুন।
-Comment[bs]=Instaliraj ovaj sistem trajno na hard disk
-Comment[ca]=Instal·leu aquest sistema permanentment al vostre disc dur
-Comment[cs]=Nainstalovat tento systém natrvalo na váš disk
-Comment[da]=Installér dette system permanent på din harddisk
-Comment[de]=Dieses System dauerhaft auf der Festplatte installieren
-Comment[el]=Εγκαταστήστε αυτό το σύστημα μόνιμα στο σκληρό σας δίσκο
-Comment[eo]=Instali ĉi tiun sistemon daŭre en via disko
-Comment[es]=Instalar este sistema permanentemente en su disco duro
-Comment[et]=Paigalda see süsteem jäädavalt oma kõvakettale
-Comment[eu]=Sistema hau betiko instalatu disko gogorrean
-Comment[fi]=Asenna tämä järjestelmä pysyvästi kiintolevyllesi
-Comment[fr]=Installer ce système de façon permanente sur votre disque dur
-Comment[ga]=Suiteáil an córas seo go buan ar do chruadhiosca
-Comment[gl]=Instalar o sistema de xeito permanente no disco ríxido
-Comment[gu]=આ સિસ્ટમ તમારી હાર્ડ ડિસ્ક પર હંમેશ માટે સ્થાપિત કરો
-Comment[he]=התקנת המערכת באופן קבוע על הכונן הקשיח
-Comment[hi]=इस तंत्र को आपके हार्ड डिस्क में स्थायी रूप से संस्थापित करें
-Comment[hr]=Trajno instaliraj sustav na čvrsti disk
-Comment[hu]=A rendszer telepítése merevlemezre
-Comment[id]=Memasang sistem ini secara permanen pada diska Anda
-Comment[it]=Installa questo sistema in modo permanente sul disco rigido
-Comment[ja]=このシステムをハードディスクにインストールします
-Comment[ka]=მოცემული სისტემის მყარ დისკზე ჩაყენება
-Comment[kk]=Осы жүйені қатқыл дискіңізге тұрақты орнату
-Comment[km]=ដំឡើងប្រព័ន្ធនេះជាអចិន្ត្រៃយ៍ទៅកាន់ថាសរឹងរបស់អ្នក
-Comment[ko]=이 시스템을 당신의 하드 디스크에 설치합니다.
-Comment[ku]=Sîstemê di hard dîskê xwe de saz bike
-Comment[lt]=Įdiegti Linux operacinę sistemą į kompiuterio (standųjį) diską
-Comment[lv]=Instalēt šo sistēmu cietajā diskā
-Comment[mk]=Инсталирајте го системот трајно на Вашиот тврд диск
-Comment[ml]=സ്ഥിരമായി ഹാര്ഡ് ഡിസ്കിലേക്ക് ഇന്സ്റ്റാള് ചെയ്യുക
-Comment[mr]=ही प्रणाली कायमची तुमच्या हार्ड डिस्कवर स्थापित करा
-Comment[ne]=यो प्रणाली तपाईको हार्ड डिस्कमा स्थाई रुपमा प्रतिस्थापन गर्नुहोस्
-Comment[nl]=Dit systeem definitief op uw harde schijf installeren
-Comment[pa]=ਇਹ ਸਿਸਟਮ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਆਪਣੀ ਹਾਰਡ ਡਿਸਕ ਉੱਤੇ ਇੰਸਟਾਲ
-Comment[pl]=Instaluje system na dysku twardym
-Comment[pt]=Instalar este sistema permanentemente no seu disco rígido
-Comment[pt_BR]=Instalar este sistema de maneira permanente no seu disco rígido
-Comment[ro]=Instalați acest sistem pe discul calculatorului
-Comment[ru]=Установить эту систему на жёсткий диск
-Comment[sk]=Nainštalovať systém natrvalo na pevný disk
-Comment[sl]=Trajno namesti sistem na trdi disk
-Comment[sq]=Instalo këtë sistem përgjithmonë në Hard Disk
-Comment[sr]=Инсталирајте овај систем трајно на ваш чврсти диск
-Comment[sv]=Installera detta system permanent på din hårddisk
-Comment[ta]=இந்த நிலையை நிரந்தரமாக தங்களது கணினியில் நிறுவுக
-Comment[th]=ติดตั้งระบบนี้อย่างถาวรลงบนฮาร์ดดิสก์ของคุณ
-Comment[tl]=Iluklok ng permanente ang systema sa iyong hard disk
-Comment[tr]=Bu sistemi sabit diskinize kalıcı olarak kurun
-Comment[uk]=Встановити цю систему на жорсткий диск
-Comment[vi]=Cài hệ thống vào đĩa cứng
-Comment[zh_CN]=将这个系统永久安装在您的硬盘上
-Comment[zh_TW]=將此系統安裝到您的硬碟中
-Exec=ubiquity --no-bootloader --desktop %k gtk_ui
-Icon=ubiquity
-Terminal=false
-Categories=GTK;System;Settings;
-OnlyShowIn=GNOME;XFCE;Unity;
-#X-Ubuntu-Gettext-Domain=ubiquity-desktop
-X-Ayatana-Appmenu-Show-Stubs=False
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/remove_win32_files b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/remove_win32_files
deleted file mode 100644
index 7cfab5b05d620d8c6f386273d5d507975cef115f..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/remove_win32_files
+++ /dev/null
@@ -1 +0,0 @@
-yes
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/default-wallpaper.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/default-wallpaper.patch
deleted file mode 100644
index a0143dc67043021faabb27755873bc2d73a3e829..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/default-wallpaper.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/usr/share/glib-2.0/schemas/10_gsettings-desktop-schemas.gschema.override 2012-04-16 16:09:28.000000000 +0200
-+++ b/usr/share/glib-2.0/schemas/10_gsettings-desktop-schemas.gschema.override 2013-08-28 12:57:47.709018364 +0200
-@@ -1,6 +1,6 @@
- [org.gnome.desktop.background]
- show-desktop-icons=true
--picture-uri='file:///usr/share/backgrounds/warty-final-ubuntu.png'
-+picture-uri='file:///usr/share/backgrounds/lip-wallpaper.png'
-
- [org.gnome.desktop.wm.keybindings]
- minimize = ['<Primary><Alt>KP_0']
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/ubiquity-apt-clone-fix.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/ubiquity-apt-clone-fix.patch
deleted file mode 100644
index 94c0ff23562b679913335764a1ea6ffcc53b98ab..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/ubiquity-apt-clone-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/partman/finish.d/01apt_clone_save 2013-01-12 03:31:22.000000000 +0000
-+++ b/lib/partman/finish.d/01apt_clone_save 2013-04-06 16:23:16.103678237 +0000
-@@ -39,6 +39,9 @@
- close_dialog
- done
-
-+#lip patch to prevent the apt-clone save call
-+root=""
-+
- if [ -z "$root" ]; then
- # The partition is going to be formatted; there's nothing to preserve.
- exit 0
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/run_manual_customizations b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/run_manual_customizations
deleted file mode 100644
index 7ecb56eb3fa3fa6f19dd48bca9f971950b119ede..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/run_manual_customizations
+++ /dev/null
@@ -1 +0,0 @@
-no