Merge branch 'master' of www.fsmpi.rwth-aachen.de:lip

shellscripte/Lipuntu.sh

@@ -56,9 +56,12 @@ deb http://extras.ubuntu.com/ubuntu precise main
 deb-src http://extras.ubuntu.com/ubuntu precise main
 " > /etc/apt/sources.list
 apt-get update
-apt-get install aptitude
+apt-get install aptitude -y
 
-aptitude full-upgrade
+aptitude full-upgrade -y
 aptitude install automake cmake aspell-de build-essential ffmpeg htop hunspell hunspell-de-de language-pack-de lvm2 mencoder screen synaptic tofrodos efibootmgr gdisk linux-headers vlc moreutils 
 aptitude install --without-recommends mdadm
-#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
+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
+
+echo -n "Europe/Berlin" > /etc/timezone
+rm /var/crash/*

shellscripte/adduser.patch

+--- scripts/casper-bottom/25adduser
++++ scripts/casper-bottom/25adduser
+@@ -81,12 +81,11 @@
+ if [ "$LTS" = "LTS" ] && [ -n "$RELEASE" ]; then
+ 	RELEASE="$RELEASE LTS"
+ fi
+-for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde4/ubiquity-kdeui.desktop; do
++for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde4/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")
+-        break
+     fi
+ done
+ 

shellscripte/bootloader.patch

+--- ubiquity-gtkui.desktop	2012-08-16 03:53:03.000000000 +0000
++++ ubiquity-gtkui-no-bootloader.desktop	2012-09-13 13:01:59.458137174 +0000
+@@ -2,7 +2,7 @@
+ Type=Application
+ Version=1.0
+ # Do not translate the word "RELEASE".  It is used as a marker by casper.
+-Name=Install RELEASE
++Name=Install RELEASE (without bootloader)
+ Name[am]=የተለቀቀውን መግጠሚያ
+ Name[ar]=ثبّت RELEASE
+ Name[ast]=Instalar RELEASE
+@@ -13,7 +13,7 @@
+ Name[ca]=Instal·la la versió RELEASE
+ Name[cs]=Nainstalovat RELEASE
+ Name[da]=Installér RELEASE
+-Name[de]=RELEASE installieren
++Name[de]=RELEASE installieren (ohne Bootloader)
+ Name[el]=Εγκατάσταση RELEASE
+ Name[eo]=Instali RELEASE
+ Name[es]=Instalar RELEASE

shellscripte/create_shortcut.sh

+#!/bin/bash
+pushd /usr/share/applications/
+cp ubiquity-gtkui.desktop ubuquity-gtkui-no-bootloader.desktop
+patch ubiquity-gtkui-no-bootloader.desktop /root/bootloader.patch
+popd

shellscripte/patch_initrd.sh

+#!/bin/bash
+mkdir initrd_edit
+cd initrd_edit
+echo "Extracting initrd..."
+lzma -dc -S .lz ../initrd.lz | cpio -imvd --no-absolute-filenames
+mv ../initrd.lz ../initrd.lz.org
+echo "OK!"
+echo "Patching..."
+pwd
+patch scripts/casper-bottom/25adduser ../adduser.patch
+echo "OK!"
+echo "Recompressing..."
+find . | cpio --quiet --dereference -o -H newc | lzma -7 > ../initrd.lz
+echo "OK!"
+cd ..
+echo "Done"
+exit 0

shellscripte/pack_initrd.sh → shellscripte/patch_initrd.sh~

 #!/bin/bash
-cd ~/initrd_edit
+mkdir initrd_edit
+cd initrd_edit
+lzma -dc -S .lz ../initrd.lz | cpio -imvd --no-absolute-filenames
+mv ../initrd.lz ../initrd.lz.org
+patch adduser.patch
 find . | cpio --quiet --dereference -o -H newc | lzma -7 > ../initrd.lz
 cd ..
-

shellscripte/unpack_initrd.sh

-#!/bin/bash
-mkdir -p ~/initrd_edit
-cd ~/initrd_edit
-lzma -dc -S .lz ~/tmp/remaster-iso/casper/initrd.lz | cpio -imvd --no-absolute-filenames
-