[Pkg-sysvinit-commits] r1142 - in sysvinit/trunk/debian: . initscripts/lib/init

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-27 21:57:04 +0000 (Thu, 27 Dec 2007)
New Revision: 1142

Removed:
   sysvinit/trunk/debian/initscripts/lib/init/splash-functions-usplash
Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/control
   sysvinit/trunk/debian/initscripts/lib/init/splash-functions-base
Log:
  * UNRELEASED
  * Remove usplash progress bar support from initscripts.  It is
    included in usplash version 0.5.8-2.  Add conflict on earlier
    versions.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-27 16:20:47 UTC (rev 1141)
+++ sysvinit/trunk/debian/changelog	2007-12-27 21:57:04 UTC (rev 1142)
@@ -1,5 +1,7 @@
 sysvinit (2.86.ds1-45) experimental; urgency=low
 
+  * UNRELEASED
+
   * Replace log_daemon_msg() in init.d/rc with log_action_msg() to
     improve visual layout when parallel booting is enabled.
   * Avoid using startpar for rcS.d/.  It does not work properly.
@@ -8,6 +10,9 @@
     option.
   * Patch startpar to not print exit codes for each subprocess, to
     reduce the noise during boot.
+  * Remove usplash progress bar support from initscripts.  It is
+    included in usplash version 0.5.8-2.  Add conflict on earlier
+    versions.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 27 Dec 2007 16:36:56 +0100
 

Modified: sysvinit/trunk/debian/control
===================================================================
--- sysvinit/trunk/debian/control	2007-12-27 16:20:47 UTC (rev 1141)
+++ sysvinit/trunk/debian/control	2007-12-27 21:57:04 UTC (rev 1142)
@@ -49,7 +49,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${glibc:Depends}, ${mount:Depends}, e2fsprogs (>= 1.32+1.33-WIP-2003.04.14-1), debianutils (>= 2.13.1), lsb-base (>= 3.0-6), sysvinit-utils (>= 2.86.ds1-39)
 Recommends: psmisc
-Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12), udev (<< 0.080-1), usplash (<< 0.5)
+Conflicts: mdutils, sysv-rc (<< 2.86.ds1-1.2), sysvinit (<< 2.86.ds1-12), udev (<< 0.080-1), usplash (<< 0.5.8-2)
 Replaces: mdutils, sysvinit (<< 2.85-12), libc6, libc6.1, libc0.1, libc0.3
 Description: Scripts for initializing and shutting down the system
  The scripts in this package initialize a standard Debian

Modified: sysvinit/trunk/debian/initscripts/lib/init/splash-functions-base
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/splash-functions-base	2007-12-27 16:20:47 UTC (rev 1141)
+++ sysvinit/trunk/debian/initscripts/lib/init/splash-functions-base	2007-12-27 21:57:04 UTC (rev 1142)
@@ -88,12 +88,6 @@
 #   INPUT="$(manual_method)"
 splash_user_input () { return 1; }
 
-# Load usplash support while we wait for the usplash package to pick
-# up the new API. [pere 2007-11-18]
-if [ -x /sbin/usplash ] && [ -e /lib/init/splash-functions-usplash ] ; then
-	. /lib/init/splash-functions-usplash
-fi
-
 # Allow these functions to be overridden with custom scripts.  This is
 # the official API hook.
 if [ -e /lib/init/splash-functions ] ; then . /lib/init/splash-functions ; fi

Deleted: sysvinit/trunk/debian/initscripts/lib/init/splash-functions-usplash
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/splash-functions-usplash	2007-12-27 16:20:47 UTC (rev 1141)
+++ sysvinit/trunk/debian/initscripts/lib/init/splash-functions-usplash	2007-12-27 21:57:04 UTC (rev 1142)
@@ -1,93 +0,0 @@
-# Usplash hooks for /lib/init/splash-functions-base
-
-# Internal function, do not use in external scripts
-usplash_pidfound()
-{
-	pidof usplash > /dev/null 2>&1 || return 1
-	return 0
-}
-
-splash_running()
-{
-	if [ -x /sbin/usplash ] && usplash_pidfound; then
-		return 0
-	fi
-	return 1
-}
-
-splash_stop ()
-{
-	local i
-
-	splash_running || return 0
-
-	# Wait until it is gone or forcibly kill it
-	i=0
-	while usplash_pidfound; do
-		i=$(($i + 1))
-		if [ $i -gt 10 ]; then
-			kill -9 $(pidof usplash)
-			break
-		fi
-		sleep 1
-	done
-	return 0
-}
-
-splash_start ()
-{
-	if splash_running; then
-		return 0
-	elif [ ! -x /sbin/usplash ] || [ ! -x /sbin/usplash_down ]; then
-		return 1
-	else
-		/sbin/usplash_down || return 1
-		return 0
-	fi
-}
-
-custom_splash_progress ()
-{
-	splash_running || return 0
-	/sbin/usplash_write "PROGRESS $1" || return 1
-	return 0
-}
-
-splash_start_indefinite ()
-{
-	splash_running || return 0
-	/sbin/usplash_write "TIMEOUT 0" || return 1
-	/sbin/usplash_write "PULSATE" || return 1
-	return 0
-}
-
-splash_stop_indefinite ()
-{
-	splash_running || return 0
-	/sbin/usplash_write "CLEAR" || return 1
-	/sbin/usplash_write "TIMEOUT 15" || return 1
-	return 0
-}
-
-splash_user_input ()
-{
-	splash_running || return 1
-	[ -p /dev/.initramfs/usplash_outfifo ] || return 1
-
-	case "$2" in
-		regular)
-			/sbin/usplash_write "INPUT $1" || return 1
-			;;
-		password)
-			/sbin/usplash_write "INPUTQUIET $1" || return 1
-			;;
-		enter)
-			/sbin/usplash_write "INPUTENTER $1" || return 1
-			;;
-		*)
-			return 1
-			;;
-	esac
-	cat /dev/.initramfs/usplash_outfifo 2> /dev/null || return 1
-	return 0
-}