Merge lp:~pali/ubuntu/oneiric/initramfs-tools/initramfs-tools into lp:ubuntu/oneiric/initramfs-tools

[Pali]

Write boot log messages to plymouth.

This patch add support for writing boot mesages like "Running /scripts/local-top" on plymouth screen (like old usplash).

This patch/merge depends on these plymouth merges:
https://code.launchpad.net/~pali/ubuntu/natty/plymouth/plymouth/+merge/61897
https://code.launchpad.net/~pali/ubuntu/oneiric/kubuntu-default-settings/kubuntu-default-settings/+merge/63334

When plymouth is running, it write boot log messages to console too - without drm/framebuffer splash renderer. Then plymouth use detail text output to console. So this is reason why _log_msg is not called when plymouth is running (it would be in console 2 times).

[lp:~pali/ubuntu/oneiric/initramfs-tools/initramfs-tools]

241. By Pali on 2011-07-17

Fixed writing messages to plymouth

[Martin Pitt (pitti)]

This is blocked on landing https://code.launchpad.net/~pali/ubuntu/natty/plymouth/plymouth/+merge/61897 upstream first, and then needs an update to the current package. I'm setting this to "work in progress", please set back to "needs review" once above happened. Thanks!

review: Needs Fixing

Unmerged revisions

241. By Pali on 2011-07-17

Fixed writing messages to plymouth

240. By Pali on 2011-06-13

Write boot log messages to plymouth

239. By Scott James Remnant (Canonical) on 2011-05-03

Create /run in the initramfs, move to the real filesystem before
exec'ing init so that it survices. /dev/.initramfs is a symlink to
/run/initramfs, and the old /dev/.initramfs/varrun path just points to
/run (via two symlinks).

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-15 09:20:35 +0000
+++ debian/changelog	2011-07-18 06:22:31 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 initramfs-tools (0.99ubuntu2) oneiric; urgency=low
 
   * hook-functions: Revert changes from 0.98.8ubuntu3. With the current
@@ -108,6 +109,17 @@
 
  -- Evan Broder <[e-mail]>  Wed, 22 Jun 2011 10:57:43 -0700
 
+=======
+initramfs-tools (0.98.8ubuntu4) UNRELEASED; urgency=low
+
+  * Create /run in the initramfs, move to the real filesystem before
+    exec'ing init so that it survices. /dev/.initramfs is a symlink to
+    /run/initramfs, and the old /dev/.initramfs/varrun path just points to
+    /run (via two symlinks).
+
+ -- Scott James Remnant <[e-mail]>  Tue, 03 May 2011 14:29:50 -0700
+
+>>>>>>> MERGE-SOURCE
 initramfs-tools (0.98.8ubuntu3) natty; urgency=low
 
   * If copy_exec finds libraries to copy which are only accessible to the

=== modified file 'init'
--- init	2011-07-15 09:07:21 +0000
+++ init	2011-07-18 06:22:31 +0000
@@ -22,11 +22,22 @@
 	[ -e /dev/null ] || mknod /dev/null c 1 3
 fi
 mkdir /dev/pts
+<<<<<<< TREE
 mount -t devpts -o noexec,nosuid,gid=5,mode=0620 devpts /dev/pts || true
 mount -t tmpfs -o "nosuid,size=20%,mode=0755" tmpfs /run
 mkdir /run/initramfs
 # compatibility symlink for the pre-oneiric locations
 ln -s /run/initramfs /dev/.initramfs
+=======
+mount -t devpts -o noexec,nosuid,gid=5,mode=0620 none /dev/pts || true
+> /dev/.initramfs-tools
+mkdir /run
+mount -t tmpfs -o mode=0755,nodev,noexec,nosuid none /run
+mkdir -m 1777 /run/lock
+mkdir /run/initramfs
+ln -nsf /run /run/initramfs/varrun
+ln -nsf /run/initramfs /dev/.initramfs
+>>>>>>> MERGE-SOURCE
 
 # Export the dpkg architecture
 export DPKG_ARCH=
@@ -271,6 +282,7 @@
 # Move virtual filesystems over to the real filesystem
 mount -n -o move /sys ${rootmnt}/sys
 mount -n -o move /proc ${rootmnt}/proc
+mount -n -o move /run ${rootmnt}/run
 
 validate_init() {
 	checktarget="${1}"

=== modified file 'initramfs-tools.8'
=== modified file 'scripts/functions'
--- scripts/functions	2011-07-12 07:22:11 +0000
+++ scripts/functions	2011-07-18 06:22:31 +0000
@@ -8,27 +8,59 @@
 
 log_success_msg()
 {
-	_log_msg "Success: $@\n"
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth message --text="log:Success: $@"
+	else
+		_log_msg "Success: $@\n"
+	fi
 }
 
 log_failure_msg()
 {
-	_log_msg "Failure: $@\n"
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth message --text="log:Failure: $@"
+	else
+		_log_msg "Failure: $@\n"
+	fi
 }
 
 log_warning_msg()
 {
-	_log_msg "Warning: $@\n"
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth message --text="log:Warning: $@"
+	else
+		_log_msg "Warning: $@\n"
+	fi
 }
 
 log_begin_msg()
 {
+<<<<<<< TREE
 	_log_msg "Begin: $@ ... "
+=======
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth message --text="log:$@"
+	elif [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "TEXT $@"
+	else
+		_log_msg "Begin: $@ ... "
+	fi
+>>>>>>> MERGE-SOURCE
 }
 
 log_end_msg()
 {
+<<<<<<< TREE
 	_log_msg "done.\n"
+=======
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth message --text="log:ok"
+	elif [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "SUCCESS ok"
+	else
+		_log_msg "done.\n"
+	fi
+>>>>>>> MERGE-SOURCE
 }
 
 # Add failure hook
@@ -54,10 +86,13 @@
 	if [ -x /sbin/usplash_write ]; then
 		/sbin/usplash_write "QUIT"
 	fi
+
+	# Hide also plymouth boot splash
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth hide-splash > /dev/null 2>&1
+	fi
+
 	chvt 1
-	if [ -x /bin/plymouth ] && plymouth --ping; then
-		/bin/plymouth hide-splash > /dev/null 2>&1
-	fi
 
 	for hook in /tmp/mountroot-fail-hooks.d/*; do
 		if [ -x ${hook} ] && ${hook} mountfail; then
@@ -69,6 +104,17 @@
 
 panic()
 {
+<<<<<<< TREE
+=======
+	if [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "QUIT"
+	fi
+
+	if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
+		/bin/plymouth hide-splash > /dev/null 2>&1
+	fi
+
+>>>>>>> MERGE-SOURCE
 	if command -v chvt >/dev/null 2>&1; then
 		chvt 1
 	fi