From 84e2fff36e650ebf9d055e975078c3895c79e01b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 17 Nov 2011 18:15:27 -0500
Subject: [PATCH 1/2] CC-3058: Extranenous string during install process
-fixed
---
python_apps/pypo/install/pypo-initialize.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py
index 1217d59c3..1ee867f4f 100644
--- a/python_apps/pypo/install/pypo-initialize.py
+++ b/python_apps/pypo/install/pypo-initialize.py
@@ -35,7 +35,7 @@ def is_natty():
"""
def get_os_codename():
try:
- p = Popen("which lsb_release", shell=True)
+ p = Popen("which lsb_release > /dev/null", shell=True)
sts = os.waitpid(p.pid, 0)[1]
if (sts == 0):
From ceb9a37b40d3de870278a41fac010dca9d9cbc00 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 17 Nov 2011 18:19:29 -0500
Subject: [PATCH 2/2] CC-3057: Uninstall no longer includes text about how to
completely remove files in /etc/airtime and /src/airtime
-fixed
---
install_minimal/airtime-uninstall | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/install_minimal/airtime-uninstall b/install_minimal/airtime-uninstall
index cf6ae6d75..4fdca540b 100755
--- a/install_minimal/airtime-uninstall
+++ b/install_minimal/airtime-uninstall
@@ -22,4 +22,7 @@ $SCRIPTPATH/include/airtime-remove-files.sh
#Remove pypo user
python $SCRIPTPATH/../python_apps/remove-pypo-user.py
-echo -e "\n****************************** Uninstall Complete *******************************"
+echo -e "\n****************************** Uninstall Complete *******************************\n"
+echo "NOTE: To fully remove all Airtime files, you will also have to manually delete"
+echo " the directories '/srv/airtime'(default storage location of media files)"
+echo -e " and '/etc/airtime'(where the config files are stored).\n"