From e6fef4ca3c35353f58341b1a125f59932019434e Mon Sep 17 00:00:00 2001
From: Christopher <christopher.spinrath@rwth-aachen.de>
Date: Thu, 13 Mar 2014 16:30:35 +0100
Subject: [PATCH] libnsa for LIP Image

---
 .../customize-lip/customize                   |   9 +-
 .../customize-lip/customize_initrd            |  10 ++
 .../customize-lip/initrd_hook/ORDER           |   2 +
 .../customize-lip/libnsa/26libnsa             | 101 ++++++++++++++++++
 .../customize-lip/libnsa/libnsa.desktop       |  11 ++
 .../customize-lip/libnsa/libnsa.sh            |   9 ++
 6 files changed, 139 insertions(+), 3 deletions(-)
 create mode 100755 Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa
 create mode 100644 Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.desktop
 create mode 100644 Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh

diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize
index 3730005..d1a6c30 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize
@@ -30,10 +30,13 @@ function install_packages()
 
 	aptitude full-upgrade -y # make sure we have the newest versions
 	# Some daily images do not have a kernel ?!?
-	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 
+	
+	#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 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 firefox thunderbird
+	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
 
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
index 31b754e..88037c6 100755
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/customize_initrd
@@ -40,6 +40,15 @@ function install_nmtelekinese()
 	chmod +x "$IRD/scripts/casper-bottom/26mopsmops"
 }
 
