[SCM] live-config branch, debian-next, updated. debian/3.0_a40-1-2-g8bd7a6d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 8bd7a6d48bc6641628cdd0624ab2e52c32eb9793
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jun 14 12:25:30 2012 +0200

    Switching to four-digit script numbers to allow more flexibility for custom scripts in-between the stock ones.

diff --git a/examples/live-config-foobar/scripts/900-foobar b/examples/live-config-foobar/scripts/9000-foobar
similarity index 100%
rename from examples/live-config-foobar/scripts/900-foobar
rename to examples/live-config-foobar/scripts/9000-foobar
diff --git a/scripts/config.sh b/scripts/config.sh
index 270973b..89c3176 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -98,7 +98,7 @@ Cmdline ()
 	then
 		for _CONFIG in $(echo ${LIVE_CONFIGS} | sed -e 's|,| |g')
 		do
-			_SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/???-${_CONFIG} 2> /dev/null || true)"
+			_SCRIPTS="${_SCRIPTS} $(ls /lib/live/config/????-${_CONFIG} 2> /dev/null || true)"
 		done
 	fi
 
@@ -107,7 +107,7 @@ Cmdline ()
 	then
 		for _NOCONFIG in $(echo ${LIVE_NOCONFIGS} | sed -e 's|,| |g')
 		do
-			_SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/???-${_NOCONFIG} 2> /dev/null || echo none)||")"
+			_SCRIPTS="$(echo ${_SCRIPTS} | sed -e "s|$(ls /lib/live/config/????-${_NOCONFIG} 2> /dev/null || echo none)||")"
 		done
 	fi
 }
