Changeset 3457 for llx-netinstall


Ignore:
Timestamp:
Jan 31, 2017, 1:56:54 PM (3 years ago)
Author:
mabarracus
Message:

Improved d-i-late-command & Infantil flavour disabled

Location:
llx-netinstall/trunk/fuentes
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • llx-netinstall/trunk/fuentes/debian/changelog

    r3432 r3457  
     1llx-netinstall (0.57) xenial; urgency=medium
     2
     3  * Improved d-i-late-command & Infantil flavour disabled
     4
     5 -- M.Angel Juan <m.angel.juan@gmail.com>  Tue, 31 Jan 2017 13:50:59 +0100
     6
    17llx-netinstall (0.56.1) xenial; urgency=medium
    28
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/d-i-late-command

    r3134 r3457  
    1414        param="desktop"
    1515    fi
    16     case $param in
    17         "client")
    18             SERVER="http://mirror/llx16"
    19         ;;
    20 #       NOT AVAILABLE IN NETINSTALL
    21 #       "server")
    22 #           SERVER="file:///net/mirror/llx1605"
    23 #       ;;
    24         "desktop")
    25             SERVER="http://lliurex.net/xenial"
    26         ;;
    27         ## INFANTIL CASE AND OTHERS
    28         *)
    29             SERVER="http://lliurex.net/xenial"
    30         ;;
    31     esac
     16    if [ -n "${force_server}" ]; then
     17        SERVER="${force_server}"
     18    else
     19        case $param in
     20            "client")
     21            SERVER="http://mirror/llx16"
     22        ;;
     23#       NOT AVAILABLE IN NETINSTALL
     24#       "server")
     25#           SERVER="file:///net/mirror/llx1605"
     26#       ;;
     27        "desktop")
     28            SERVER="http://mirror/llx16"
     29        ;;
     30        ## INFANTIL CASE AND OTHERS
     31        *)
     32            SERVER="http://mirror/llx16"
     33        ;;
     34        esac
     35    fi
    3236   
    3337    echo "# LliureX Net-Installation ${param}"  > ${BASE_DIR}/etc/apt/sources.list
     
    3539    echo "deb ${SERVER} xenial-updates main universe restricted multiverse"  >> ${BASE_DIR}/etc/apt/sources.list
    3640    echo "deb ${SERVER} xenial-security main universe restricted multiverse"  >> ${BASE_DIR}/etc/apt/sources.list
     41    if [ "$param" = "infantil" ]; then
     42        echo "deb ${SERVER} xenial preschool" >> ${BASE_DIR}/etc/apt/sources.list
     43    fi
    3744}
    3845
     
    4956fi
    5057
    51 class=$(cat /proc/cmdline |sed -r "s%.*preseed/url=http://preseed/([a-zA-Z_\-]+).cfg .*%\1%")
     58class=$(cat /proc/cmdline |sed -r "s%.*preseed/url=http://preseed/([a-zA-Z_-]+).cfg\.*%\1%i;tx;d;:x")
     59base_class=$(echo $class|cut -d- -f1|tr [A-Z] [a-z])
    5260
    53 put_apt_conf ${BASE_DIR} ${class}
     61force_server=$(cat /proc/cmdline |sed -r "s%.*force_server=(http://[0-9a-zA-Z_/.:-]+).*%\1%i;tx;d;:x")
    5462
     63put_apt_conf ${BASE_DIR} ${base_class}
     64
     65if [ "x$base_class" = "xinfantil" ]; then
     66    in-target apt-get update
     67    in-target apt-get -y install lliurex-meta-infantil
     68fi
    5569exit 0
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/infantil-stats.cfg

    r2996 r3457  
    11d-i     preseed/include string  common.cfg unattended.cfg
    22ldap-auth-config ldap-auth-config/ldapns/ldap-server string ldap://127.0.0.1/
    3 d-i     pkgsel/include  string  lliurex-meta-infantil
     3d-i     pkgsel/include  string  lliurex-meta-desktop
    44lliurex-statistics lliurex-statistics/unattended  boolean    true
    55lliurex-statistics lliurex-statistics/acknowledge select  true
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/infantil.cfg

    r1486 r3457  
    11d-i     preseed/include string  common.cfg unattended.cfg
    22ldap-auth-config ldap-auth-config/ldapns/ldap-server string ldap://127.0.0.1/
    3 d-i     pkgsel/include  string  lliurex-meta-infantil
     3d-i     pkgsel/include  string  lliurex-meta-desktop
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/amd64/boot-screens/txt.cfg

    r239 r3457  
    1111        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/desktop.cfg net.ifnames=0 biosdevname=0
    1212
    13 label install Infantil
    14         menu label ^Install Infantil
    15         kernel ubuntu-installer/amd64/linux
    16         append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0
     13#label install Infantil
     14#        menu label ^Install Infantil
     15#        kernel ubuntu-installer/amd64/linux
     16#        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/amd64/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0
    1717
    1818#label install gva
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/var/lib/tftpboot/ltsp/netinstall/ubuntu-installer/i386/boot-screens/txt.cfg

    r239 r3457  
    1111        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/desktop.cfg net.ifnames=0 biosdevname=0
    1212
    13 label install Infantil
    14         menu label ^Install Infantil
    15         kernel ubuntu-installer/i386/linux
    16         append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0
     13#label install Infantil
     14#        menu label ^Install Infantil
     15#        kernel ubuntu-installer/i386/linux
     16#        append video=vesa:ywrap,mtrr vga=788 initrd=ubuntu-installer/i386/initrd.lz auto=true priority=critical preseed/url=http://preseed/infantil.cfg net.ifnames=0 biosdevname=0
    1717
    1818#label install gva
Note: See TracChangeset for help on using the changeset viewer.