[SCM] debian-live branch, master, updated. 1.139.1-2-2-g1752533
Daniel Baumann
daniel at debian.org
Thu Sep 4 13:11:57 UTC 2008
The following commit has been merged in the master branch:
commit 175253396486f5d98732ea99804fdf6380581683
Author: Marco Amadori <amadorim at vdavda.com>
Date: Thu Aug 28 17:00:17 2008 +0200
Removed some useless spaces.
diff --git a/scripts/live b/scripts/live
index ba325a4..5744998 100755
--- a/scripts/live
+++ b/scripts/live
@@ -538,7 +538,7 @@ mount_images_in_directory ()
{
directory="${1}"
rootmnt="${2}"
- mac="${3}"
+ mac="${3}"
if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" ||
@@ -1345,7 +1345,6 @@ set_usplash_timeout ()
mountroot ()
{
-
if [ -x /scripts/local-top/cryptroot ]; then
/scripts/local-top/cryptroot
fi
@@ -1358,7 +1357,7 @@ mountroot ()
tailpid="${!}"
# Ensure 'panic' function is overridden
- . /scripts/live-functions
+ . /scripts/live-functions
Arguments
--
debian-live
More information about the debian-live-changes
mailing list