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

[ben-Nabiy Derush]

Linux Mint support for Mint from 13 - Latest

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

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

2487. By ben-Nabiy Derush on 2013-09-01

Made links to Ubuntu files which differ from the Debian config, but are the same in Ubuntu config.

[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]

2488. By ben-Nabiy Derush on 2013-09-01

Removed Ubuntu specific artwork reference, and linked 030-fat-client to Debian

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

Patched detect_vendor() to correct VENDOR and updated scripts within parent distro to detect LinuxMint and apply special settings.

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

Removed LinuxMint plugin folder.

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

2503. By ben-Nabiy Derush on 2013-09-27

Updating with Upstream

2504. By ben-Nabiy Derush on 2013-09-27

Bug Squashing - Ubuntu distribution not being selected.

2505. By ben-Nabiy Derush on 2013-09-27

Fixing variables in 000-basic-configuration

2506. By ben-Nabiy Derush on 2013-09-27

changed case on lsb_vendor variable to reflect local, rather than global

2507. By ben-Nabiy Derush on 2013-09-27

Bug-Fix escaped ( )

2508. By ben-Nabiy Derush on 2013-09-27

Fix per alkisg: change order of tests.

2509. By ben-Nabiy Derush on 2013-09-27

Reverted 000-basic-configuration and added 001-set-mint-dist

Unmerged revisions

2509. By ben-Nabiy Derush on 2013-09-27

Reverted 000-basic-configuration and added 001-set-mint-dist

2508. By ben-Nabiy Derush on 2013-09-27

Fix per alkisg: change order of tests.

2507. By ben-Nabiy Derush on 2013-09-27

Bug-Fix escaped ( )

2506. By ben-Nabiy Derush on 2013-09-27

changed case on lsb_vendor variable to reflect local, rather than global

2505. By ben-Nabiy Derush on 2013-09-27

Fixing variables in 000-basic-configuration

2504. By ben-Nabiy Derush on 2013-09-27

Bug Squashing - Ubuntu distribution not being selected.

2503. By ben-Nabiy Derush on 2013-09-27

Updating with Upstream

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

Typo

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

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

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

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

=== modified file 'common/ltsp-common-functions'
--- common/ltsp-common-functions	2013-01-14 20:18:23 +0000
+++ common/ltsp-common-functions	2013-09-25 04:36:02 +0000
@@ -97,12 +97,22 @@
 }
 
 detect_vendor() {
-    if [ -e /etc/sysconfig/ltspdist ]; then
+	CURVEND=$(lsb_release --id --short | tr " " "_")	
+	case $CURVEND in
+		LinuxMint)
+			if [ $(lsb_release -s -c) = "debian" ]; then
+				VENDOR="Debian"
+			else
+				VENDOR="Ubuntu"
+			fi;;
+	    	*) 
+	if [ -e /etc/sysconfig/ltspdist ]; then
         . /etc/sysconfig/ltspdist
         echo "$VENDORDEF"
     else
         echo $(lsb_release --id --short | tr " " "_")
-    fi
+    fi;;
+	esac
 }
 
 # Distros may override this function to implement their own

=== modified file 'server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration'
--- server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration	2012-05-14 18:44:39 +0000
+++ server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration	2013-09-25 04:36:02 +0000
@@ -2,8 +2,18 @@
     configure)
         ARCH=${ARCH:-"$(dpkg --print-architecture)"}
         APT_GET_OPTS=${APT_GET_OPTS:-"-y"}
-        DIST=${DIST:-"$(lsb_release -s -c)"}
-        MIRROR=${MIRROR:-"http://cdn.debian.net/debian"}
+		
+		# TODO: Code below is to fix LinuxMint		
+		if [ $(lsb_release -s -i) = "LinuxMint" ]; then
+				MINTDIST=${DIST:-"$(lsb_release -s -c)"}
+				DIST=${DIST:-"sid")
+				MINT_MIRROR="http://packages.linuxmint.com"        
+				MINTCOMPONENTS="main upstream import"			
+			else
+				DIST=${DIST:-"$(lsb_release -s -c)"}
+        		COMPONENTS=${COMPONENTS:-"main"}
+			fi                
+		MIRROR=${MIRROR:-"http://cdn.debian.net/debian"}
         COMPONENTS=${COMPONENTS:-"main"}
         EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
         DEBOOTSTRAPOPTS=${DEBOOTSTRAPOPTS:-"--variant=minbase"}

=== 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 04:36:02 +0000
@@ -2,9 +2,19 @@
     configure)
         ARCH=${ARCH:-"$(dpkg --print-architecture)"}
         APT_GET_OPTS=${APT_GET_OPTS:-"-y"}
-        DIST=${DIST:-"$(lsb_release -s -c)"}
-        COMPONENTS=${COMPONENTS:-"main restricted universe multiverse"}
-        EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
+			if [ $(lsb_release -s -i) = "LinuxMint" ]; then
+				MINTDIST=${DIST:-"$(lsb_release -s -c)"}
+				DIST=${DIST:-"$(grep base_codename /usr/share/mintsources/`lsb_release -c -s`/mintsources.conf | awk '{split($0,array,"=")} END{print array[2]}')}
+				MINT_MIRROR="http://packages.linuxmint.com"        
+				MINTCOMPONENTS="main upstream import"
+				EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client mint-meta-core"}
+				LATE_PACKAGES=${LATE_PACKAGES:-"mint-meta-mate"}
+			else
+				DIST=${DIST:-"$(lsb_release -s -c)"}
+        		COMPONENTS=${COMPONENTS:-"main restricted universe multiverse"}
+				EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"}
+			fi        
+		
         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 04:36:02 +0000
@@ -22,7 +22,13 @@
         fi
         ;;
     after-install)
+	if [ -n $MINTDIST ]; then
+		add_mirrors "$MINT_MIRROR $MINTDIST $MINTCOMPONENTS"
         add_mirrors "$UPDATES_MIRROR $DIST-updates $COMPONENTS"
         add_mirrors "$SECURITY_MIRROR $DIST-security $COMPONENTS"
+	else
+		add_mirrors "$UPDATES_MIRROR $DIST-updates $COMPONENTS"
+        add_mirrors "$SECURITY_MIRROR $DIST-security $COMPONENTS"
+	fi
         ;;
 esac

=== modified file 'server/share/ltsp/plugins/ltsp-build-client/Ubuntu/030-artwork'
--- server/share/ltsp/plugins/ltsp-build-client/Ubuntu/030-artwork	2012-05-14 18:44:39 +0000
+++ server/share/ltsp/plugins/ltsp-build-client/Ubuntu/030-artwork	2013-09-25 04:36:02 +0000
@@ -2,7 +2,9 @@
     finalization)
         if [ -n "$FAT_CLIENT_DESKTOPS" ]; then
             desktops="$FAT_CLIENT_DESKTOPS"
-        else
+        elif [ -n "$MINTDIST" ]; then
+			desktops=$(dpkg -l | sed -n 's/^ii.*\<\(.*mate-desktop\)\>.*/\1/p')
+		else
             desktops=$(dpkg -l | sed -n 's/^ii.*\<\(.*buntu-desktop\)\>.*/\1/p')
         fi
         # Prefer artwork for desktops other than then default ubuntu one