Changeset 1419 for ubiquity


Ignore:
Timestamp:
May 6, 2016, 12:11:55 PM (3 years ago)
Author:
kbut
Message:

update patch to sources list

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ubiquity/trunk/fuentes/debian/patches/apt-setup.patch

    r1418 r1419  
    11diff -Nuar ubiquity.orig/scripts/apt-setup ubiquity/scripts/apt-setup
    2 --- ubiquity.orig/scripts/apt-setup     2013-02-19 09:42:07.124890898 +0100
    3 +++ ubiquity/scripts/apt-setup  2013-02-19 11:28:32.708555319 +0100
    4 @@ -1,15 +1,54 @@
     2--- ubiquity.orig/scripts/apt-setup     2016-05-06 11:37:55.616665198 +0200
     3+++ ubiquity/scripts/apt-setup  2016-05-06 12:09:13.496609604 +0200
     4@@ -1,15 +1,22 @@
    55 #! /bin/sh -e
    6 +SOURCES="/target/etc/apt/sources.list"
    7 +COMPONENTS="main restricted universe multiverse partner"
    8 +DISTRO="xenial"
    9 +MIRROR="mirror"
    10 +HTTPPROT="http://"
    11 +LLIUREXNET="lliurex.net/xenial"
    12 +write_desktop_sources(){
    136 
    147-. /usr/share/debconf/confmodule
    15 +cat <<EOF
    16 +# LliureX
     8+COMPONENTS="main restricted universe multiverse"
     9+DISTRO="$(lsb_release -cs | awk '{ print $2 }')"
     10+ORIGINAL="/etc/apt/sources.list"
     11+SOURCES="/target/etc/apt/sources.list"
     12+CDROMSOURCES="/target/etc/apt/sources.list.d/cdrom.list"
     13+append_cdrom_pool(){
     14+       cat <<EOF
    1715+deb file:///cdrom $DISTRO $COMPONENTS
    18 +deb $HTTPPROT$LLIUREXNET $DISTRO $COMPONENTS
    19 +#deb-src $HTTPPROT$LLIUREXNET $DISTRO $COMPONENTS
    2016+EOF
    21 +
    2217+}
    23 +write_desktop_sources_commented(){
    24 +
    25 +cat <<EOF
    26 +# LliureX
    27 +#deb $HTTPPROT$LLIUREXNET $DISTRO $COMPONENTS
    28 +#deb-src $HTTPPROT$LLIUREXNET $DISTRO $COMPONENTS
    29 +EOF
    30 +
    31 +}
    32 +
    33 +write_localmirror_sources(){
    34 +
    35 +cat <<EOF
    36 +# LliureX
    37 +deb $HTTPPROT$MIRROR $DISTRO $COMPONENTS
    38 +#deb-src $HTTPPROT$MIRROR $DISTRO $COMPONENTS
    39 +EOF
    40 +
    41 +}
    42 +
    43 +write_server_sources(){
    44 +
    45 +write_desktop_sources_commented
    46 +write_localmirror_sources
    47 +
    48 +}
    49 +case "$(lliurex-version -v 2>/dev/null)" in
    50 +       "*server"|"*client")
    51 +                       write_server_sources > "$SOURCES"
    52 +                      write_desktop_sources_commented >> "$SOURCES"
    53 +       ;;
    54 +       *)
    55 +                       write_desktop_sources > "$SOURCES"
    56 +       ;;
    57 +esac
    58 +
    59 +exit 0
    6018 
    6119-if CODENAME="$(lsb_release -cs)"; then
     
    6321-       db_set mirror/suite "$CODENAME"
    6422-       db_set mirror/codename "$CODENAME"
    65 -fi
    66 -
     23+if [ -e "$ORIGINAL" ];
     24+       cp $ORIGINAL $SOURCES
     25 fi
     26 
    6727-rm -f /target/etc/apt/sources.list
    6828-rm -f /target/etc/apt/sources.list.d/dvd.list
     
    7030-       OVERRIDE_BASE_INSTALLABLE=1 OVERRIDE_LEAVE_CD_MOUNTED=1 \
    7131-       /usr/lib/ubiquity/apt-setup/apt-setup --log-output /target
     32+if [ -d "/cdrom/pool" ]; then
     33+       append_cdrom_pool > $CDROMSOURCES
     34+fi
     35+
     36+exit 0
Note: See TracChangeset for help on using the changeset viewer.