diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
index ea5df8c217e512481d0bb58a10274ab8d1b3768f..659d9a37e7942b30eb965db5d50bd50b70c8e0c2 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
@@ -1,62 +1,18 @@
#!/bin/bash
-function prepare_install()
-{
- echo "# 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
+#is this true for all uck versions??
+SCRIPT_DIR=`dirname "$0"`
-## 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
+#source common functions (e.g. patch_all)
+if [ -e "$SCRIPT_DIR/customize_common" ]; then
+ source "$SCRIPT_DIR/customize_common"
+fi
-## 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
-" > /etc/apt/sources.list
+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
@@ -71,10 +27,11 @@ 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 install linux-image-generic-lts-quantal
+ 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 full-upgrade -y # make sure we have the newest versions
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
@@ -93,7 +50,8 @@ function install_packages()
if [ -n "$EXTRA_LANG_PKG" ]; then
aptitude purge $EXTRA_LANG_PKG -y
fi
-
+
+ install_debs "$SCRIPT_DIR/debs/"
}
function finalize()
@@ -106,6 +64,9 @@ function finalize()
prepare_install
install_packages
-cp /tmp/customization-scripts/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop /usr/share/applications/
+#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/" "/"
finalize
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_common b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_common
new file mode 100755
index 0000000000000000000000000000000000000000..9e7bd586d0a60294dbf929a957cbbf2478117120
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_common
@@ -0,0 +1,41 @@
+#!/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-lip32/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_initrd
index 6e1a4a59756fe8a6dbe9ad9521aee7338895d5e2..31b754e14940f8711a45cfc8172c0dee2caad4ed 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_initrd
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_initrd
@@ -27,29 +27,35 @@ 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/"
+ 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"
}
-function initrd_patches()
-{
- for p in "$SCRIPT_DIR/initrd-patches/"*
- do
- cat "$p" | patch -d "$IRD" -p1
- done
-}
+mkdir -p "$IRD/lip"
install_nmtelekinese
add_no_bootloader_icon
-initrd_patches
+
+#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-lip32/customize_iso b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_iso
index a9bf588e2f88457fdf73ac7361ef1d596fb81453..c440fe05f4de5cb519efe9a9ec39a3b3072644c7 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_iso
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize_iso
@@ -1 +1,20 @@
#!/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-lip32/debs/lipstuff_0.1-0ubuntu1_all.deb b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/debs/lipstuff_0.1-0ubuntu1_all.deb
new file mode 100644
index 0000000000000000000000000000000000000000..f498bbff565b8efd628ad10f730fa4e91c853d0f
Binary files /dev/null and b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/debs/lipstuff_0.1-0ubuntu1_all.deb differ
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/02overlayed-rofs.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/02overlayed-rofs.patch
index 03243ffbcdc3c6ad4b1594d7eec231f94392163a..08190d24422951d7a566651f2c14203b2b2e9503 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/02overlayed-rofs.patch
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd-patches/02overlayed-rofs.patch
@@ -33,7 +33,7 @@
+ lower="$overlay_mount_dir"
done
+
-+ mount -t overlayfs -o "upperdir=/cow,lowerdir=$overlay_mount_dir" \
++ mount -t overlayfs -o "upperdir=/cow,lowerdir=$lower" \
+ "$mount" "$rootmnt"
;;
esac
@@ -61,7 +61,7 @@
+ # break
+ #done
+ mkdir -p "${rootmnt}/rofs"
-+ mount -o move "$overlay_mount_dir" "${rootmnt}/rofs"
++ mount -o move "$lower" "${rootmnt}/rofs"
}
check_dev ()
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/24liphook b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/24liphook
new file mode 100755
index 0000000000000000000000000000000000000000..35a7f5ba96b372c70f2c30f9bdf9d213d90820ce
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/24liphook
@@ -0,0 +1,30 @@
+#!/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/nmtelekinese/ORDER b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/ORDER
similarity index 97%
rename from Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/ORDER
rename to Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/ORDER
index d58e948145edfcb1801400ab52388ebb3024c915..689624a64f8de2dc067f1dd3e7a2f0661610cd99 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/ORDER
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/initrd_hook/ORDER
@@ -38,6 +38,8 @@
[ -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
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso-patches/ubiquity-keep-installed.patch b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso-patches/ubiquity-keep-installed.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0b2048ba5ea0a350c414907709685998cf596974
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso-patches/ubiquity-keep-installed.patch
@@ -0,0 +1,9 @@
+--- 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-lip32/iso_description b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso_description
index cc1d0113ab1902e9950d06fdd3aa4760702de03d..705e7f7546e07e5a3b7e4866696fca2b8ebed633 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso_description
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/iso_description
@@ -1 +1 @@
-LIP SS2013 32bit
+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
new file mode 100644
index 0000000000000000000000000000000000000000..c85e9921570ef850653b34e3cf04377287998940
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/lip_sources.list
@@ -0,0 +1,54 @@
+# 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/26mopsmops b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/26mopsmops
index 2ddd5db4a61ad827a2d37f159465ddf1754b3d97..c1c047d116741b66ba524d8ae30b0e9c0dff6b83 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/26mopsmops
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/nmtelekinese/26mopsmops
@@ -22,9 +22,9 @@ load_confmodule
log_begin_msg "$DESCRIPTION"
# Starting nmtelekinese with the MoPS network
-cp /nm/nmtelekinese.py /root/usr/bin/
+cp /lip/nm/nmtelekinese.py /root/usr/bin/
chroot /root mkdir -m 755 -p /home/${USERNAME}/.config/autostart
-cp /nm/nmtelekinese.desktop /root/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
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
new file mode 100644
index 0000000000000000000000000000000000000000..94c0ff23562b679913335764a1ea6ffcc53b98ab
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/rootfs-patches/ubiquity-apt-clone-fix.patch
@@ -0,0 +1,12 @@
+--- 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/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
index ea5df8c217e512481d0bb58a10274ab8d1b3768f..659d9a37e7942b30eb965db5d50bd50b70c8e0c2 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
@@ -1,62 +1,18 @@
#!/bin/bash
-function prepare_install()
-{
- echo "# 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
+#is this true for all uck versions??
+SCRIPT_DIR=`dirname "$0"`
-## 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
+#source common functions (e.g. patch_all)
+if [ -e "$SCRIPT_DIR/customize_common" ]; then
+ source "$SCRIPT_DIR/customize_common"
+fi
-## 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
-" > /etc/apt/sources.list
+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
@@ -71,10 +27,11 @@ 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 install linux-image-generic-lts-quantal
+ 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 full-upgrade -y # make sure we have the newest versions
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
@@ -93,7 +50,8 @@ function install_packages()
if [ -n "$EXTRA_LANG_PKG" ]; then
aptitude purge $EXTRA_LANG_PKG -y
fi
-
+
+ install_debs "$SCRIPT_DIR/debs/"
}
function finalize()
@@ -106,6 +64,9 @@ function finalize()
prepare_install
install_packages
-cp /tmp/customization-scripts/no-bootloader-icon/ubiquity-gtkui-no-bootloader.desktop /usr/share/applications/
+#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/" "/"
finalize
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_common b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_common
new file mode 100755
index 0000000000000000000000000000000000000000..9e7bd586d0a60294dbf929a957cbbf2478117120
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_common
@@ -0,0 +1,41 @@
+#!/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
index 6e1a4a59756fe8a6dbe9ad9521aee7338895d5e2..31b754e14940f8711a45cfc8172c0dee2caad4ed 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_initrd
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_initrd
@@ -27,29 +27,35 @@ 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/"
+ 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"
}
-function initrd_patches()
-{
- for p in "$SCRIPT_DIR/initrd-patches/"*
- do
- cat "$p" | patch -d "$IRD" -p1
- done
-}
+mkdir -p "$IRD/lip"
install_nmtelekinese
add_no_bootloader_icon
-initrd_patches
+
+#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
index a9bf588e2f88457fdf73ac7361ef1d596fb81453..c440fe05f4de5cb519efe9a9ec39a3b3072644c7 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_iso
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize_iso
@@ -1 +1,20 @@
#!/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
new file mode 100644
index 0000000000000000000000000000000000000000..f498bbff565b8efd628ad10f730fa4e91c853d0f
Binary files /dev/null and b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/debs/lipstuff_0.1-0ubuntu1_all.deb differ
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
index 03243ffbcdc3c6ad4b1594d7eec231f94392163a..08190d24422951d7a566651f2c14203b2b2e9503 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/02overlayed-rofs.patch
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd-patches/02overlayed-rofs.patch
@@ -33,7 +33,7 @@
+ lower="$overlay_mount_dir"
done
+
-+ mount -t overlayfs -o "upperdir=/cow,lowerdir=$overlay_mount_dir" \
++ mount -t overlayfs -o "upperdir=/cow,lowerdir=$lower" \
+ "$mount" "$rootmnt"
;;
esac
@@ -61,7 +61,7 @@
+ # break
+ #done
+ mkdir -p "${rootmnt}/rofs"
-+ mount -o move "$overlay_mount_dir" "${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
new file mode 100755
index 0000000000000000000000000000000000000000..35a7f5ba96b372c70f2c30f9bdf9d213d90820ce
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/24liphook
@@ -0,0 +1,30 @@
+#!/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
new file mode 100644
index 0000000000000000000000000000000000000000..689624a64f8de2dc067f1dd3e7a2f0661610cd99
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/initrd_hook/ORDER
@@ -0,0 +1,80 @@
+/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
new file mode 100644
index 0000000000000000000000000000000000000000..0b2048ba5ea0a350c414907709685998cf596974
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso-patches/ubiquity-keep-installed.patch
@@ -0,0 +1,9 @@
+--- 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
index 3d8347ba07d7f55613284026eda96924e944ab8a..a2914a3f5b75f262cc9d5aba4f0f5308ca37a59e 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso_description
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/iso_description
@@ -1 +1 @@
-LIP SS2013 64bit
+LIP WS1314 64bit
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list
new file mode 100644
index 0000000000000000000000000000000000000000..c85e9921570ef850653b34e3cf04377287998940
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/lip_sources.list
@@ -0,0 +1,54 @@
+# 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/nmtelekinese/26mopsmops b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops
index 2ddd5db4a61ad827a2d37f159465ddf1754b3d97..c1c047d116741b66ba524d8ae30b0e9c0dff6b83 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/nmtelekinese/26mopsmops
@@ -22,9 +22,9 @@ load_confmodule
log_begin_msg "$DESCRIPTION"
# Starting nmtelekinese with the MoPS network
-cp /nm/nmtelekinese.py /root/usr/bin/
+cp /lip/nm/nmtelekinese.py /root/usr/bin/
chroot /root mkdir -m 755 -p /home/${USERNAME}/.config/autostart
-cp /nm/nmtelekinese.desktop /root/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
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
new file mode 100644
index 0000000000000000000000000000000000000000..94c0ff23562b679913335764a1ea6ffcc53b98ab
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/rootfs-patches/ubiquity-apt-clone-fix.patch
@@ -0,0 +1,12 @@
+--- 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