Changeset 3305

Timestamp:

Jan 16, 2017, 12:57:10 PM (2 years ago)

Author:

joamuran

Message:

fixed 094-lliurex plugin for ltsp

File:

• lmd/trunk/fuentes/lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/Ubuntu/094-lliurex (modified) (1 diff)

lmd/trunk/fuentes/lmd-lliurex-data.install/usr/share/ltsp/plugins/ltsp-build-client/Ubuntu/094-lliurex

@@ -1 +1 @@
 case "$MODE" in
-        finalization)
-        case "$CHROOT" in
-                'llx-client' | 'llx-lite' | 'llx-musica' | 'llx-pime' | ' llx-infantil' | 'llx-desktop')
-                cp /usr/share/lliurex-apt/skels/client.list $ROOT/etc/apt/sources.list
-                ;;
-                *)
-                cp /etc/apt/sources.list $ROOT/etc/apt/sources.list
-                cp /etc/apt/sources.list.d/*.list $ROOT/etc/apt/sources.list.d/ || true
-                ;;
-        esac
+        commandline)
+                add_option "lliurex-sourceslist" "`eval_gettext "add sources.list properly for lliurex systems"`" "advanced" "false"
+                ;;
+        configure)
+                if [ "true" = "$option_lliurex-sourceslist_value" ]; then
+                        LLIUREX_SOURCESLIST="true"
+                fi      
+                ;;
+        finalization)
 
-        [ ! -d /opt/ltsp/$CHROOT/net/mirror/llx1605 ] || umount -l /opt/ltsp/$CHROOT/net/mirror/llx16
-        # Working about nsswitch and friends
-        if [ -f /opt/ltsp/$CHROOT/etc/ldap.conf ] ; then
-                rm -f /opt/ltsp/$CHROOT/etc/ldap.conf 
-                touch /opt/ltsp/$CHROOT/root/etc.ldap.conf
-        fi
-        if [ -f /opt/ltsp/$CHROOT/etc/ldap/ldap.conf ] ; then
-                rm -f /opt/ltsp/$CHROOT/etc/ldap/ldap.conf 
-                touch /opt/ltsp/$CHROOT/root/etc.ldap.ldap.conf
-        fi
-        ;;
+                #case "$CHROOT" in
+                #       'llx-client' | 'llx-lite' | 'llx-musica' | 'llx-pime' | ' llx-infantil' | 'llx-desktop')
+
+                if [ "true" = "$LLIUREX_SOURCESLIST" ]; then
+                        cp /usr/share/lliurex-apt/skels/client.list $ROOT/etc/apt/sources.list
+                else
+                        cp /etc/apt/sources.list $ROOT/etc/apt/sources.list
+                        cp /etc/apt/sources.list.d/*.list $ROOT/etc/apt/sources.list.d/ || true
+                fi
+
+                [ ! -d /opt/ltsp/$CHROOT/net/mirror/llx16 ] || umount -l /opt/ltsp/$CHROOT/net/mirror/llx16
+                # Working about nsswitch and friends
+                if [ -f /opt/ltsp/$CHROOT/etc/ldap.conf ] ; then
+                        rm -f /opt/ltsp/$CHROOT/etc/ldap.conf
+                        touch /opt/ltsp/$CHROOT/root/etc.ldap.conf
+                fi
+                if [ -f /opt/ltsp/$CHROOT/etc/ldap/ldap.conf ] ; then
+                        rm -f /opt/ltsp/$CHROOT/etc/ldap/ldap.conf
+                        touch /opt/ltsp/$CHROOT/root/etc.ldap.ldap.conf
+                fi
+                ;;
 esac
 
-