diff --git a/Installer-USB-Stick/README b/Installer-USB-Stick/README
deleted file mode 100644
index 10c7b76dd67dfd8731ce9ef075cc6ad0ef5b156f..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Zutaten:
-Ubuntu Precise 12.04 Daily Image (getestet mit dem vom 15.03.2013)
-UCK-SVN (getestet mit Revision 474)
-Plattenplatz
-
-Wie benutzt man das neue UCK custom script:
-1. Im UCK Ordner mit patch -p1 <paht_to_compression_patch> die Kompression
- des SquashFS Images erhöhen
-2. Ein ggf. alten customize-scripts Ordner in ~/tmp löschen
-3. In customize-lip/iso_description ggf. das Semester und die Bit-Zahl
- anpassen
-4. uck-remaster <path_to_iso> <path_to_customize-lip> ausfüren
-5. Warten bis das Script fertig ist
-6. ISO sichern
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/README b/Installer-USB-Stick/UbuntuCustomizationKit/README
new file mode 100644
index 0000000000000000000000000000000000000000..60ac6bfb11b3bcd40983d2919641496e03f61498
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/README
@@ -0,0 +1,21 @@
+Zutaten:
+Ubuntu Precise 12.04 Daily Image (getestet mit dem vom 15.03.2013)
+UCK-SVN (getestet mit Revision 474): svn checkout svn://svn.code.sf.net/p/uck/code/trunk uck-code/uck
+Plattenplatz
+
+Wie benutzt man das neue UCK custom script:
+0. UCK aus dem System deinstallieren !
+1. Im UCK Ordner mit patch -p1 <path_to_compression_patch> die Kompression
+ des SquashFS Images erhöhen
+1a Im UCK-Ordner libraries/remaster-iso....sh patchen, damit die temp-dateien erhalten bleiben.
+2. Ein ggf. alten customize-scripts Ordner in ~/tmp löschen
+3. In customize-lip/iso_description ggf. das Semester und die Bit-Zahl
+ anpassen.
+4. uck-remaster <path_to_iso> <path_to_customize-lip> <path-to-temp> ausfüren
+5. Warten bis das Script fertig ist
+6. Wiederhole 1-5 für die "andere" Bitzahl (32/64 bit)
+7. Dedupliziere Dateien gemaess README.ImageDeduplizieren
+8. Installer-USB-STick zusammenstellen
+8a Kernel, Squashfs, Initrd nach Stick/casper kopieren
+8b Grub+EFI einrichten
+8c Stick/.disk/casper-generic-uuid* anpassen; Quelle ist path-to-remaster/remaster-initrd/conf/uuid.conf
diff --git a/Installer-USB-Stick/ImageDeduplizieren b/Installer-USB-Stick/UbuntuCustomizationKit/README.ImageDeduplizieren
similarity index 100%
rename from Installer-USB-Stick/ImageDeduplizieren
rename to Installer-USB-Stick/UbuntuCustomizationKit/README.ImageDeduplizieren
diff --git a/Installer-USB-Stick/uck-increase-squashfs-compression.patch b/Installer-USB-Stick/UbuntuCustomizationKit/uck-increase-squashfs-compression.patch
similarity index 100%
rename from Installer-USB-Stick/uck-increase-squashfs-compression.patch
rename to Installer-USB-Stick/UbuntuCustomizationKit/uck-increase-squashfs-compression.patch
diff --git a/Installer-USB-Stick/bootflags.txt b/Installer-USB-Stick/bootflags.txt
old mode 100755
new mode 100644
diff --git a/Installer-USB-Stick/game/GAMEOFLIFE.img b/Installer-USB-Stick/grub-bootloader-games/GAMEOFLIFE.img
similarity index 100%
rename from Installer-USB-Stick/game/GAMEOFLIFE.img
rename to Installer-USB-Stick/grub-bootloader-games/GAMEOFLIFE.img
diff --git a/Installer-USB-Stick/game/GOLeithian-fix.img b/Installer-USB-Stick/grub-bootloader-games/GOLeithian-fix.img
similarity index 100%
rename from Installer-USB-Stick/game/GOLeithian-fix.img
rename to Installer-USB-Stick/grub-bootloader-games/GOLeithian-fix.img
diff --git a/Installer-USB-Stick/game/ZOMG_miniBill_final_submission.img b/Installer-USB-Stick/grub-bootloader-games/ZOMG_miniBill_final_submission.img
similarity index 100%
rename from Installer-USB-Stick/game/ZOMG_miniBill_final_submission.img
rename to Installer-USB-Stick/grub-bootloader-games/ZOMG_miniBill_final_submission.img
diff --git a/Installer-USB-Stick/game/blamaze10.img b/Installer-USB-Stick/grub-bootloader-games/blamaze10.img
similarity index 100%
rename from Installer-USB-Stick/game/blamaze10.img
rename to Installer-USB-Stick/grub-bootloader-games/blamaze10.img
diff --git a/Installer-USB-Stick/game/blasty2.img b/Installer-USB-Stick/grub-bootloader-games/blasty2.img
similarity index 100%
rename from Installer-USB-Stick/game/blasty2.img
rename to Installer-USB-Stick/grub-bootloader-games/blasty2.img
diff --git a/Installer-USB-Stick/game/dion.img b/Installer-USB-Stick/grub-bootloader-games/dion.img
similarity index 100%
rename from Installer-USB-Stick/game/dion.img
rename to Installer-USB-Stick/grub-bootloader-games/dion.img
diff --git a/Installer-USB-Stick/game/game.cfg b/Installer-USB-Stick/grub-bootloader-games/game.cfg
similarity index 100%
rename from Installer-USB-Stick/game/game.cfg
rename to Installer-USB-Stick/grub-bootloader-games/game.cfg
diff --git a/Installer-USB-Stick/game/games.cfg b/Installer-USB-Stick/grub-bootloader-games/games.cfg
similarity index 100%
rename from Installer-USB-Stick/game/games.cfg
rename to Installer-USB-Stick/grub-bootloader-games/games.cfg
diff --git a/Installer-USB-Stick/game/invaders b/Installer-USB-Stick/grub-bootloader-games/invaders
similarity index 100%
rename from Installer-USB-Stick/game/invaders
rename to Installer-USB-Stick/grub-bootloader-games/invaders
diff --git a/Installer-USB-Stick/game/ioripple.img b/Installer-USB-Stick/grub-bootloader-games/ioripple.img
similarity index 100%
rename from Installer-USB-Stick/game/ioripple.img
rename to Installer-USB-Stick/grub-bootloader-games/ioripple.img
diff --git a/Installer-USB-Stick/game/mandelfinal.img b/Installer-USB-Stick/grub-bootloader-games/mandelfinal.img
similarity index 100%
rename from Installer-USB-Stick/game/mandelfinal.img
rename to Installer-USB-Stick/grub-bootloader-games/mandelfinal.img
diff --git a/Installer-USB-Stick/game/nyan.img b/Installer-USB-Stick/grub-bootloader-games/nyan.img
similarity index 100%
rename from Installer-USB-Stick/game/nyan.img
rename to Installer-USB-Stick/grub-bootloader-games/nyan.img
diff --git a/Installer-USB-Stick/game/p1ra_lissajous_v1.img b/Installer-USB-Stick/grub-bootloader-games/p1ra_lissajous_v1.img
similarity index 100%
rename from Installer-USB-Stick/game/p1ra_lissajous_v1.img
rename to Installer-USB-Stick/grub-bootloader-games/p1ra_lissajous_v1.img
diff --git a/Installer-USB-Stick/game/phosphene.img b/Installer-USB-Stick/grub-bootloader-games/phosphene.img
similarity index 100%
rename from Installer-USB-Stick/game/phosphene.img
rename to Installer-USB-Stick/grub-bootloader-games/phosphene.img
diff --git a/Installer-USB-Stick/game/source.url.txt b/Installer-USB-Stick/grub-bootloader-games/source.url.txt
similarity index 100%
rename from Installer-USB-Stick/game/source.url.txt
rename to Installer-USB-Stick/grub-bootloader-games/source.url.txt
diff --git a/Installer-USB-Stick/game/uranix2.img b/Installer-USB-Stick/grub-bootloader-games/uranix2.img
similarity index 100%
rename from Installer-USB-Stick/game/uranix2.img
rename to Installer-USB-Stick/grub-bootloader-games/uranix2.img
diff --git a/Installer-USB-Stick/grub-config-SS2013/grub.cfg b/Installer-USB-Stick/grub-config-SS2013/grub.cfg
new file mode 100755
index 0000000000000000000000000000000000000000..db341737529741bb06eefa619b39932a4176b4d8
--- /dev/null
+++ b/Installer-USB-Stick/grub-config-SS2013/grub.cfg
@@ -0,0 +1,121 @@
+
+if loadfont /boot/grub/font.pf2 ; then
+ set gfxmode=auto
+ insmod efi_gop
+ insmod efi_uga
+ insmod gfxterm
+ terminal_output gfxterm
+fi
+
+set menu_color_normal=white/black
+set menu_color_highlight=black/light-gray
+
+function set64 {
+ set bits="64"
+ set altbits="32"
+}
+
+function set32 {
+ set bits="32"
+ set altbits="64"
+}
+
+
+function guesscpu {
+ if cpuid -l
+ then
+ echo "Dein System scheint ein 64-bit System zu sein."
+ set64
+ else
+ echo "Dein System scheint ein 32-bit System zu sein."
+ set32
+ fi
+ echo "Die weiseste Wahl sollte $bits bits mit $iso und $isoinitrd zu sein"
+ echo
+}
+
+#elif is not working in this grub version !?!
+if test -z $bits
+then
+ guesscpu
+else
+ if test 64 == $bits
+ then
+ set64
+ else
+ set32
+ fi
+fi
+
+set gfxpayload=keep
+
+# Start a Debian style Casper Kernel
+function LoadCasper {
+ echo "Loading kernel${bits} (takes up to 2 minutes)"
+ linux /casper/vmlinuz${bits} boot=casper file=/cdrom/preseed/ubuntu.seed ${localeinfo} unionstack=lipcommon.squashfs:lip${bits}.squashfs nosplash verbose --
+ echo "Loading initrd${bits} (takes up to 5 minutes)"
+ initrd /casper/initrd${bits}.lz
+ echo "Starting kernel"
+}
+
+menuentry "Empfohlen: Ubuntu 12.04.2 LTS ${bits}bit (deutsch)" {
+ set localeinfo="debian-installer/locale=de_DE console-setup/layoutcode=de"
+ LoadCasper
+}
+
+menuentry "Empfohlen: Ubuntu 12.04.2 LTS ${bits}bit (english)" {
+ set localeinfo=""
+ LoadCasper
+}
+
+menuentry "========================= Helfermenu ===============================" {
+ echo "hier ist nichts"
+}
+
+#menuentry "Helfermenu. Nur Nach Ruecksprache mit einem Install-Helfer benutzen." {
+# export bits
+# set autobits=${bits}
+# export autobits
+# configfile (${root})/boot/grub/helfer.cfg
+#}
+
+menuentry "Toggle 32/64 bits" {
+ set tmp cbit=${bits}
+ set bits=${altbits}
+ set altbits=${cbit}
+ export bits
+ configfile ($root)/boot/grub/grub.cfg
+}
+
+menuentry "Tool: Check ${bits}bit install medium for defects" {
+ set localeinfo="integrity-check"
+ LoadCasper
+}
+
+menuentry "Tool: 32bit GParted Live CD (laeuft im RAM -> mindestens 224MB)" {
+ # Hint: remove "toram=..." to make it work with 128mb ram
+ loopback loop ($root)/gparted-live-0.9.1-1.iso
+ echo "Loading 32 bit GParted kernel (takes up to 2 minutes)"
+ linux (loop)/live/vmlinuz boot=live config noswap noprompt nosplash findiso=/gparted-live-0.9.1-1.iso toram=filesystem.squashfs
+ echo "Loading initrd from iso (takes up to 5 minutes)"
+ initrd (loop)/live/initrd.img
+ echo "Starting 32 bit GParted kernel"
+}
+
+menuentry "Tool: Memtest86+" {
+ loopback loop ($root)/gparted-live-0.9.1-1.iso
+ echo "Loading memtest"
+ linux16 (loop)/live/memtest
+ echo "Starting Memtest86Plus"
+}
+
+menuentry "Tool: FreeDOS" {
+ echo "Loading memdisk"
+ linux16 /FreeDOS/memdisk
+ echo "Loading FreeDOS"
+ initrd16 /FreeDOS/freedos144.img
+ echo "Starting FreeDOS"
+}
+
+#end;
+
diff --git a/Installer-USB-Stick/grub.cfg b/Installer-USB-Stick/grub-config-WS2012-13/grub.cfg
similarity index 100%
rename from Installer-USB-Stick/grub.cfg
rename to Installer-USB-Stick/grub-config-WS2012-13/grub.cfg
diff --git a/Installer-USB-Stick/scripts/chroot_target.sh b/Installer-USB-Stick/scripts/chroot_target.sh
new file mode 100755
index 0000000000000000000000000000000000000000..05489461023a3e0a840ba61073238657ebf4e5d5
--- /dev/null
+++ b/Installer-USB-Stick/scripts/chroot_target.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -e
+something_is_mounted_at() {
+ grep -q " $1/\? " /proc/mounts
+}
+
+if [[ $EUID -ne 0 ]]
+then
+ echo "Du bist nicht ROOT ... verwende \"sudo bash $0\" !"
+ exit 2
+fi
+
+mkdir -p /target
+
+if ! something_is_mounted_at /target
+then
+ if [ -n "$1" ]
+ then
+ mount "$1" /target
+ else
+ echo "Nothing mounted at /target. Give filesystem to mount as parameter #1"
+ exit 1
+ fi
+fi
+something_is_mounted_at /target/dev || mount --rbind /dev /target/dev
+something_is_mounted_at /target/sys || mount --bind /sys /target/sys
+something_is_mounted_at /target/proc || mount --bind /proc /target/proc
+
+debian_chroot=TARGET chroot /target /bin/bash -l
+
+echo -e "\n*************************************\n*"
+echo -e "* You are out of CHROOT now! *\n*"
+echo -e "\n*************************************\n"
+#end;
diff --git a/Installer-USB-Stick/scripts/create_offline_repo.sh b/Installer-USB-Stick/scripts/create_offline_repo.sh
new file mode 100755
index 0000000000000000000000000000000000000000..719f528f7694bf69010402241b994c104f983852
--- /dev/null
+++ b/Installer-USB-Stick/scripts/create_offline_repo.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+PKG_LIST="gufw pwgen p7zip-full p7zip-rar texmaker inkscape gimp pidgin subversion git \
+gnome haskell-platform java7-jdk swi-prolog python-numpy python-simpy python-scipy \
+python-matplotlib ipython python-dev gnuplot wxmaxima fityk openssh-server \
+linux-firmware-nonfree zsh zsh-doc lftp graphviz xubuntu-desktop unrar-free \
+gddrescue smartmontools \
+libx11-dev libxpm-dev libxft-dev libxext-dev \
+gfortran libpcre3-dev xlibmesa-glu-dev libglew1.5-dev libftgl-dev libmysqlclient-dev \
+libfftw3-dev cfitsio-dev graphviz-dev libavahi-compat-libdnssd-dev libldap2-dev \
+python-dev libxml2-dev libkrb5-dev libgsl0-dev libqt4-dev \
+"
+
+DESTINATION="/cdrom"
+PKG_DESTINATION=$DESTINATION/archives
+
+#begin
+echo "creating structure..."
+mkdir -p $PKG_DESTINATION/
+echo "done."
+echo "downloading archives. this may take some time..."
+wget -nc -P $PKG_DESTINATION $(apt-get install --reinstall --print-uris -qq $PKG_LIST | cut -d"'" -f2)
+#wget -nc -P $PKG_DESTINATION $(apt-get -o APT::Architecture=$ARCHITECTURE install --reinstall --allow-unauthenticated --print-uris -qq $PKG_LIST | cut -d"'" -f2)
+echo "done."
+
+#end.
diff --git a/Installer-USB-Stick/usbrepo/infuse_offline_repo.sh b/Installer-USB-Stick/scripts/infuse_offline_repo.sh
similarity index 100%
rename from Installer-USB-Stick/usbrepo/infuse_offline_repo.sh
rename to Installer-USB-Stick/scripts/infuse_offline_repo.sh
diff --git a/Installer-USB-Stick/usbrepo/linuxparty.sh b/Installer-USB-Stick/scripts/linuxparty.sh
old mode 100644
new mode 100755
similarity index 75%
rename from Installer-USB-Stick/usbrepo/linuxparty.sh
rename to Installer-USB-Stick/scripts/linuxparty.sh
index e738aa3b2790a9699bf4816c10c91d2b4be57cb9..d938f22769343bd1dae801c110ee9924f3fd0c11
--- a/Installer-USB-Stick/usbrepo/linuxparty.sh
+++ b/Installer-USB-Stick/scripts/linuxparty.sh
@@ -103,29 +103,32 @@ fi
# Packetquellen bereitlegen.
echo
- echo "Bereitstellung der Packequellen"
+ echo "Bereitstellung der Packetquellen"
# Entweder apt-get update
# Oder apt-clone restore
if [[ $HAVELIPSTICK -eq 1 ]]
then
- echo "Bereite apt-clone vor"
- dpkg -GERi "/var/cache/apt/archives/dpkg-early-install" >/dev/null 2>&1
- APT_CLONE_BACKUP="$(mktemp --tmpdir="$HOME" --suffix='.apt-clone.tar.gz')"
- echo "Erstelle Backup der apt Packetquellen in ${APT_CLONE_BACKUP}"
- apt-clone clone "${APT_CLONE_BACKUP}" >/dev/null 2>&1
- echo "Wende apt-clone an"
- apt-clone restore "/var/cache/apt/archives/apt-clones/ftp-halifax.apt-clone.tar.gz" >/dev/null 2>&1 || true
+# infuse script has already done our job here
+echo "Nutze Packete vom USB-Repository"
+# echo "Bereite apt-clone vor"
+# dpkg -GERi "/var/cache/apt/archives/dpkg-early-install" >/dev/null 2>&1
+# APT_CLONE_BACKUP="$(mktemp --tmpdir="$HOME" --suffix='.apt-clone.tar.gz')"
+# echo "Erstelle Backup der apt Packetquellen in ${APT_CLONE_BACKUP}"
+# apt-clone clone "${APT_CLONE_BACKUP}" >/dev/null 2>&1
+# echo "Wende apt-clone an"
+# apt-clone restore "/var/cache/apt/archives/apt-clones/ftp-halifax.apt-clone.tar.gz" >/dev/null 2>&1 || true
else
- echo "Update der Packetquellen aus dem Internet mit 'apt-get update'"
+ #echo "Update der Packetquellen aus dem Internet mit 'apt-get update'"
# Wie sichert man apt-get update ab ?
- apt-get update
+ # apt-get -o Dir::Etc::SourceList=/etc/apt/sources.list.d/lipoffline.list,Dir::Etc::SourceParts="" update
+ apt-get update
fi
# System absichern
if askyesno "Netzwerk: Soll die Ubuntu Firewall (ufw/gufw) aktiviert werden ?"
then
$DEBUG ufw enable
- apt-get install --quiet -y gufw
+ apt-get install --quiet -y --force-yes gufw
ok "Firewall aktiviert, benutze 'gufw' oder 'ufw' um die Einstellungen der Firewall zu verändern"
#ok "Firewall aktiviert, benutze das Kommando 'ufw' in einem Teminal, um die Einstellungen der Firewall zu verändern"
fi
@@ -135,13 +138,13 @@ echo "Installation:"
echo "Programme, die für alle Fachrichtungen interressant sind (VPN, ... )"
if askyesno "Sollen diese Programme installiert werden ?"
then
- apt-get install --quiet -y ubuntu-restricted-extras
+ apt-get install --quiet -y --force-yes ubuntu-restricted-extras
ok "Codec Installation abgeschlossen"
- apt-get install --quiet -y pwgen p7zip-full
+ apt-get install --quiet -y --force-yes pwgen p7zip-full
ok "Installation der System-Utilities abgeschlossen"
- apt-get install --quiet -y network-manager-vpnc-gnome
+ apt-get install --quiet -y --force-yes network-manager-vpnc-gnome
ok "Installation des RWTH-VPNs (vpnc) abgeschlossen"
- apt-get install --quiet -y texmaker inkscape gimp pidgin smplayer subversion git get-flash-videos
+ apt-get install --quiet -y --force-yes texmaker inkscape gimp pidgin smplayer subversion git get-flash-videos
ok "Installation der für alle interessanten Software abgeschlossen."
else
@@ -154,7 +157,7 @@ echo " Das ist für diejenigen interessant, die mit 'unity',"
echo " der gerade eingestellten Oberfläche nicht gut klarkommen."
if askyesno "Soll 'GNOME 3' installiert werden ?"
then
- apt-get install --quiet -y gnome
+ apt-get install --quiet -y --force-yes gnome
ok "GNOME 3 wurde installiert"
fi
@@ -168,13 +171,13 @@ echo "Auswahl fachspezifischer Software:"
if askyesno "Software für Vorlesung 'Programmierung' (Pflicht für Informatiker) installieren ?"
then
- apt-get install --quiet -y haskell-platform java7-jdk swi-prolog
+ apt-get install --quiet -y --force-yes haskell-platform java7-jdk swi-prolog
ok "Haskell, Java, Prolog und Eclipse wurden installiert"
fi
if askyesno "Software für Physiker (Python-SciPy,-NumPy,diverse Plot-Programme) installieren ?"
then
- apt-get install --quiet -y python-numpy python-simpy python-scipy python-matplotlib ipython python-dev gnuplot wxmaxima kmplot
+ apt-get install --quiet -y --force-yes python-numpy python-simpy python-scipy python-matplotlib ipython python-dev gnuplot wxmaxima kmplot
ok "Python-SciPy, -NumPy, -Matplotlib, ipython, gnuplot, WxMaxima und KMplot wurden installiert"
fi
diff --git a/Installer-USB-Stick/usbrepo/mkdebarchive.sh b/Installer-USB-Stick/scripts/mkdebarchive.sh
similarity index 100%
rename from Installer-USB-Stick/usbrepo/mkdebarchive.sh
rename to Installer-USB-Stick/scripts/mkdebarchive.sh
diff --git a/Installer-USB-Stick/usbrepo/mount-stick-repo.sh b/Installer-USB-Stick/scripts/mount-stick-repo.sh
old mode 100644
new mode 100755
similarity index 100%
rename from Installer-USB-Stick/usbrepo/mount-stick-repo.sh
rename to Installer-USB-Stick/scripts/mount-stick-repo.sh
diff --git a/Installer-USB-Stick/start_in_qemu.txt b/Installer-USB-Stick/start_in_qemu.txt
index 133487ee38b111599c5e6e2b095184369ae61ba1..4d532030c9664adb333d7f7554ecd9e17c22c630 100755
--- a/Installer-USB-Stick/start_in_qemu.txt
+++ b/Installer-USB-Stick/start_in_qemu.txt
@@ -1,3 +1,4 @@
-/usr/bin/qemu -boot c -m 128 -hda '/dev/sdb' -net none -localtime
-/usr/bin/qemu-system-x86_64 -boot c -m 128 -hda '/dev/sdb' -net none -localtime
-/usr/bin/qemu-i386 -boot c -m 128 -hda '/dev/sdb' -net none -localtime
+qemu -boot c -m 128 -hda /dev/sdX -net none -localtime
+qemu-system-x86_64 -boot c -m 128 -hda /dev/sdX -net none -localtime
+qemu-i386 -boot c -m 128 -hda /dev/sdX -net none -localtime
+qemu-system-x86_64 -enable-kvm -hda /dev/sdX -net none -localtime
diff --git a/Installer-USB-Stick/usbrepo/create_offline_repo.sh b/Installer-USB-Stick/usbrepo/create_offline_repo.sh
deleted file mode 100755
index a77c103ffbb37da638decaf0954f37136f68c1d8..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/usbrepo/create_offline_repo.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-PKG_LIST="python-numpy python-simpy python-scipy python-matplotlib ipython python-dev gnuplot wxmaxima kmplot network-manager-vpnc-gnome openssh-server linux-firmware-nonfree swi-prolog fish get-flash-videos gnome haskell-platform java7-jdk imagemagick rxvt-unicode vim zsh zsh-doc texmaker gimp pidgin smplayer subversion git lftp inkscape"
-DESTINATION="/isodevice"
-PKG_DESTINATION=$DESTINATION/archives
-
-#begin
-echo "creating structure..."
-mkdir -p $PKG_DESTINATION/
-echo "done."
-echo "downloading archives. this may take some time..."
-wget -nc -P $PKG_DESTINATION $(apt-get install --reinstall --print-uris -qq $PKG_LIST | cut -d"'" -f2)
-#wget -nc -P $PKG_DESTINATION $(apt-get -o APT::Architecture=$ARCHITECTURE install --reinstall --allow-unauthenticated --print-uris -qq $PKG_LIST | cut -d"'" -f2)
-echo "done."
-
-#end.
diff --git a/Installer-USB-Stick/usbrepo/paketliste_new b/Installer-USB-Stick/usbrepo/paketliste_new
deleted file mode 100644
index 6a93875ca495f47d510f3b3636adfae426dd6947..0000000000000000000000000000000000000000
--- a/Installer-USB-Stick/usbrepo/paketliste_new
+++ /dev/null
@@ -1,58 +0,0 @@
-aptitude
-adobe-flash-plugin
-automake
-cmake
-build-essential
-aspell-de
-ffmpeg
-htop
-hunspell
-hunspell-de
-lvm2
-mencoder
-screen
-tofrodos
-eifbootmanager
-gdisk
-smartmontools
-linux-headers
-vlc
-moreutils
-mdadm
-cm-super
--- LATEX ZEUG AUS DEM WIKI
-networkmanager-vpnc-gnome
-vim
-
-USB-REPO
-openssh-server
-swiprolog
-firmware-linux-nonfree
-gnome
-(xubuntu-desktop)
-haskell-platform
-java7-jdk
-texmaker
-gimp
-pidgin
-subversion
-git
-lftp
-inkscape
-graphviz
-python
-python-numpy
-python-simpy
-python-scipy
-python-matplotlib
-ipython
-python-dev
-gnuplot
-wxmaxima
-gufw
-fityk
-unrar
-7zip
-pwgen
-
-vpnc-config import script ding von rikus auf den stick legen