Merge lp:~vincenzo-ampolo/project-rootstock/trunk into lp:project-rootstock

Proposed by Vincenzo Ampolo
Status: Merged
Merged at revision: not available
Proposed branch: lp:~vincenzo-ampolo/project-rootstock/trunk
Merge into: lp:project-rootstock
Diff against target: None lines
To merge this branch: bzr merge lp:~vincenzo-ampolo/project-rootstock/trunk
Reviewer Review Type Date Requested Status
Oliver Grawert Approve
Review via email: mp+8633@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vincenzo Ampolo (vincenzo-ampolo) wrote :

Fixed console bug

Revision history for this message
Oliver Grawert (ogra) wrote :

looks fine, this is a valid fix for the error you are seeing, i'll add a test for the dir to it after merging if you dont mind (so we dont waste the mkdir if the dir actually exists) ...

the issue you are currently seeing though (and working aroud with your fix) is that upstart is not building on armel, so you will see other problems in the rootfs on boot even with the fix in place

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'rootstock'
--- rootstock 2009-07-10 12:17:53 +0000
+++ rootstock 2009-07-12 08:54:21 +0000
@@ -231,6 +231,7 @@
231 [ $QUIET ] || echo "I: Setting up serial tty in image"231 [ $QUIET ] || echo "I: Setting up serial tty in image"
232232
233 if [ "$DIST" = "jaunty" ];then233 if [ "$DIST" = "jaunty" ];then
234 mkdir -p $MOUNTPOINT/etc/event.d/
234 cat > $MOUNTPOINT/etc/event.d/ttyS0 <<EOF235 cat > $MOUNTPOINT/etc/event.d/ttyS0 <<EOF
235start on runlevel 2236start on runlevel 2
236start on runlevel 3237start on runlevel 3
@@ -245,6 +246,7 @@
245exec /sbin/getty 115200 ttyS0246exec /sbin/getty 115200 ttyS0
246EOF247EOF
247 else248 else
249 mkdir -p $MOUNTPOINT/etc/init/
248 cat > $MOUNTPOINT/etc/init/ttyS0.conf <<EOF250 cat > $MOUNTPOINT/etc/init/ttyS0.conf <<EOF
249start on stopped rc RUNLEVEL=[2345]251start on stopped rc RUNLEVEL=[2345]
250stop on runlevel [!2345]252stop on runlevel [!2345]

Subscribers

People subscribed via source and target branches