+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/"
+        chmod +x "$IRD/scripts/casper-bottom/26libnsa"
+}
+
 function add_no_bootloader_icon()
 {
 	mkdir -p "$IRD/lip/no-bootloader-icon"
@@ -51,6 +60,7 @@ function add_no_bootloader_icon()
 
 mkdir -p "$IRD/lip"
 install_nmtelekinese
+install_libnsa
 add_no_bootloader_icon
 
 #copy custom lip hook
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
index 689624a..09be46c 100644
--- a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/initrd_hook/ORDER
@@ -48,6 +48,8 @@
 [ -e /conf/param.conf ] && . /conf/param.conf
 /scripts/casper-bottom/26mopsmops
 [ -e /conf/param.conf ] && . /conf/param.conf
+/scripts/casper-bottom/26libnsa
+[ -e /conf/param.conf ] && . /conf/param.conf
 /scripts/casper-bottom/30accessibility
 [ -e /conf/param.conf ] && . /conf/param.conf
 /scripts/casper-bottom/31disable_update_notifier
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa
new file mode 100755
index 0000000..012a9f5
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/26libnsa
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+PREREQ=""
+DESCRIPTION="libnsa loader"
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+. /scripts/casper-functions
+load_confmodule
+
+log_begin_msg "$DESCRIPTION"
+
+LIBNSALOGO=$(cat <<EOF
+begin-base64 664 -
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYC0u
+YCcuLScKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+YC0uICAgICAgICAuLScuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgIGAtLiAgICAtLi9cLi0gICAgLi0nCiAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAtLiAgL198XCAgLi0KICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgYC0uICAgYC9fX19fXCcgICAu
+LScuCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGAtLiAgICAt
+Li8uLSIiLS5cLi0gICAgICAnCiAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgIGAtLiAgLzwgKCgpKSA+XCAgLi0nCiAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAtICAgLmAvX19gLS4uLSdfX1wnICAgLi0K
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsLi4uYC0uL19fX3xf
+X19ffF9fX1wuLScuLC4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAsLScgICAsYCAuIC4gJywgICBgLSwKICAgICAgICAgICAgICAgICAg
+ICAgICAgICAgICAgICAsLScgICBfX19fX19fX19fX19fX19fICBgLSwKICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAsJy9fX19ffF9fX19f
+fF9fX19fXAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLyAv
+X198X19fX198X19fX198X19fXAogICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAvIC98X19fX198X19fX198X19fX198X1wKICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAnIC9fX19ffF9fX19ffF9fX19ffF9fX19f
+XAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAuJyAvX198X19fX198
+X19fX198X19fX198X19fXAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICwnIC98X19fX198X19fX198X19fX198X19fX198X1wKLCwtLS0nJy0tLi4u
+X19fLi4uLS0nJyctLS4uIC8uLi9fX19ffF9fX19ffF9fX19ffF9fX19ffF9f
+X19fXCAuLi0tYGBgLS0uLi5fX18uLi4tLWBgLS0tLCwKICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgJy4uL19ffF9fX19ffF9fX19ffF9fX19ffF9fX19f
+fF9fX1wKICAgICAgXCAgICApICAgICAgICAgICAgICAnLjovfF9fX19ffF9f
+X19ffF9fX19ffF9fX19ffF9fX19ffF9cICAgICAgICAgICAgICAgKCAgICAv
+CiAgICAgIClcICAvICkgICAgICAgICAgICwnOi4vX19fX3xfX19fX3xfX19f
+X3xfX19fX3xfX19fX3xfX19fX1wgICAgICAgICAgICAgKCBcICAvKAogICAg
+IC8gLyAoICggICAgICAgICAgIC86Li4vX198X19fX198X19fX198X19fX198
+X19fX198X19fX198X19fXCAgICAgICAgICAgICApICkgXCBcCiAgICB8IHwg
+ICBcIFwgICAgICAgICAvLi4uL3xfX19fX3xfX19fX3xfX19fX3xfX19fX3xf
+X19fX3xfX19fX3xfXCAgICAgICAgICAgLyAvICAgfCB8CiAuLS5cIFwgICAg
+XCBcICAgICAgICcuLjovX19fX3xfX19fX3xfX19fX3xfX19fX3xfX19fX3xf
+X19fX3xfX19fX1wgICAgICAgICAvIC8gICAgLyAvLi0uCig9ICApXCBgLl8u
+JyB8ICAgICAgIFw6Li8gXyAgXyBfX18gIF9fX18gX19fXyBfICAgIF8gXyBf
+IF8gXyAgXyBfX19cICAgICAgICB8IGAuXy4nIC8oICA9KQogXCAoXykgICAg
+ICAgKSAgICAgICBcLi8gIHxcL3wgfF9fKSB8X19fIHxfX18gfF9fXyBfWF8g
+X1hfICBcLyAgX3xfIFwgICAgICAgKCAgICAgICAoXykgLwogIFwgICAgYC0t
+LS0nICAgICAgICAgIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIi
+IiIiIiIiIiIiIiIiIiIiICAgICAgIGAtLS0tJyAgICAvCiAgIFwgICBfX19f
+XF9fICAgICAgICAgIF9fIF9fICAgIF8gIF9fIF8gICAgIF8gIF9fIF9fX19f
+X19fICAgIF9fX19fICAgICAgICBfXy9fX19fICAgLwogICAgXCAoPVwgICAg
+IFwgICAgICAgIChfIHxfIHxWfHxfKXxfIHxfKSAgIHxffChfIC8gICB8ICB8
+ICAgIHxfICB8ICAgICAgICAvICAgICAvLSkgLwogICAgIFxfKV9cICAgICBc
+ICAgICAgIF9fKXxfX3wgfHwgIHxfX3wgXCAgIHwgfF9fKVxfX198X198XyAg
+IHwgIF98XyAgICAgIC8gICAgIC9fKF8vCiAgICAgICAgICBcICAgICBcICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+ICAgICAgICAvICAgICAvCiAgICAgICAgICAgKSAgICAgKSAgXyAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8gICgg
+ICAgICgKICAgICAgICAgICggICAgICgsLScgYC0uLl9fICAgICAgICAgICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgX18uLi0nIGAtLCkgICAgICkKICAg
+ICAgICAgICBcXy4tJycgICAgICAgICAgYGAtLi5fX19fICAgICAgICAgICAg
+ICAgICAgX19fXy4uLScnICAgICAgICAgIGBgLS5fLwogICAgICAgICAgICBg
+LS5fICAgICAgICAgICAgICAgICAgICBgYC0tLi4uX19fXy4uLi0tJycgICAg
+ICAgICAgICAgICAgICAgIF8uLScKICAgICAgICAgICAgICAgIGAtLi5fICAg
+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
+Xy4uLScKICAgICAgICAgICAgICAgICAgICAgYC0uLl9fICAgICAgICAgIEFM
+VC5BU0NJSS1BUlQgICAgICAgICAgICAgX18uLi0nCiAgICAgICAgICAgICAg
+ICAgICAgICAgICAgIGBgLS4uX19fXyAgICAgICAgICAgICAgICAgIF9fX18u
+Li0nJwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBgYC0t
+Li4uX19fXy4uLi0tJycKTUpQCg==
+====
+EOF)
+
+echo $LIBNSALOGO | busybox uudecode
+
+# Starting nmtelekinese with the MoPS network
+cp /lip/libnsa/libnsa.sh /root/usr/bin/
+chroot /root mkdir -m 755 -p /home/${USERNAME}/.config/autostart
+cp /lip/libnsa/libnsa.desktop /root/home/${USERNAME}/.config/autostart
+chroot /root chmod 755 /home/${USERNAME}/.config/autostart/libnsa.desktop
+chroot /root chown -R ${USERNAME}:${USERNAME} /home/${USERNAME}/.config
+
+log_end_msg
+
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.desktop b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.desktop
new file mode 100644
index 0000000..3f5aaa6
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.desktop
@@ -0,0 +1,11 @@
+
+[Desktop Entry]
+Type=Application
+Exec=/bin/bash /usr/bin/libnsa.sh
+Hidden=false
+NoDisplay=false
+X-GNOME-Autostart-enabled=true
+Name[de_DE]=LIP Statistik
+Name=LIP statistic
+Comment[de_DE]=Speichert statistische Hardware Informationen auf dem LIP-Stick
+Comment=Speichert statistische Hardware Informationen auf dem LIP-Stick
diff --git a/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh
new file mode 100644
index 0000000..6ea1548
--- /dev/null
+++ b/Installer-USB-Stick/UbuntuCustomizationKit/customize-lip/libnsa/libnsa.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+DUMPDIR="$(mktemp -d --tmp-dir /cdrom/lipstats/ .stats.XXXXXXXXXXXX)"
+
+mkdir -p "$DUMPDIR"
+
+uname -a > "$DUMPDIR/uname" 2> "$DUMPDIR/uname.err"
+dmidecode > "$DUMPDIR/dmidecode" 2> "$DUMPDIR/dmidecode.err"
+lspci -k > "$DUMPDIR/lspci" 2> "$DUMPDIR/lspci.err"
+lsusb > "$DUMPDIR/lsusb" 2> "$DUMPDIR/lsusb.err"
-- 
GitLab