diff --git a/scripts/config/001-debconf b/scripts/config/0010-debconf
similarity index 100%
rename from scripts/config/001-debconf
rename to scripts/config/0010-debconf
diff --git a/scripts/config/002-hostname b/scripts/config/0020-hostname
similarity index 100%
rename from scripts/config/002-hostname
rename to scripts/config/0020-hostname
diff --git a/scripts/config/003-user-setup b/scripts/config/0030-user-setup
similarity index 100%
rename from scripts/config/003-user-setup
rename to scripts/config/0030-user-setup
diff --git a/scripts/config/004-sudo b/scripts/config/0040-sudo
similarity index 100%
rename from scripts/config/004-sudo
rename to scripts/config/0040-sudo
diff --git a/scripts/config/005-locales b/scripts/config/0050-locales
similarity index 100%
rename from scripts/config/005-locales
rename to scripts/config/0050-locales
diff --git a/scripts/config/006-locales-all b/scripts/config/0060-locales-all
similarity index 100%
rename from scripts/config/006-locales-all
rename to scripts/config/0060-locales-all
diff --git a/scripts/config/007-tzdata b/scripts/config/0070-tzdata
similarity index 100%
rename from scripts/config/007-tzdata
rename to scripts/config/0070-tzdata
diff --git a/scripts/config/008-gdm b/scripts/config/0080-gdm
similarity index 100%
rename from scripts/config/008-gdm
rename to scripts/config/0080-gdm
diff --git a/scripts/config/009-gdm3 b/scripts/config/0090-gdm3
similarity index 100%
rename from scripts/config/009-gdm3
rename to scripts/config/0090-gdm3
diff --git a/scripts/config/010-kdm b/scripts/config/0100-kdm
similarity index 100%
rename from scripts/config/010-kdm
rename to scripts/config/0100-kdm
diff --git a/scripts/config/011-lightdm b/scripts/config/0110-lightdm
similarity index 100%
rename from scripts/config/011-lightdm
rename to scripts/config/0110-lightdm
diff --git a/scripts/config/012-lxdm b/scripts/config/0120-lxdm
similarity index 100%
rename from scripts/config/012-lxdm
rename to scripts/config/0120-lxdm
diff --git a/scripts/config/013-nodm b/scripts/config/0130-nodm
similarity index 100%
rename from scripts/config/013-nodm
rename to scripts/config/0130-nodm
diff --git a/scripts/config/014-slim b/scripts/config/0140-slim
similarity index 100%
rename from scripts/config/014-slim
rename to scripts/config/0140-slim
diff --git a/scripts/config/015-xinit b/scripts/config/0150-xinit
similarity index 100%
rename from scripts/config/015-xinit
rename to scripts/config/0150-xinit
diff --git a/scripts/config/016-keyboard-configuration b/scripts/config/0160-keyboard-configuration
similarity index 100%
rename from scripts/config/016-keyboard-configuration
rename to scripts/config/0160-keyboard-configuration
diff --git a/scripts/config/017-sysvinit b/scripts/config/0170-sysvinit
similarity index 100%
rename from scripts/config/017-sysvinit
rename to scripts/config/0170-sysvinit
diff --git a/scripts/config/018-sysv-rc b/scripts/config/0180-sysv-rc
similarity index 100%
rename from scripts/config/018-sysv-rc
rename to scripts/config/0180-sysv-rc
diff --git a/scripts/config/019-upstart b/scripts/config/0190-upstart
similarity index 100%
rename from scripts/config/019-upstart
rename to scripts/config/0190-upstart
diff --git a/scripts/config/101-apport b/scripts/config/1010-apport
similarity index 100%
rename from scripts/config/101-apport
rename to scripts/config/1010-apport
diff --git a/scripts/config/102-gnome-panel-data b/scripts/config/1020-gnome-panel-data
similarity index 100%
rename from scripts/config/102-gnome-panel-data
rename to scripts/config/1020-gnome-panel-data
diff --git a/scripts/config/103-gnome-power-manager b/scripts/config/1030-gnome-power-manager
similarity index 100%
rename from scripts/config/103-gnome-power-manager
rename to scripts/config/1030-gnome-power-manager
diff --git a/scripts/config/104-gnome-screensaver b/scripts/config/1040-gnome-screensaver
similarity index 100%
rename from scripts/config/104-gnome-screensaver
rename to scripts/config/1040-gnome-screensaver
diff --git a/scripts/config/105-initramfs-tools b/scripts/config/1050-initramfs-tools
similarity index 100%
rename from scripts/config/105-initramfs-tools
rename to scripts/config/1050-initramfs-tools
diff --git a/scripts/config/106-kaboom b/scripts/config/1060-kaboom
similarity index 100%
rename from scripts/config/106-kaboom
rename to scripts/config/1060-kaboom
diff --git a/scripts/config/107-kde-services b/scripts/config/1070-kde-services
similarity index 100%
rename from scripts/config/107-kde-services
rename to scripts/config/1070-kde-services
diff --git a/scripts/config/108-debian-installer-launcher b/scripts/config/1080-debian-installer-launcher
similarity index 100%
rename from scripts/config/108-debian-installer-launcher
rename to scripts/config/1080-debian-installer-launcher
diff --git a/scripts/config/109-module-init-tools b/scripts/config/1090-module-init-tools
similarity index 100%
rename from scripts/config/109-module-init-tools
rename to scripts/config/1090-module-init-tools
diff --git a/scripts/config/110-policykit b/scripts/config/1100-policykit
similarity index 100%
rename from scripts/config/110-policykit
rename to scripts/config/1100-policykit
diff --git a/scripts/config/111-sslcert b/scripts/config/1110-sslcert
similarity index 100%
rename from scripts/config/111-sslcert
rename to scripts/config/1110-sslcert
diff --git a/scripts/config/112-update-notifier b/scripts/config/1120-update-notifier
similarity index 100%
rename from scripts/config/112-update-notifier
rename to scripts/config/1120-update-notifier
diff --git a/scripts/config/113-anacron b/scripts/config/1130-anacron
similarity index 100%
rename from scripts/config/113-anacron
rename to scripts/config/1130-anacron
diff --git a/scripts/config/114-util-linux b/scripts/config/1140-util-linux
similarity index 100%
rename from scripts/config/114-util-linux
rename to scripts/config/1140-util-linux
diff --git a/scripts/config/115-login b/scripts/config/1150-login
similarity index 100%
rename from scripts/config/115-login
rename to scripts/config/1150-login
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/1160-xserver-xorg
similarity index 100%
rename from scripts/config/116-xserver-xorg
rename to scripts/config/1160-xserver-xorg
diff --git a/scripts/config/117-ureadahead b/scripts/config/1170-ureadahead
similarity index 100%
rename from scripts/config/117-ureadahead
rename to scripts/config/1170-ureadahead
diff --git a/scripts/config/118-openssh-server b/scripts/config/1180-openssh-server
similarity index 100%
rename from scripts/config/118-openssh-server
rename to scripts/config/1180-openssh-server
diff --git a/scripts/config/999-hooks b/scripts/config/9990-hooks
similarity index 100%
rename from scripts/config/999-hooks
rename to scripts/config/9990-hooks

-- 
live-config