Ubuntu
finish-install package

Merge lp:~dannf/ubuntu/trusty/finish-install/lp1320327 into lp:ubuntu/trusty/finish-install

  1. Trusty (14.04)
  2. lp1320327
  3. Merge into trusty
Proposed by dann frazier
Status: Merged
Merge reported by: Adam Conrad
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/finish-install/lp1320327
Merge into: lp:ubuntu/trusty/finish-install
Diff against target: 51 lines (+20/-0)
2 files modified
debian/changelog (+7/-0)
finish-install.d/90console (+13/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/finish-install/lp1320327
Reviewer Review Type Date Requested Status
Adam Conrad Pending
Review via email: mp+225245@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-03-11 09:10:19 +0000
3+++ debian/changelog 2014-07-02 01:28:43 +0000
4@@ -1,3 +1,10 @@
5+finish-install (2.46ubuntu3) trusty; urgency=medium
6+
7+ * Add support for serial consoles with hardware flow control,
8+ backported from upstream 2.47 (LP: #1320327).
9+
10+ -- dann frazier <dann.frazier@canonical.com> Tue, 01 Jul 2014 19:15:55 -0600
11+
12 finish-install (2.46ubuntu2) trusty; urgency=medium
13
14 * finish-install.d/90console: Allow for ibm,opal device-tree consoles.
15
16=== modified file 'finish-install.d/90console'
17--- finish-install.d/90console 2014-03-11 09:10:19 +0000
18+++ finish-install.d/90console 2014-07-02 01:28:43 +0000
19@@ -17,6 +17,13 @@
20 fi
21 }
22
23+uses_hw_flowcontrol() {
24+ local dev="$1"
25+
26+ chroot /target stty -a --file /dev/$dev | tr ' ' '\n' | \
27+ grep -q '^crtscts$'
28+}
29+
30 KEEP_VT=
31 if db_get finish-install/keep-consoles && [ "$RET" = true ]; then
32 KEEP_VT=1
33@@ -73,12 +80,18 @@
34 sed -i -e "s/^#T0\(.*\)ttyS.*/T$ttyline\1$console $ttyspeed $ttyterm/" \
35 /target/etc/inittab
36 sed -i -e "s/^\(T$ttyline.*\) -8/\1/" /target/etc/inittab
37+ if uses_hw_flowcontrol $console; then
38+ sed -i -e "s/^\(T$ttyline.* \)-L/\1-h -L/" /target/etc/inittab
39+ fi
40 fi
41 if [ "$upstart_tty1" ]; then
42 sed -e "s/^\(exec.*getty \).*/\1-L $console $ttyspeed $ttyterm/" \
43 -e "s/tty1/$console/g" \
44 "$upstart_tty1" > "$(upstart_console "$console")"
45 sed -i -e "s/^\(exec.*\) -8/\1/" "$(upstart_console "$console")"
46+ if uses_hw_flowcontrol $console; then
47+ sed -i -e "s/^\(exec.*\)-L/\1-h -L/" "$(upstart_console "$console")"
48+ fi
49 fi
50
51 write_console "$rawconsole" /target/etc/securetty

Subscribers

People subscribed via source and target branches

to all changes: