Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud

miscellaneous/context/ubuntu/etc/context/cleanup.sh

+#!/bin/bash
+
+#rm -f /etc/ssh/ssh_host_*
+stop rsyslog
+rm -fr /home/cloud/.bash_history /root/.bash_history /var/log/*

miscellaneous/context/ubuntu/etc/context/init.d/00hostname

+#!/bin/bash
+
+echo "En vagyok a $0 !"
+
+hostname "$HOSTNAME"
+echo "$HOSTNAME" > /etc/hostname
+sed "s/\(127\.0\.1\.1\).*/\1\t$HOSTNAME/" -i /etc/hosts
+

miscellaneous/context/ubuntu/etc/context/init.d/00sshd

+#!/bin/bash
+
+echo "En vagyok a $0 !"
+
+/etc/init.d/ssh stop
+dpkg-reconfigure openssh-server
+/etc/init.d/ssh start
+

miscellaneous/context/ubuntu/etc/context/init.d/01passwd

+#!/bin/bash
+
+echo "En vagyok a $0 !"
+
+echo "$USER:$USERPW" | chpasswd
+

miscellaneous/context/ubuntu/etc/context/init.d/02sshfs

+#!/bin/bash
+
+echo "En vagyok a $0 !"
+
+mkdir -p "$HOME/.ssh"
+echo "$SSHPRIV" > $HOME/.ssh/id_rsa
+chmod 600 "$HOME/.ssh/id_rsa"
+mkdir "$HOME/sshfs"
+chown "$USER:$USER" -R "$HOME"
+
+sed -i "s/^\(<\/pam_mount>.*\)/<volume user=\"$USER\" fstype=\"fuse\" path=\"sshfs#${NEPTUN}@${SERVER}:home\" mountpoint=\"~\/sshfs\" options=\"nonempty,reconnect,StrictHostKeyChecking=no\" \/>\n\1/" /etc/security/pam_mount.conf.xml

miscellaneous/context/ubuntu/etc/context/init.d/03profile

+#!/bin/bash
+
+echo "En vagyok a $0 !"
+
+echo "export NEPTUN=$NEPTUN"  >> $HOME/.profile
+

miscellaneous/context/ubuntu/etc/context/init.d/04booturl

+#!/bin/bash
+
+echo "En vagyok a $0 !"
+
+wget -q -O /dev/null "$BOOTURL"
+
+

miscellaneous/context/ubuntu/etc/context/init.sh

+#!/bin/bash
+
+export BASEDIR=$(dirname $0)
+export USER="cloud"
+export HOME=$(awk -F: -v u=$USER '$1==u{print $6}' /etc/passwd)
+
+cd "$BASEDIR"
+
+mount -t iso9660 /dev/cdrom1 "$BASEDIR/mnt" 2> /dev/null
+
+if [ $? -eq 0 -a -f "$BASEDIR/firstrun" -a -f "$BASEDIR/mnt/context.sh" ]; then
+	. "$BASEDIR/mnt/context.sh"
+
+	# hogy tudom kiexportalni ennel szebben ezeket a valtozokat?
+	eval `grep -o '^[a-zA-Z0-9]\+=' "$BASEDIR/mnt/context.sh" | while read x; do echo export ${x%=};done`
+
+	run-parts "$BASEDIR/init.d"
+
+	rm "$BASEDIR/firstrun"
+else
+	echo "mar korabban lefutott!"
+fi
+
+umount /dev/cdrom1 2>/dev/null
+eject /dev/cdrom1
+exit 0

miscellaneous/thinclient/mimeapps.list

@@ -3,6 +3,7 @@
 application/nx-session=gedit.desktop;
 x-scheme-handler/rdp=rdp.desktop
 x-scheme-handler/nx=rdp.desktop
+x-scheme-handler/shell=rdp.desktop
 
 [Default Applications]
 text/html=chromium-browser.desktop

miscellaneous/thinclient/rdp.sh → miscellaneous/thinclient/rdp

@@ -127,11 +127,11 @@ nx)
 A
 	/usr/NX/bin/nxclient --session $f
 ;;
-ssh)
+shell)
 	#/usr/NX/bin/nxclient --dialog ok --message "Jelszó: $password" &
-	rm /home/user/.ssh/known_hosts
+	#rm /home/user/.ssh/known_hosts
 	#rxvt-unicode -e sh -c "ssh $user@$host -p$port; sleep 2"
-	rxvt-unicode -e sh -c "sshpass -p "$password" ssh -o StrictHostKeyChecking=no $user@$host -p$port; sleep 2"
+	gnome-terminal -e "sshpass -p "$password" ssh -o StrictHostKeyChecking=no $user@$host -p$port"
 ;;
 *)
 	xmessage "$scheme is not supported."