Merge lp:~bennabiy/ltsp/ltsp-LM into lp:~ltsp-upstream/ltsp/ltsp-trunk

[ben-Nabiy Derush]

Bug Fix for Initial LinuxMint support

[lp:~bennabiy/ltsp/ltsp-LM]

2489. By Launchpad Translations on behalf of ltsp-upstream on 2013-10-03

Launchpad automatic translations update.

2490. By Launchpad Translations on behalf of ltsp-upstream on 2013-10-04

Launchpad automatic translations update.

2491. By Vagrant Cascadian on 2013-11-04

ltsp-localappsd: move call to ltsp-localappsd into a function, reducing code
duplication.

2492. By Vagrant Cascadian on 2013-11-04

ltsp-localappsd: Only use su if running as a different user,
currently use in ltsp6 prof-of-concept code.

2493. By Vagrant Cascadian on 2013-11-06

Merge LinuxMint fixes.

=== modified file 'common/ltsp-common-functions'
--- common/ltsp-common-functions	2013-09-25 22:50:09 +0000
+++ common/ltsp-common-functions	2013-11-06 01:54:32 +0000
@@ -101,15 +101,15 @@
         . /etc/sysconfig/ltspdist
         echo "$VENDORDEF"
     else
-        LSB_VENDOR=$(lsb_release --id --short | tr " " "_")
-        if [ "$LSB_VENDOR" = LinuxMint ]; then
+        lsb_vendor=$(lsb_release --id --short | tr " " "_")
+        if [ "$lsb_vendor" = LinuxMint ]; then
             if [ "$(lsb_release -s -c)" = "debian" ]; then
                 echo "Debian"
             else
                 echo "Ubuntu"
             fi
         else
-            echo "$LSB_VENDOR"
+            echo "$lsb_vendor"
         fi
     fi
 }
 
=== modified file 'server/share/ltsp/plugins/ltsp-build-client/Ubuntu/000-basic-configuration'
--- server/share/ltsp/plugins/ltsp-build-client/Ubuntu/000-basic-configuration	2013-09-25 22:50:09 +0000
+++ server/share/ltsp/plugins/ltsp-build-client/Ubuntu/000-basic-configuration	2013-11-06 01:54:32 +0000
@@ -2,16 +2,8 @@
     configure)
         ARCH=${ARCH:-"$(dpkg --print-architecture)"}
         APT_GET_OPTS=${APT_GET_OPTS:-"-y"}
-        if [ -n "$MINT_DIST" ] || ( [ "$LSB_VENDOR" = "LinuxMint" ] && [ -z "$DIST" ] ); then
-            MINT_DIST=${MINT_DIST:-"$(lsb_release -s -c)"}
-            DIST=${DIST:-$(sed -n 's/base_codename=//p' "/usr/share/mintsources/$MINT_DIST/mintsources.conf")}
-            MINT_MIRROR=${MINT_MIRROR:-"http://packages.linuxmint.com"}        
-            MINT_COMPONENTS=${MINT_COMPONENTS:-"main upstream import"}
-            EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client mint-meta-core"}
-        else
-            DIST=${DIST:-"$(lsb_release -s -c)"}
-            EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
-        fi
+        DIST=${DIST:-"$(lsb_release -s -c)"}
+        EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
         COMPONENTS=${COMPONENTS:-"main restricted universe multiverse"}
         OVERRIDE_EXPORTS=${OVERRIDE_EXPORTS:-"true"}
         export DEBIAN_PRIORITY=critical
 
=== added file 'server/share/ltsp/plugins/ltsp-build-client/Ubuntu/001-set-mint-dist'
--- server/share/ltsp/plugins/ltsp-build-client/Ubuntu/001-set-mint-dist	1970-01-01 00:00:00 +0000
+++ server/share/ltsp/plugins/ltsp-build-client/Ubuntu/001-set-mint-dist	2013-11-06 01:54:32 +0000
@@ -0,0 +1,18 @@
+case "$MODE" in
+    commandline)
+        add_option "mint-dist" "`eval_gettext "set the linuxmint distribution to be used for install, defaults to running distribution"`" "regular" "true"
+        LSB_RELEASE_C="$(lsb_release -s -c)"
+        LSB_RELEASE_I="$(lsb_release -s -i)"
+        ;;
+    configure)
+        if [ -n "$option_mint_dist_value" ] || [ "$LSB_RELEASE_I" = "LinuxMint" ]; then
+            APT_KEYS=${APT_KEYS:-"/usr/share/keyrings/linuxmint-keyring.gpg"}
+            MINT_DIST=${option_mint_dist_value:-"$LSB_RELEASE_C"}
+            DIST=$(sed -n 's/base_codename=//p' "/usr/share/mintsources/$MINT_DIST/mintsources.conf")
+            MINT_MIRROR=${MINT_MIRROR:-"http://packages.linuxmint.com"}        
+            MINT_COMPONENTS=${MINT_COMPONENTS:-"main upstream import"}
+            EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
+            LATE_PACKAGES=${LATE_PACKAGES:-"linuxmint-keyring mint-meta-core mint-artwork-common"}
+        fi
+        ;;
+esac