diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
index a2c1b6f27d94ef7cb81fb79c7f14702e18391dd9..ebb1e1bc15163b81c6003170e64e8aa93d34193d 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip32/customize
@@ -14,8 +14,9 @@ function prepare_install()
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
+ #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
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
index a2c1b6f27d94ef7cb81fb79c7f14702e18391dd9..245dfe5c3391778ea7dca8ad13472fd37889460a 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip64/customize
@@ -13,9 +13,10 @@ 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
+
+ #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
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/lip-remaster b/Installer-USB-Stick/UbuntuCustomizationKit/lip-remaster
index b7dfc3a3a382ee9304ca8f7b1769922930c789ee..78c59fb1d4e8209778f90169061cf9ddf0583751 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/lip-remaster
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/lip-remaster
@@ -214,6 +214,8 @@ function lip_prepare_isofs()
cp -v "$REMASTER_HOME32/remaster-iso/casper/vmlinuz" "$REMASTER_BOTH/remaster-iso/casper/vmlinuz32"
cp -v "$REMASTER_HOME64/remaster-iso/casper/initrd.lz" "$REMASTER_BOTH/remaster-iso/casper/initrd64.lz"
cp -v "$REMASTER_HOME32/remaster-iso/casper/initrd.lz" "$REMASTER_BOTH/remaster-iso/casper/initrd32.lz"
+
+ cp -v "$REMASTER_HOME32/remaster-iso/.disk/casper-uuid-generic" "$REMASTER_BOTH/remaster-iso/.disk/casper-uuid-generic-32"
}
function lip_mksquashfs()
diff --git a/Installer-USB-Stick/scripts/infuse_offline_repo.sh b/Installer-USB-Stick/scripts/infuse_offline_repo.sh
index 857edd4f578e58d39f0664c7635d5e1938589482..d843d1e05a977fa2154f30a17946ec398445f2f0 100755
--- a/Installer-USB-Stick/scripts/infuse_offline_repo.sh
+++ b/Installer-USB-Stick/scripts/infuse_offline_repo.sh
@@ -14,10 +14,11 @@ source "$MY_DIR/mount-stick-repo.sh" #detect mountpoint
if [ -n "$MPOINT" ]; then
SOURCE_PATH="$MPOINT"
- SRC_LST=/etc/apt/sources.list.d/lipoffline.list #"$(mktemp --suffix=".list")"
- echo "deb [ trusted=yes ] file:$SOURCE_PATH/archives precise lip" > $SRC_LST
+ #SRC_LST=/etc/apt/sources.list.d/lipoffline.list #"$(mktemp --suffix=".list")"
+ #echo "deb [ trusted=yes ] file:$SOURCE_PATH/archives precise lip" > $SRC_LST
#apt-get -o Dir::Etc::SourceList=$SRC_LST update
- apt-get update
+ #apt-get update
+ /bin/bash $MY_DIR/liprepoctl.sh on "$SOURCE_PATH"
else
echo "No stick, no repo; good luck."
exit 1
diff --git a/Installer-USB-Stick/scripts/linuxparty.sh b/Installer-USB-Stick/scripts/linuxparty.sh
old mode 100755
new mode 100644
index 5bef1bb219b3e3db03546502e9a76d491aca03ce..3ef9b45b29250b6a64a8c7e22687e295a3bb9702
--- a/Installer-USB-Stick/scripts/linuxparty.sh
+++ b/Installer-USB-Stick/scripts/linuxparty.sh
@@ -3,7 +3,7 @@
set -e
MY_DIR="$( readlink -f "$( dirname "${BASH_SOURCE[0]}" )" )"
-HIVE_DIR="/media/MultiBoot/hive/" #we assume here that the LIP install stick is mounted at /media/MultiBoot... better idea?
+HIVE_DIR="$MY_DIR/../hive/" #we assume here that the LIP install stick is mounted at /media/MultiBoot... better idea?
#Packetlisten zur Installation/Auswahl, nur Packete die im Repo liegen.
#Hive-Programme (z.B. root) müssen extra behandelt werden
@@ -21,10 +21,10 @@ COMMON_PKGS=(\
"TRUE" "pidgin" "Multi-Messenger-Client" \
"FALSE" "subversion" "Versionsverwaltungstool (zentral)" \
"TRUE" "git" "Versionsverwaltungstool (dezentral)" \
-"TRUE" "graphviz" " " \
+"TRUE" "graphviz" "Tool zum visualisieren von Graphen" \
"FALSE" "gnome" "GNOME3 Desktop Umgebung" \
"FALSE" "xubuntu-desktop" "Xubuntu Desktop Umgebung und standard Programme" \
-"FALSE" "fityk" "keine Ahnung..." \
+"FALSE" "fityk" "Tool zum Daten-Fitting und -Analyse" \
"FALSE" "openssh-server" "SSH-Server (s. KISS)" \
"FALSE" "zsh" "Alternative Shell" \
"FALSE" "zsh-doc" "Dokumentation von zsh" \
@@ -36,13 +36,13 @@ COMMON_PKGS=(\
PH_PKGS=(\
"TRUE" "python-numpy" "Numeric Bibiliothek für Python" \
-"TRUE" "python-simpy" "keine Ahnung..." \
-"TRUE" "python-scipy" "dito..." \
-"TRUE" "python-matplotlib" "Schnittstelle um mit Python zu plotten" \
-"TRUE" "ipython" "Python wie auf iOS??" \
-"TRUE" "gnuplot" "Programm um Funktions-und Datenplots anzufertigen" \
-"TRUE" "wxmaxima" "pff..." \
-"TRUE" "bpython" "..." \
+"TRUE" "python-simpy" "Simulationsframework für Python" \
+"TRUE" "python-scipy" "Bibliothek für scientific computing" \
+"TRUE" "python-matplotlib" "Schnittstelle zum Plotten mit Python" \
+"TRUE" "ipython" "Interaktiver Python Interpreter mit Tab-Vervollständgung" \
+"TRUE" "gnuplot" "Programm um Funktions- und Datenplots anzufertigen" \
+"TRUE" "wxmaxima" "Graphische Benutzeroberfläche für das Maxima Computer Algebra System" \
+"TRUE" "bpython" "Ein weiterer interaktiver Python Interpreter" \
)
IF_PKGS=(\
@@ -219,6 +219,10 @@ install_if() {
install_pkgs "Packete für Informatiker/Programmierung installieren?" "Programme, die der OSAK/die ALUG für sinnvoll hält, sind bereits zur Installation vorselektiert.\nWenn du keine Packete aus der Liste installieren willst, einfach Abbrechen.\nBitte beachten: Das LIP-Script deinstalliert keine Packete, insbesondere also keine Packete die in einem früheren Lauf aktiv waren,\nund diesmal nicht ausgewählt sind!" IF_PKGS
}
+echo "Entferne Ubuntu Installer (bleibt manchmal über...)"
+apt-get purge ubiquity --yes
+apt-get autoremove --yes
+
echo
echo "Auf dem Install-USB-Stick liegen viele der zu installierenden Packete"
bright "Es ist dringend empfohlen, jetzt einen Instaĺl-USB-Stick einzustecken"
@@ -318,12 +322,13 @@ then
echo "Entpacke "$archive
$DEBUG tar -C "$HOME" -xf "$archive"
done
+ CORES=`cat /proc/cpuinfo | grep processor | wc -l`
+ echo "$CORES CPUs gefunden... benutze sie zum ROOT compilen"
$DEBUG pushd "$HOME/root" || err "ROOT konnte nicht extrahiert werden..."
$DEBUG ./configure
- $DEBUG make
+ $DEBUG make -j$CORES
$DEBUG popd
- $DEBUG cp "$HIVE_DIR/root_env.sh" "/etc/profile.d/root_env.sh"
- $DEBUG chmod +x "/etc/profile.d/root_env.sh"
+ $DEBUG cat "$HIVE_DIR/root_env.sh" >> "$HOME/.bashrc"
ok "ROOT erfolgreich installiert"
fi
fi
@@ -338,5 +343,8 @@ PKGS_EXTRA="fityk openssh-server linux-firmware-nonfree zsh zsh-doc lftp graphvi
echo "Auf dem Installer-USB-Stick sind außerdem noch die folgenden Packete enthalten:"
echo ${PKGS_EXTRA}
echo "Installiere diese Packete bei Bedarf bitte selbst mit 'sudo apt-get install <Packetname>' "
-#end;
+echo "Deaktiviere LIP Software Repository"
+bash $MY_DIR/liprepoctl.sh off
+
+#end;
diff --git a/Installer-USB-Stick/scripts/liprepoctl.sh b/Installer-USB-Stick/scripts/liprepoctl.sh
new file mode 100644
index 0000000000000000000000000000000000000000..3cb7a5861565b85d6f19b7ae74e6a136493c59c1
--- /dev/null
+++ b/Installer-USB-Stick/scripts/liprepoctl.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+ACTION="$1"
+FILENAME="/etc/apt/sources.list.d/lipoffline.list"
+ACTIVATED=`test -e "$FILENAME"`
+
+function install_repo()
+{
+ echo "# offline repository of the linux install party
+deb [ trusted=yes ] file://$1/archives precise lip" > "$FILENAME"
+}
+
+function uninstall_repo()
+{
+ rm -f "$FILENAME"
+}
+
+case $ACTION in
+ "on")
+ if [ -z "$2" ]; then
+ echo "No repository location specified!"
+ exit 2
+ fi
+ install_repo "$2"
+ apt-get update
+ echo "Repository is now active, remember to call \"$0 off\" to deactivate it when you are done."
+ ;;
+ "off")
+ uninstall_repo
+ apt-get update
+ echo "Repository is now inactive."
+ ;;
+ "check")
+ echo "State: $ACTIVATED"
+ ;;
+ *)
+ echo "Unknown action $ACTION"
+ exit 1
+ ;;
+esac
diff --git a/Praesenation/Desktop_Slideshow/lxde.png b/Praesenation/Desktop_Slideshow/lxde.png
new file mode 100644
index 0000000000000000000000000000000000000000..35afe9d2e0f431c8d8f8e07c9b9d9ca19f425551
Binary files /dev/null and b/Praesenation/Desktop_Slideshow/lxde.png differ