From: Michael Hanke <michael.hanke@gmail.com>
Date: Wed, 3 Nov 2010 20:52:54 +0000 (-0400)
Subject: Fixes.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=69c4f2b5c45f4d4b760a89641b5e8db7bac7ed3b;p=neurodebian.git

Fixes.
---

diff --git a/debian/changelog b/debian/changelog
index 4fc8522..3115cc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-neurodebian (0.9) squeeze; urgency=low
+neurodebian (0.10) squeeze; urgency=low
 
   * Initial release.
 
- -- Michael Hanke <michael.hanke@gmail.com>  Wed, 03 Nov 2010 16:36:24 -0400
+ -- Michael Hanke <michael.hanke@gmail.com>  Wed, 03 Nov 2010 16:53:06 -0400
diff --git a/etc/xdg/autostart/vmsetupwizard.desktop b/etc/xdg/autostart/vmsetupwizard.desktop
index c6ccdd5..6cad50d 100644
--- a/etc/xdg/autostart/vmsetupwizard.desktop
+++ b/etc/xdg/autostart/vmsetupwizard.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=NeuroDebian VirtualMachine setup wizard
 Comment=Runs once to perform final configuration steps
-Exec=[ ! -e /etc/neurodebian/guest/setupwizard_done ] && nd-vmsetupwizard
+Exec=bash -c "[ ! -e /etc/neurodebian/guest/setupwizard_done ] && nd-vmsetupwizard"
 Terminal=false
 Type=Application
diff --git a/tools/nd-vmsetupwizard b/tools/nd-vmsetupwizard
index ca91553..d9f4046 100755
--- a/tools/nd-vmsetupwizard
+++ b/tools/nd-vmsetupwizard
@@ -21,33 +21,6 @@ zenity --info $icon_opt --title="NeuroDebian Setup Wizard" \
        --text="Welcome to the NeuroDebian virtual machine!
 
 This is the first time you have started this virtual machine. We will now perform a few simple steps to finalize its configuration. This includes upgrading the system to the latest available versions and installing additional software packages upon your request."
-
-# install custom filter for synaptics
-sudo mkdir -p /root/.synaptic
-sudo cat << EOT >> /root/.synaptic/filters
-filter "NeuroDebian" {
-  section {
-    inclusive false;
-    sections {
-    };
-  };
-  status {
-    flags 0x1ffff;
-  };
-  pattern {
-    andMode 0;
-    patterns {
-      Origin; "neuro.debian.net"; false;
-      Maintainer; "team@neuro.debian.net"; false;
-    };
-  };
-  priority {
-  };
-  reducedview {
-    enabled false;
-  };
-};
-EOT
 fi
 
 if ! zenity --question $icon_opt --title="NeuroDebian Setup Wizard" \
@@ -72,8 +45,35 @@ if [ ! -e /etc/popularity-contest.conf ]; then
 	nd-autoinstall popularity-contest /etc/popularity-contest.conf || true
 fi
 
-# essential things are done -- let's mark sucess
+# install custom filter for synaptics
 if [ $first_run -eq 1 ]; then
+	sudo mkdir -p /root/.synaptic
+	sudo bash -c 'cat << EOT >> /root/.synaptic/filters
+filter "NeuroDebian" {
+  section {
+    inclusive false;
+    sections {
+    };
+  };
+  status {
+    flags 0x1ffff;
+  };
+  pattern {
+    andMode 0;
+    patterns {
+      Origin; "neuro.debian.net"; false;
+      Maintainer; "team@neuro.debian.net"; false;
+    };
+  };
+  priority {
+  };
+  reducedview {
+    enabled false;
+  };
+};
+EOT
+'
+	# essential things are done -- let's mark sucess
 	sudo bash -c "mkdir -p $cfg_dir && touch $success_flag"
 fi
 
diff --git a/tools/nd_setupguestos b/tools/nd_setupguestos
index 14aa5c0..0c8c8ee 100644
--- a/tools/nd_setupguestos
+++ b/tools/nd_setupguestos
@@ -73,17 +73,6 @@ apt-get purge $(apt-cache search --names-only --installed xserver-xorg-video | g
 # and whatever is obsolete
 apt-get autoremove --purge
 
-# install network manager applet
-# but we don't want to have all the openvpn stuff that pull in an armada of
-# things: I did it by hand in aptitude
-
-# next step purge network interface config to give the power to network manager
-# important
-#adduser brain netdev
-
-#apt-get install flashplugin-nonfree sun-java6-plugin
-
-
 # custom config
 # use NeuroDebian website as default homepage
 sed -i -e 's,http://www.debian.org,http://neuro.debian.net,g' /etc/chromium-browser/master_preferences