~vcs-imports/apt-setup/main

« back to all changes in this revision

Viewing changes to generators/92volatile

  • Committer: bubulle
  • Date: 2010-12-07 21:05:38 UTC
  • Revision ID: vcs-imports@canonical.com-20101207210538-u2pmkx0mvnd2hqyj
Support the new suite name for "volative". Closes: #605640

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
        codename="$RET"
19
19
        db_get mirror/suite
20
20
        suite="$RET"
 
21
 
 
22
        if [ "$codename" != "lenny" ]; then
 
23
                db_get mirror/protocol
 
24
                protocol="$RET"
 
25
                db_get mirror/$protocol/hostname
 
26
                host="$RET"
 
27
                db_get mirror/$protocol/directory
 
28
                directory="/${RET#/}"
 
29
        fi
21
30
else
22
31
        db_get cdrom/codename
23
32
        codename="$RET"
35
44
done
36
45
 
37
46
# Don't test mirror if no network selected in netcfg
38
 
echo "deb http://$host/debian-volatile $codename/volatile $dists" >> $file
 
47
if [ "$codename" = "lenny" ]; then
 
48
        echo "deb http://$host/debian-volatile $codename/volatile $dists" >> $file
 
49
else
 
50
        echo "deb $protocol://${host}${directory} ${codename}-updates $dists" >> $file
 
51
fi
39
52
if db_get netcfg/dhcp_options && \
40
53
   [ "$RET" = "Do not configure the network at this time" ]; then
41
54
        CODE=9
52
65
        fi
53
66
fi
54
67
 
55
 
echo "deb-src http://$host/debian-volatile $codename/volatile $dists" >> $file
 
68
if [ "$codename" = "lenny" ]; then
 
69
        echo "deb-src http://$host/debian-volatile $codename/volatile $dists" >> $file
 
70
else
 
71
        echo "deb-src $protocol://${host}${directory} ${codename}-updates $dists" >> $file
 
72
fi
56
73
 
57
74
exit $CODE