Fix JAVA_HOME, fix /etc/pam.d access
Change-Id: I4a44ad6d61d0096e64b64fcd09131ef91919628d
diff --git a/opt-setup.sh b/opt-setup.sh
index ee3b0cc..7c64126 100644
--- a/opt-setup.sh
+++ b/opt-setup.sh
@@ -139,8 +139,7 @@
export ONOS_ROOT=~/onos
export KARAF_ROOT=~/Applications/apache-karaf-3.0.2
source onos/tools/dev/bash_profile
-echo $JAVA_HOME
-export JAVA_HOME=""
+unset $JAVA_HOME
cd onos && mvn clean install && mvn dependency:go-offline && cd -
cp onos/tools/package/branding/target/onos-branding-1.0.1-SNAPSHOT.jar Applications/apache-karaf-3.0.2/lib/
@@ -155,8 +154,8 @@
EOF
# Setup profile
-echo "unset JAVA_HOME" >> ~/.profile
echo "source $ONOS_ROOT/tools/dev/bash_profile" >> ~/.profile
+echo "unset JAVA_HOME" >> ~/.profile
echo "sudo service onos stop > /dev/null 2>&1" >> ~/.profile
echo "cell optical > /dev/null 2>&1" >> ~/.profile
diff --git a/tutorial1-setup.sh b/tutorial1-setup.sh
index 71e5b5d..533be0e 100644
--- a/tutorial1-setup.sh
+++ b/tutorial1-setup.sh
@@ -45,7 +45,7 @@
sudo sed -i 's/disable=0/disable=1/g' /etc/lxdm/default.conf
# Allow VM to be rebooted from GUI
-echo "session required pam_systemd.so" >> /etc/pam.d/lxdm
+echo "session required pam_systemd.so" | sudo tee --append /etc/pam.d/lxdm
wget -O onos.png "https://gerrit.onosproject.org/gitweb?p=onos-vm.git;a=blob_plain;hb=refs/heads/onos-tutorial;f=onos.png"
sudo cp onos.png /usr/share/backgrounds/default.png