LIP-Image customize fixes for 13.10 (kubuntu)

Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize

@@ -10,15 +10,16 @@ fi
 
 function prepare_install()
 {
-	if [ -e "$SCRIPT_DIR/lip_sources.list" ]; then
-		cp -v "$SCRIPT_DIR/lip_sources.list" "/etc/apt/sources.list"
-	fi
+	#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
+	#uncomment if newest texlive is not part of your distribution
+	#add-apt-repository -y ppa:texlive-backports/ppa
 
 	apt-get update
 }
@@ -28,18 +29,17 @@ 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
+	#aptitude full-upgrade -y # make sure we have the newest versions
 	# Some daily images do not have a kernel ?!?
 	
 	#uncomment this if you remaster a daily build (fix kernel version!)
 	#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 firefox thunderbird
+	aptitude install firefox thunderbird kfind kompare xloadimage gpsd-clients kde-config-gtk-style -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 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 chktex cm-super context dvidvi dvipng feynmf fragmaster info lacheck latex-beamer latex-cjk-all latexdiff latexmk latex-sanskrit latex-xcolor lcdf-typetools lmodern pgf prosper psutils purifyeps t1utils tex4ht tex-gyre texinfo texlive-base texlive-bibtex-extra texlive-binaries texlive-extra-utils texlive-fonts-extra texlive-fonts-recommended texlive-font-utils texlive-formats-extra texlive-games texlive-generic-extra texlive-generic-recommended texlive-humanities texlive-lang-english texlive-lang-german texlive-latex-base texlive-latex-extra texlive-latex-recommended texlive-luatex texlive-math-extra texlive-metapost texlive-music texlive-omega texlive-pictures texlive-plain-extra texlive-pstricks texlive-publishers texlive-science texlive-xetex tipa xindy -y
 	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)"

Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd

@@ -45,7 +45,7 @@ function install_libnsa()
         mkdir -p "$IRD/lip/libnsa"
         cp "$SCRIPT_DIR/libnsa/libnsa.desktop" "$IRD/lip/libnsa"
         cp "$SCRIPT_DIR/libnsa/libnsa.sh" "$IRD/lip/libnsa"
-        cp "$SCRIPT_DIR/nmtelekinese/26libnsa" "$IRD/scripts/casper-bottom/"
+        cp "$SCRIPT_DIR/libnsa/26libnsa" "$IRD/scripts/casper-bottom/"
         chmod +x "$IRD/scripts/casper-bottom/26libnsa"
 }
 

Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/01unionstack.patch

---- 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}"

Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/02overlayed-rofs.patch → Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd-patches/unionstackmount1310.patch

---- 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 @@
+--- a/scripts/casper	2014-03-13 20:35:34.293226677 +0100
++++ b/scripts/casper	2014-03-13 20:28:39.978460056 +0100
+@@ -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
+@@ -426,6 +428,13 @@
+                 continue
+             fi
+ 
++            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}"
+@@ -461,6 +470,10 @@
      fi
  
      mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || panic "Can not mount $cowdevice on /cow"
@@ -11,34 +34,34 @@
  
      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
+@@ -475,7 +488,9 @@
+             # Mount the layers pairwise from the bottom onto rootmnt,
+             # for the second and later layers rootmnt forms the lower layer.
+             mounts=""
+-            for mount in /cow $rofslist
 +
++	    #overlay all readonly file systems first
++            for mount in $rofslist
+             do
+                 mounts="$mount $mounts"
+             done
+@@ -487,9 +502,13 @@
+                     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 @@
+@@ -530,15 +549,17 @@
      fi
  
      # move the first mount; no head in busybox-initramfs

Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/iso-patches/ubiquity-keep-installed.patch

---- 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 @@
+--- a/preseed/kubuntu.seed	2013-10-16 22:13:07.000000000 +0200
++++ b/preseed/kubuntu.seed	2014-03-13 20:02:16.991868107 +0100
+@@ -10,4 +10,4 @@
  # 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