← Back to branch summary

~eugenenuke/ubuntu/wily/console-setup/fix-for-1565542

« back to all changes in this revision

Viewing changes to debian/console-setup.initramfs-top

  • Committer: Evgeniy Yanyuk
  • Date: 2016-04-09 08:27:03 UTC
  • Revision ID: eugenenuke@gmail.com-20160409082703-za15wnb1h45jra53
https://launchpad.net/bugs/1565542
* Properly handle settings CODESET and FONSIZE when they equals 'guess' or are unset.
  - console-setup-tty, debian/console-setup.initramfs-hook,
    debian/console-setup.initramfs-top
  (LP: #1565542) 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/console-setup.initramfs-top
20
20
 
21
21
[ "$ACTIVE_CONSOLES" ] || exit 0
22
22
 
 
23
# CODESET
 
24
[ "$CODESET" != guess ] || CODESET=''
 
25
if [ -z "$CODESET" ]; then
 
26
    case "$CHARMAP" in
 
27
        UTF-8)            CODESET=Uni2;;
 
28
        ARMSCII-8)        CODESET=Armenian ;;
 
29
        CP1251)           CODESET=CyrSlav ;;
 
30
        CP1255)           CODESET=Hebrew ;;
 
31
        CP1256)           CODESET=Arabic ;;
 
32
        GEORGIAN-ACADEMY) CODESET=Georgian ;;
 
33
        GEORGIAN-PS)      CODESET=Georgian ;;
 
34
        IBM1133)          CODESET=Lao ;;
 
35
        ISIRI-3342)       CODESET=Arabic ;;
 
36
        ISO-8859-1)       CODESET=Lat15 ;;
 
37
        ISO-8859-2)       CODESET=Lat2 ;;
 
38
        ISO-8859-3)       CODESET=Lat38 ;;
 
39
        ISO-8859-4)       CODESET=Lat7 ;; # sometimes Lat15
 
40
        ISO-8859-5)       CODESET=CyrSlav ;;
 
41
        ISO-8859-6)       CODESET=Arabic ;;
 
42
        ISO-8859-7)       CODESET=Greek ;;
 
43
        ISO-8859-8)       CODESET=Hebrew ;;
 
44
        ISO-8859-9)       CODESET=Lat15 ;;
 
45
        ISO-8859-10)      CODESET=Lat15 ;;
 
46
        ISO-8859-11)      CODESET=Thai ;;
 
47
        ISO-8859-13)      CODESET=Lat7 ;;
 
48
        ISO-8859-14)      CODESET=Lat38 ;;
 
49
        ISO-8859-15)      CODESET=Lat15 ;;
 
50
        ISO-8859-16)      CODESET=Lat2 ;;
 
51
        KOI8-R)           CODESET=CyrKoi ;;
 
52
        KOI8-U)           CODESET=CyrKoi ;;
 
53
        TIS-620)          CODESET=Thai ;;
 
54
        VISCII)           CODESET=Vietnamese ;;
 
55
        *)                  ;;
 
56
    esac
 
57
fi
 
58
 
 
59
# FONTSIZE
 
60
if [ -z "$FONTSIZE" -o "$FONTSIZE" = guess ]; then
 
61
    FONTSIZE=16
 
62
fi
 
63
case "$FONTSIZE" in
 
64
    8x*)
 
65
        FONTSIZE=${FONTSIZE#*x}
 
66
        ;;
 
67
    *x8)
 
68
        FONTSIZE=${FONTSIZE%x*}
 
69
        ;;
 
70
    *x*)
 
71
        a=${FONTSIZE%x*}
 
72
        b=${FONTSIZE#*x}
 
73
        if [ "$a" -lt "$b" ]; then
 
74
            FONTSIZE=${b}x${a}
 
75
        fi
 
76
        ;;
 
77
esac
 
78
 
23
79
if [ "$VERBOSE_OUTPUT" = yes ]; then
24
80
        verbose=
25
81
else
45
101
        else
46
102
                FONT="/etc/console-setup/$CODESET-$FONTFACE$FONTSIZE.psf"
47
103
        fi
48
 
        if [ -f "$FONT" ]; then
 
104
        if [ -f "$FONT" ] || [ -f "$FONT.gz" ]; then
49
105
                if type consolechars >/dev/null 2>&1; then
50
106
                        eval consolechars -v --tty=$console -f "$FONT" $verbose
51
107
                elif type setfont >/dev/null 2>&1; then
59
115
        else
60
116
                ACM="/etc/console-setup/$CHARMAP.acm"
61
117
        fi
62
 
        if [ -f "$ACM" ]; then
 
118
        if [ -f "$ACM" ] || [ -f "$ACM.gz" ]; then
63
119
                if type consolechars >/dev/null 2>&1; then
64
120
                        eval consolechars -v --tty=$console --acm "$ACM" \
65
121
                                $verbose