Merge lp:~vorlon/debian-cd/drop-archaic-install_languages into lp:~ubuntu-cdimage/debian-cd/ubun3

Proposed by Steve Langasek
Status: Merged
Merged at revision: 2063
Proposed branch: lp:~vorlon/debian-cd/drop-archaic-install_languages
Merge into: lp:~ubuntu-cdimage/debian-cd/ubun3
Prerequisite: lp:~xnox/debian-cd/drop-di-s390x
Diff against target: 62 lines (+0/-19)
4 files modified
tools/boot/groovy/boot-amd64 (+0/-2)
tools/boot/groovy/boot-arm64 (+0/-2)
tools/boot/groovy/boot-ppc64el (+0/-2)
tools/boot/groovy/common.sh (+0/-13)
To merge this branch: bzr merge lp:~vorlon/debian-cd/drop-archaic-install_languages
Reviewer Review Type Date Requested Status
Dimitri John Ledkov (community) Approve
Ubuntu CD Image Team Pending
Review via email: mp+384394@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/boot/groovy/boot-amd64'
2--- tools/boot/groovy/boot-amd64 2020-04-24 14:51:48 +0000
3+++ tools/boot/groovy/boot-amd64 2020-05-21 22:05:16 +0000
4@@ -191,8 +191,6 @@
5 ;;
6 esac
7
8-#install_languages $CDDIR
9-
10 # Only disk one gets the extra files installed
11 #
12 if [ "$NN" = "1" ]; then
13
14=== modified file 'tools/boot/groovy/boot-arm64'
15--- tools/boot/groovy/boot-arm64 2020-04-24 14:51:48 +0000
16+++ tools/boot/groovy/boot-arm64 2020-05-21 22:05:16 +0000
17@@ -123,8 +123,6 @@
18 echo -n "-append_partition 2 0xef $CDDIR/boot/grub/efi.img -e boot/grub/efi.img -no-emul-boot " >> $N.mkisofs_opts
19 fi
20
21-#install_languages $CDDIR
22-
23 # Only disk one gets the extra files installed
24 #
25 if [ "$NN" = "1" ]; then
26
27=== modified file 'tools/boot/groovy/boot-ppc64el'
28--- tools/boot/groovy/boot-ppc64el 2020-04-24 14:51:48 +0000
29+++ tools/boot/groovy/boot-ppc64el 2020-05-21 22:05:16 +0000
30@@ -32,8 +32,6 @@
31 exit 0
32 fi
33
34-install_languages $CDDIR
35-
36 echo -n "--netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
37 > $N.mkisofs_opts
38 echo -n " -chrp-boot -iso-level 4" >> $N.mkisofs_opts
39
40=== modified file 'tools/boot/groovy/common.sh'
41--- tools/boot/groovy/common.sh 2020-04-24 14:51:48 +0000
42+++ tools/boot/groovy/common.sh 2020-05-21 22:05:16 +0000
43@@ -3,19 +3,6 @@
44 # by the various boot-<arch> scripts.
45
46
47-# install_languages decompacts the language packs, you should give the path
48-# to the CD temporary tree.
49-# This function should be called for all bootable images.
50-install_languages() {
51- # Param $1 is the CD directory
52- if [ -f "$MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz" ]
53- then
54- mkdir $1/.xlp
55- (cd $1/.xlp; \
56- tar zxf $MIRROR/dists/$DI_CODENAME/main/disks-$ARCH/current/xlp.tgz )
57- fi
58-}
59-
60 default_preseed() {
61 case $PROJECT in
62 ubuntu|ubuntukylin)

Subscribers

People subscribed via source and target branches