[Demudi-commits] r923 - in sysv-rc-bootsplash/trunk: . debian
debian/po
Free Ekanayaka
free-guest at costa.debian.org
Sat Sep 23 06:56:42 UTC 2006
Author: free-guest
Date: 2006-09-23 06:56:37 +0000 (Sat, 23 Sep 2006)
New Revision: 923
Removed:
sysv-rc-bootsplash/trunk/functions.bootsplash
sysv-rc-bootsplash/trunk/functions.initramfs-tools
Modified:
sysv-rc-bootsplash/trunk/debian/changelog
sysv-rc-bootsplash/trunk/debian/control
sysv-rc-bootsplash/trunk/debian/po/templates.pot
sysv-rc-bootsplash/trunk/debian/postinst
sysv-rc-bootsplash/trunk/debian/prerm
sysv-rc-bootsplash/trunk/debian/rules
sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates
sysv-rc-bootsplash/trunk/rc.bootsplash
Log:
releasing version 1.0.4-1
Modified: sysv-rc-bootsplash/trunk/debian/changelog
===================================================================
--- sysv-rc-bootsplash/trunk/debian/changelog 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/changelog 2006-09-23 06:56:37 UTC (rev 923)
@@ -1,3 +1,14 @@
+sysv-rc-bootsplash (1.0.4-1) unstable; urgency=low
+
+ * Bug fix: "sysv-rc-bootsplash: misbehaviour of the progress bar during
+ the shutdown", thanks to Varun Hiremath (Closes: #388624).
+ * Bug fix: "sysv-rc-bootsplash: initramfs-tools scripts don't have to be
+ patched", thanks to Pablo Chinea (Closes: #388745).
+ * Bug fix: "sysv-rc-bootsplash: Please rework your debconf configuration
+ system", thanks to Thomas Huriaux (Closes: #388593).
+
+ -- Free Ekanayaka <freee at debian.org> Sat, 23 Sep 2006 07:34:11 +0200
+
sysv-rc-bootsplash (1.0.3-1) unstable; urgency=low
* New upstream. The patches now wotk with sysv-rc version 2.86.ds1-20
Modified: sysv-rc-bootsplash/trunk/debian/control
===================================================================
--- sysv-rc-bootsplash/trunk/debian/control 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/control 2006-09-23 06:56:37 UTC (rev 923)
@@ -7,8 +7,7 @@
Package: sysv-rc-bootsplash
Architecture: all
-Depends: sysv-rc (>= 2.86.ds1-20), initramfs-tools, patch, ${misc:Depends}, po-debconf
-Recommends: bootsplash (>= 3.0.0)
+Depends: sysv-rc (>= 2.86.ds1-20), patch, ${misc:Depends}, po-debconf, bootsplash (>= 3.2)
Conflicts: sysv-rc-fbsplash
Description: Bootsplash patches for rc files
This package provides support bootsplash (progress bars, animations,
Modified: sysv-rc-bootsplash/trunk/debian/po/templates.pot
===================================================================
--- sysv-rc-bootsplash/trunk/debian/po/templates.pot 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/po/templates.pot 2006-09-23 06:56:37 UTC (rev 923)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: freee at debian.org\n"
-"POT-Creation-Date: 2006-09-20 14:13+0200\n"
+"POT-Creation-Date: 2006-09-23 07:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -16,38 +16,15 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#. Type: note
-#. Description
-#: ../sysv-rc-bootsplash.templates:3
-msgid "The system rc and functions files have to be patched"
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../sysv-rc-bootsplash.templates:3
-msgid ""
-"Your /etc/init.d/rc and /etc/init.d/rcS files will be patched to operate "
-"correctly with bootsplash. Do not edit them after patching; if you do, upon "
-"removal this package will not be able to restore the original files. If you "
-"have already editied your rc and rcS files and the patch fails, you will be "
-"notified, and your rc and rcS files will not be changed."
-msgstr ""
-
-#. Type: note
-#. Description
-#: ../sysv-rc-bootsplash.templates:3
-msgid "You should also install the bootsplash package with this one."
-msgstr ""
-
#. Type: boolean
#. Description
-#: ../sysv-rc-bootsplash.templates:16
+#: ../sysv-rc-bootsplash.templates:4
msgid "Should bootsplash patch your start up scripts?"
msgstr ""
#. Type: boolean
#. Description
-#: ../sysv-rc-bootsplash.templates:16
+#: ../sysv-rc-bootsplash.templates:4
msgid ""
"In order to operate correctly, bootsplash must patch your /etc/init.d/rc "
"and /etc/init.d/rcS files. Upon removal of this package the patches will be "
@@ -59,7 +36,7 @@
#. Type: boolean
#. Description
-#: ../sysv-rc-bootsplash.templates:16
+#: ../sysv-rc-bootsplash.templates:4
msgid ""
"If you do not patch your start up scripts progress bars and animations will "
"not work."
@@ -67,13 +44,13 @@
#. Type: note
#. Description
-#: ../sysv-rc-bootsplash.templates:30
+#: ../sysv-rc-bootsplash.templates:18
msgid "Patching your rc and rcS files has failed"
msgstr ""
#. Type: note
#. Description
-#: ../sysv-rc-bootsplash.templates:30
+#: ../sysv-rc-bootsplash.templates:18
msgid ""
"Bootsplash was unable to patch your /etc/init.d/rc and /etc/init.d/rcS "
"files, please run 'apt-get install --reinstall sysv-rc' to restore the "
@@ -83,13 +60,13 @@
#. Type: note
#. Description
-#: ../sysv-rc-bootsplash.templates:37
+#: ../sysv-rc-bootsplash.templates:25
msgid "Un-patching your rc and rcS files has failed"
msgstr ""
#. Type: note
#. Description
-#: ../sysv-rc-bootsplash.templates:37
+#: ../sysv-rc-bootsplash.templates:25
msgid ""
"Bootsplash was unable to un-patch your /etc/init.d/rc and /etc/init.d/rcS "
"files, please run 'apt-get install --reinstall sysv-rc' to replace the "
Modified: sysv-rc-bootsplash/trunk/debian/postinst
===================================================================
--- sysv-rc-bootsplash/trunk/debian/postinst 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/postinst 2006-09-23 06:56:37 UTC (rev 923)
@@ -24,9 +24,35 @@
# installation fails and the `postinst' is called with `abort-upgrade',
# `abort-remove' or `abort-deconfigure'.
+print_error () {
+ echo "Patches would not apply cleanly."
+ exit 1;
+}
+
case "$1" in
configure)
+ db_get sysv-rc-bootsplash/should-patch
+ SHOULD_PATCH="$RET"
+
+ if [ $SHOULD_PATCH = "true" ]; then
+ # attempt to patch the rc and rcS files, if we fail
+ # notify the user and report the error.
+ FAILED="false"
+
+ echo "Testing if patches apply cleanly..."
+ patch /etc/init.d/rc --dry-run -bfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch || print_error
+
+ # apply the patches
+ echo "Patching files..."
+ patch /etc/init.d/rc -b /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch
+
+ else
+ echo "Not patching start up files..."
+ fi
+
+ db_stop
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
@@ -39,36 +65,6 @@
;;
esac
-print_error () {
- echo "Patches would not apply cleanly."
-# db_input high sysv-rc-bootsplash/failed || true
-# db_go
-# db_stop
- exit 1;
-}
-
-
-db_get sysv-rc-bootsplash/should-patch
-SHOULD_PATCH="$RET"
-
-if [ $SHOULD_PATCH = "true" ]
-then
- # attempt to patch the rc and rcS files, if we fail
- # notify the user and report the error.
- echo "Testing if patches apply cleanly..."
- patch /usr/share/initramfs-tools/scripts/functions --dry-run -bfs /usr/share/sysv-rc-bootsplash/functions-bootsplash.patch || print_error
- patch /etc/init.d/rc --dry-run -bfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch || print_error
-
- # apply the patches
- echo "Patching files..."
- patch /usr/share/initramfs-tools/scripts/functions -b /usr/share/sysv-rc-bootsplash/functions-bootsplash.patch
- patch /etc/init.d/rc -b /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch
-else
- echo "Not patching start up files..."
-fi
-
-db_stop
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
Modified: sysv-rc-bootsplash/trunk/debian/prerm
===================================================================
--- sysv-rc-bootsplash/trunk/debian/prerm 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/prerm 2006-09-23 06:56:37 UTC (rev 923)
@@ -16,52 +16,44 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-
-case "$1" in
- remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/sysv-rc-bootsplash.info.gz
- ;;
- failed-upgrade)
- ;;
- *)
- echo "prerm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
function print_error {
echo "Patches would not removed cleanly."
db_input high sysv-rc-bootsplash/failed-removal || true
db_go
}
+case "$1" in
+ remove|upgrade|deconfigure)
-db_get sysv-rc-bootsplash/should-patch
-SHOULD_PATCH="$RET"
+ db_get sysv-rc-bootsplash/should-patch
+ SHOULD_PATCH="$RET"
-if [ $SHOULD_PATCH = "true" ]
-then
+ if [ $SHOULD_PATCH = "true" ]; then
- # attempt to un-patch the rc and rcS files, if we fail
- # notify the user and report the error.
-
- FAILED="false"
-
- echo "Testing if patches remove cleanly..."
- patch /usr/share/initramfs-tools/scripts/functions --dry-run -Rfs /usr/share/sysv-rc-bootsplash/functions-bootsplash.patch || FAILED="true"
- patch /etc/init.d/rc --dry-run -Rfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch || FAILED="true"
+ # attempt to un-patch the rc and rcS files, if we fail
+ # notify the user and report the error.
+ echo "Testing if patches remove cleanly..."
+ patch /etc/init.d/rc --dry-run -Rfs /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch || print_error
- if [ $FAILED != "true" ]
- then
- echo "Patches remove cleanly, un-patching files..."
- patch /usr/share/initramfs-tools/scripts/functions -R /usr/share/sysv-rc-bootsplash/functions-bootsplash.patch
- patch /etc/init.d/rc -R /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch
- else
- print_error
- fi
-fi
-db_stop
+ # unapply the patches
+ echo "Patches remove cleanly, un-patching files..."
+ patch /etc/init.d/rc -R /usr/share/sysv-rc-bootsplash/rc-bootsplash.patch
+ else
+ echo "Not unpatching start up files..."
+ fi
+ db_stop
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
Modified: sysv-rc-bootsplash/trunk/debian/rules
===================================================================
--- sysv-rc-bootsplash/trunk/debian/rules 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/rules 2006-09-23 06:56:37 UTC (rev 923)
@@ -34,7 +34,6 @@
dh_testdir
# Add here commands to compile the package.
- diff -U 3 -dHNa -- functions.initramfs-tools functions.bootsplash | cat > functions-bootsplash.patch
diff -U 3 -dHNa -- rc.sysv-rc rc.bootsplash | cat > rc-bootsplash.patch
touch build-stamp
@@ -47,6 +46,7 @@
# Add here commands to clean up after the build process.
rm -f functions-bootsplash.patch rc-bootsplash.patch
+ debconf-updatepo
dh_clean
install: build
@@ -54,8 +54,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- install -g root -m 644 rc-bootsplash.patch functions-bootsplash.patch \
- "$(INSTALL_DIR)/usr/share/sysv-rc-bootsplash/"
+ install -g root -m 644 rc-bootsplash.patch "$(INSTALL_DIR)/usr/share/sysv-rc-bootsplash/"
# Build architecture-independent files here.
binary-indep: build install
Modified: sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates
===================================================================
--- sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/debian/sysv-rc-bootsplash.templates 2006-09-23 06:56:37 UTC (rev 923)
@@ -1,15 +1,3 @@
-Template: sysv-rc-bootsplash/info
-Type: note
-_Description: The system rc and functions files have to be patched
- Your /etc/init.d/rc and /etc/init.d/rcS files will be patched
- to operate correctly with bootsplash. Do not edit them after patching;
- if you do, upon removal this package will not be able to restore the
- original files. If you have already editied your rc and rcS files
- and the patch fails, you will be notified, and your rc and rcS files
- will not be changed.
- .
- You should also install the bootsplash package with this one.
-
Template: sysv-rc-bootsplash/should-patch
Type: boolean
Default: true
Deleted: sysv-rc-bootsplash/trunk/functions.bootsplash
===================================================================
--- sysv-rc-bootsplash/trunk/functions.bootsplash 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/functions.bootsplash 2006-09-23 06:56:37 UTC (rev 923)
@@ -1,224 +0,0 @@
-# -*- shell-script -*-
-
-_log_msg()
-{
- if [ "$quiet" = "y" ]; then return; fi
- echo "$@"
-}
-
-log_success_msg()
-{
- _log_msg "Success: $@"
-}
-
-log_failure_msg()
-{
- _log_msg "Failure: $@"
-}
-
-log_warning_msg()
-{
- _log_msg "Warning: $@"
-}
-
-log_begin_msg()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "TEXT $@"
- fi
- _log_msg "Begin: $@ ..."
-}
-
-log_end_msg()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "SUCCESS ok"
- fi
- _log_msg "Done."
- update_progress
-}
-
-update_progress()
-{
- [ -d /dev/.initramfs ] || return
-
- if [ -z "$PROGRESS_STATE" ]; then
- export PROGRESS_STATE=0
- fi
-
- PROGRESS_STATE=$(($PROGRESS_STATE + 1))
- echo "PROGRESS_STATE=${PROGRESS_STATE}" > /dev/.initramfs/progress_state
-
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "PROGRESS $PROGRESS_STATE"
- fi
- if [ -w /proc/splash ]; then
- echo "show $(( $PROGRESS_STATE * 65534 / 100 ))" > /proc/splash
- fi
-}
-
-panic()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "QUIT"
- fi
- modprobe -q i8042
- modprobe -q atkbd
- echo $@
- FS1='(initramfs) ' /bin/sh </dev/console >/dev/console 2>&1
-}
-
-maybe_break()
-{
- if [ x$1 = x${break} ]; then
- panic "Spawning shell within the initramfs"
- fi
-}
-
-render()
-{
- eval "echo -n \${$@}"
-}
-
-set_initlist()
-{
- unset initlist
- for si_x in ${initdir}/*; do
- if [ ! -x ${si_x} ]; then
- continue
- fi
- initlist="${initlist} $(basename ${si_x})"
- done
-}
-
-reduce_satisfied()
-{
- deplist="$(render array_${1})"
- for rs_x in ${runlist}; do
- pop_list_item ${rs_x} ${deplist}
- deplist=${tmppop}
- done
- eval array_${1}=\"${deplist}\"
-}
-
-get_prereqs()
-{
- set_initlist
- for gp_x in ${initlist}; do
- tmp=$(${initdir}/${gp_x} prereqs)
- eval array_${gp_x}=\"${tmp}\"
- done
-}
-
-count_unsatisfied()
-{
- set - ${@}
- return ${#}
-}
-
-# Removes $1 from initlist
-pop_list_item()
-{
- item=${1}
- shift
- set - ${@}
- unset tmppop
- # Iterate
- for pop in ${@}; do
- if [ ${pop} = ${item} ]; then
- continue
- fi
- tmppop="${tmppop} ${pop}"
- done
-
-}
-
-# This function generates the runlist, so we clear it first.
-reduce_prereqs()
-{
- unset runlist
- set_initlist
- set - ${initlist}
- i=$#
- # Loop until there's no more in the queue to loop through
- while [ ${i} -ne 0 ]; do
- oldi=${i}
- for rp_x in ${initlist}; do
- reduce_satisfied ${rp_x}
- count_unsatisfied $(render array_${rp_x})
- cnt=${?}
- if [ ${cnt} -eq 0 ]; then
- runlist="${runlist} ${rp_x}"
- pop_list_item ${rp_x} ${initlist}
- initlist=${tmppop}
- i=$((${i} - 1))
- fi
- done
- if [ ${i} -eq ${oldi} ]; then
- panic "PANIC: Circular dependancy. Exiting."
- fi
- done
-}
-
-call_scripts()
-{
- for cs_x in ${runlist}; do
- ${initdir}/${cs_x}
- # allow boot scripts to modify exported boot paramaters
- if [ -e /conf/param.conf ]; then
- . /conf/param.conf
- fi
- done
-}
-
-run_scripts()
-{
- initdir=${1}
- get_prereqs
- reduce_prereqs
- call_scripts
-}
-
-# Load custom modules first
-load_modules()
-{
- if [ -e /conf/modules ]; then
- cat /conf/modules | while read m; do
- if [ -z "$m" ] \
- || expr "$m" : "#" >/dev/null \
- || expr "$m" : "[ \t]+#?" > /dev/null
- then
- continue;
- else
- modprobe -q $m
- fi
- done
- fi
-}
-
-# lilo compatibility
-parse_numeric() {
- case $1 in
- "")
- return
- ;;
- /*)
- return
- ;;
- *:*)
- minor=${1#*:}
- major=${1%:*}
- ;;
- [0-9][0-9][0-9])
- minor=$((0x${1#?}))
- major=$((0x${1%??}))
- ;;
- *)
- minor=$((0x${1#??}))
- major=$((0x${1%??}))
- ;;
- esac
-
- mknod /dev/root b ${major} ${minor}
- ROOT=/dev/root
-}
Deleted: sysv-rc-bootsplash/trunk/functions.initramfs-tools
===================================================================
--- sysv-rc-bootsplash/trunk/functions.initramfs-tools 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/functions.initramfs-tools 2006-09-23 06:56:37 UTC (rev 923)
@@ -1,221 +0,0 @@
-# -*- shell-script -*-
-
-_log_msg()
-{
- if [ "$quiet" = "y" ]; then return; fi
- echo "$@"
-}
-
-log_success_msg()
-{
- _log_msg "Success: $@"
-}
-
-log_failure_msg()
-{
- _log_msg "Failure: $@"
-}
-
-log_warning_msg()
-{
- _log_msg "Warning: $@"
-}
-
-log_begin_msg()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "TEXT $@"
- fi
- _log_msg "Begin: $@ ..."
-}
-
-log_end_msg()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "SUCCESS ok"
- fi
- _log_msg "Done."
- update_progress
-}
-
-update_progress()
-{
- [ -d /dev/.initramfs ] || return
-
- if [ -z "$PROGRESS_STATE" ]; then
- export PROGRESS_STATE=0
- fi
-
- PROGRESS_STATE=$(($PROGRESS_STATE + 1))
- echo "PROGRESS_STATE=${PROGRESS_STATE}" > /dev/.initramfs/progress_state
-
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "PROGRESS $PROGRESS_STATE"
- fi
-}
-
-panic()
-{
- if [ -x /sbin/usplash_write ]; then
- /sbin/usplash_write "QUIT"
- fi
- modprobe -q i8042
- modprobe -q atkbd
- echo $@
- FS1='(initramfs) ' /bin/sh </dev/console >/dev/console 2>&1
-}
-
-maybe_break()
-{
- if [ x$1 = x${break} ]; then
- panic "Spawning shell within the initramfs"
- fi
-}
-
-render()
-{
- eval "echo -n \${$@}"
-}
-
-set_initlist()
-{
- unset initlist
- for si_x in ${initdir}/*; do
- if [ ! -x ${si_x} ]; then
- continue
- fi
- initlist="${initlist} $(basename ${si_x})"
- done
-}
-
-reduce_satisfied()
-{
- deplist="$(render array_${1})"
- for rs_x in ${runlist}; do
- pop_list_item ${rs_x} ${deplist}
- deplist=${tmppop}
- done
- eval array_${1}=\"${deplist}\"
-}
-
-get_prereqs()
-{
- set_initlist
- for gp_x in ${initlist}; do
- tmp=$(${initdir}/${gp_x} prereqs)
- eval array_${gp_x}=\"${tmp}\"
- done
-}
-
-count_unsatisfied()
-{
- set - ${@}
- return ${#}
-}
-
-# Removes $1 from initlist
-pop_list_item()
-{
- item=${1}
- shift
- set - ${@}
- unset tmppop
- # Iterate
- for pop in ${@}; do
- if [ ${pop} = ${item} ]; then
- continue
- fi
- tmppop="${tmppop} ${pop}"
- done
-
-}
-
-# This function generates the runlist, so we clear it first.
-reduce_prereqs()
-{
- unset runlist
- set_initlist
- set - ${initlist}
- i=$#
- # Loop until there's no more in the queue to loop through
- while [ ${i} -ne 0 ]; do
- oldi=${i}
- for rp_x in ${initlist}; do
- reduce_satisfied ${rp_x}
- count_unsatisfied $(render array_${rp_x})
- cnt=${?}
- if [ ${cnt} -eq 0 ]; then
- runlist="${runlist} ${rp_x}"
- pop_list_item ${rp_x} ${initlist}
- initlist=${tmppop}
- i=$((${i} - 1))
- fi
- done
- if [ ${i} -eq ${oldi} ]; then
- panic "PANIC: Circular dependancy. Exiting."
- fi
- done
-}
-
-call_scripts()
-{
- for cs_x in ${runlist}; do
- ${initdir}/${cs_x}
- # allow boot scripts to modify exported boot paramaters
- if [ -e /conf/param.conf ]; then
- . /conf/param.conf
- fi
- done
-}
-
-run_scripts()
-{
- initdir=${1}
- get_prereqs
- reduce_prereqs
- call_scripts
-}
-
-# Load custom modules first
-load_modules()
-{
- if [ -e /conf/modules ]; then
- cat /conf/modules | while read m; do
- if [ -z "$m" ] \
- || expr "$m" : "#" >/dev/null \
- || expr "$m" : "[ \t]+#?" > /dev/null
- then
- continue;
- else
- modprobe -q $m
- fi
- done
- fi
-}
-
-# lilo compatibility
-parse_numeric() {
- case $1 in
- "")
- return
- ;;
- /*)
- return
- ;;
- *:*)
- minor=${1#*:}
- major=${1%:*}
- ;;
- [0-9][0-9][0-9])
- minor=$((0x${1#?}))
- major=$((0x${1%??}))
- ;;
- *)
- minor=$((0x${1#??}))
- major=$((0x${1%??}))
- ;;
- esac
-
- mknod /dev/root b ${major} ${minor}
- ROOT=/dev/root
-}
Modified: sysv-rc-bootsplash/trunk/rc.bootsplash
===================================================================
--- sysv-rc-bootsplash/trunk/rc.bootsplash 2006-09-23 06:46:54 UTC (rev 922)
+++ sysv-rc-bootsplash/trunk/rc.bootsplash 2006-09-23 06:56:37 UTC (rev 923)
@@ -13,6 +13,8 @@
# Miquel van Smoorenburg <miquels at cistron.nl>
# Bruce Perens <Bruce at Pixar.com>
# Edited for bootsplash by Pablo Chinea <khertz at gmail.com>, 2006
+# Edited by Varun Hiremath <varunhiremath at gmail.com>, 2006
+# corrected misbehaviour of the progress bar during the shutdown sequence
#
PATH=/sbin:/bin:/usr/sbin:/usr/bin
@@ -67,6 +69,8 @@
export runlevel previous
+[ S = "$runlevel" ] && rc_splash "splash start" # let bootsplash know we are ready
+
. /etc/default/rcS
export VERBOSE
@@ -250,6 +254,10 @@
esac
num_steps=$(($num_steps + 1))
done
+ if [ "$runlevel" = "0" -o "$runlevel" = "6" ]
+ then
+ num_steps=$(($num_steps - 1)) #To make sure the progress bar completes 100%
+ fi
step=0
# First, run the KILL scripts.
@@ -289,14 +297,13 @@
SCRIPTS="$SCRIPTS $i"
done
startup stop $SCRIPTS
- rc_splash "$i stop" # update bootsplash progress bar
+ rc_splash "${i#/etc/rc$runlevel.d/K[0-9][0-9]} stop" # update bootsplash progress bar
done
fi
# Now run the START scripts for this runlevel.
# Run all scripts with the same level in parallel
CURLEVEL=""
- step=0
for s in /etc/rc$runlevel.d/S*
do
level=$(echo $s | sed 's/.*\/S\([0-9][0-9]\).*/\1/')
@@ -329,7 +336,7 @@
SCRIPTS="$SCRIPTS $i"
done
startup $ACTION $SCRIPTS
- rc_splash "$i $ACTION" # update bootsplash progress bar
+ rc_splash "${i#/etc/rc$runlevel.d/S[0-9][0-9]} $ACTION" # update bootsplash progress bar
done
fi
@@ -339,8 +346,6 @@
# For compatibility, run the files in /etc/rc.boot too.
#
[ -d /etc/rc.boot ] && run-parts /etc/rc.boot
-
- rc_splash "splash start" # let bootsplash know we are ready
fi
rc_splash "master" # stop playing animations
More information about the Demudi-commits
mailing list