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

[ben-Nabiy Derush]

This branch enables LinuxMint native support in ltsp-build-client. It enables a user of Linux Mint 13 through current (15) to build a client without getting an error. Up until now, if a user of Linux Mint wanted to build a client, they would need to ln -s /usr/share/ltsp/plugins/ltsp-build-client/Ubuntu /usr/share/ltsp/plugins/ltsp-build-client/LinuxMint and then issue the command with a --dist=(Matching Ubuntu distribution ) e.g. ltsp-build-client --dist=precise (If the machine was Linux Mint 13 (LTS) )

As of current, the building of the client is still mainly an Ubuntu client, but with the Mint repositories made available.

To test - Install Linux Mint {13,14,15}, apt-get install ltsp-standalone-server openssh-server as per UbuntuLTSP install. If you immediately build a client, it will say unknown dist (mint dist).

After applying these changes, you could build a client from a stock install of LTSP.

[Vagrant Cascadian (vagrantc)]

Most plugins seem to be copies of ubuntu plugins, but should rather be symlinks to the appropriate plugins. Some of the plugins should also be reviewed for appropriateness for Mint- the 030-artwork plugin references ubuntu-specific packages. Good start on a proof of concept, though!

review: Needs Fixing

[Vagrant Cascadian (vagrantc)]

just remove 030-artwork, and review other symlinks to make sure they're valid for mint, and it looks good.

[ben-Nabiy Derush (bennabiy)]

> just remove 030-artwork, and review other symlinks to make sure they're valid
> for mint, and it looks good.

Done. Should be ready as of last push.

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

2491. By ben-Nabiy Derush on 2013-09-25

Fixed vendor_detect() patch

2492. By ben-Nabiy Derush on 2013-09-25

Added missing " on line 8

2493. By ben-Nabiy Derush on 2013-09-25

Patches made according to vagrantc's suggestions.

2494. By ben-Nabiy Derush on 2013-09-25

Decomplication of 030-artwork
This line and the following will be ignored --------------

modified:
  server/share/ltsp/plugins/ltsp-build-client/Ubuntu/030-artwork

2495. By ben-Nabiy Derush on 2013-09-25

Whitespace war...

2496. By ben-Nabiy Derush on 2013-09-25

More changes... Removed whitespace tabs, etc.

2497. By ben-Nabiy Derush on 2013-09-25

Try again! More whitespace war...

2498. By ben-Nabiy Derush on 2013-09-25

INDENTured...

2499. By ben-Nabiy Derush on 2013-09-25

Almost there...

2500. By ben-Nabiy Derush on 2013-09-25

Is this the one? Updated detect_vendor() and renamed various variables...

2501. By ben-Nabiy Derush on 2013-09-25

modified:
  server/share/ltsp/plugins/ltsp-build-client/Ubuntu/000-basic-configuration

2502. By ben-Nabiy Derush on 2013-09-25

Typo

[Vagrant Cascadian (vagrantc)]

This looks good. Will merge it soon.

[Vagrant Cascadian (vagrantc)]

merged as a single commit and pushed.

review: Approve

=== modified file 'common/ltsp-common-functions'
--- common/ltsp-common-functions	2013-01-14 20:18:23 +0000
+++ common/ltsp-common-functions	2013-09-25 21:11:08 +0000
@@ -101,7 +101,16 @@
         . /etc/sysconfig/ltspdist
         echo "$VENDORDEF"
     else
-        echo $(lsb_release --id --short | tr " " "_")
+        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"
+        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	2012-08-02 17:57:00 +0000
+++ server/share/ltsp/plugins/ltsp-build-client/Ubuntu/000-basic-configuration	2013-09-25 21:11:08 +0000
@@ -2,9 +2,17 @@
     configure)
         ARCH=${ARCH:-"$(dpkg --print-architecture)"}
         APT_GET_OPTS=${APT_GET_OPTS:-"-y"}
-        DIST=${DIST:-"$(lsb_release -s -c)"}
+        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
         COMPONENTS=${COMPONENTS:-"main restricted universe multiverse"}
-        EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
         OVERRIDE_EXPORTS=${OVERRIDE_EXPORTS:-"true"}
         export DEBIAN_PRIORITY=critical
         BOOTSTRAP=${BOOTSTRAP:-"debootstrap"}

=== modified file 'server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors'
--- server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors	2012-08-02 17:57:00 +0000
+++ server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors	2013-09-25 21:11:08 +0000
@@ -22,6 +22,9 @@
         fi
         ;;
     after-install)
+        if [ -n "$MINT_DIST" ]; then
+            add_mirrors "$MINT_MIRROR $MINT_DIST $MINT_COMPONENTS"
+        fi    
         add_mirrors "$UPDATES_MIRROR $DIST-updates $COMPONENTS"
         add_mirrors "$SECURITY_MIRROR $DIST-security $COMPONENTS"
         ;;