Changeset 2663 for llx-netinstall


Ignore:
Timestamp:
Oct 21, 2016, 3:04:25 PM (3 years ago)
Author:
mabarracus
Message:

Fix detection

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

Legend:

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

    r2659 r2663  
    88Package: llx-netinstall
    99Architecture: all
    10 Depends: ${shlibs:Depends}, ${misc:Depends}, n4d-dnsmasq (>= 1.41), apache2 | httpd, lliurex-base-files
     10Depends: ${shlibs:Depends}, ${misc:Depends}, n4d-dnsmasq (>= 1.41), apache2 | httpd
    1111Description: lliurex network installation
    1212 Package to install pc from net image in server
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/common.cfg

    r2659 r2663  
    159159
    160160#Final command
    161 d-i preseed/late_command string d-i-late-command /target ; busybox poweroff
     161d-i preseed/late_command string wget -O /d-i-late-command http://preseed/d-i-late-command ; /d-i-late-command /target ; busybox poweroff
    162162
    163163#reboot options
  • llx-netinstall/trunk/fuentes/install.llx-netinstall/usr/share/llx-netinstall/templates/d-i-late-command

    r2661 r2663  
    1818            SERVER="http://mirror/llx1605"
    1919        ;;
    20         "server")
    21             SERVER="file:///net/mirror/llx1605"
    22         ;;
     20#       NOT AVAILABLE IN NETINSTALL
     21#       "server")
     22#           SERVER="file:///net/mirror/llx1605"
     23#       ;;
    2324        "desktop")
    2425            SERVER="http://lliurex.net/xenial"
    2526        ;;
     27        ## INFANTIL CASE AND OTHERS
    2628        *)
    2729            SERVER="http://lliurex.net/xenial"
     
    4749fi
    4850
    49 # Initial tool dependence checking
    50 llx_version_bin="$(which lliurex-version)"
     51class=$(cat /proc/cmdline |sed -r "s%.*preseed/url=http://preseed/([a-zA-Z_\-]+).cfg .*%\1")
    5152
    52 if [ -z "${llx_version_bin}" ]; then
    53     exit 1
    54 fi
    55 
    56 # Put right sources.list
    57 for class in {client,server,desktop}; do
    58     lliurex-version -t ${class} && put_apt_conf ${BASE_DIR} ${class}
    59 done
     53put_apt_conf ${BASE_DIR} ${class}
    6054
    6155exit 0
Note: See TracChangeset for help on using the changeset viewer.