projects
/
live-boot-grml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24e6529
)
Clean some leading whitespaces.
author
Richard Nelson
<unixabg@gmail.com>
Sat, 4 Dec 2010 04:34:01 +0000
(22:34 -0600)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:59:20 +0000
(17:59 +0100)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
bf65b9d
..
66f0db0
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-102,9
+102,9
@@
Arguments ()
;;
fetch=*)
;;
fetch=*)
-
FETCH="${ARGUMENT#fetch=}"
-
export FETCH
-
;;
+ FETCH="${ARGUMENT#fetch=}"
+ export FETCH
+ ;;
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
@@
-119,7
+119,7
@@
Arguments ()
httpfs=*)
HTTPFS="${ARGUMENT#httpfs=}"
export HTTPFS
httpfs=*)
HTTPFS="${ARGUMENT#httpfs=}"
export HTTPFS
-
;;
+ ;;
iscsi=*)
ISCSI="${ARGUMENT#iscsi=}"
iscsi=*)
ISCSI="${ARGUMENT#iscsi=}"
@@
-795,7
+795,7
@@
do_iscsi()
[ "${DEBUG}" == "Yes" ] && debugopt="-d 8"
#FIXME this name is supposed to be unique - some date + ifconfig hash?
ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
[ "${DEBUG}" == "Yes" ] && debugopt="-d 8"
#FIXME this name is supposed to be unique - some date + ifconfig hash?
ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
-
export ISCSI_INITIATORNAME
+ export ISCSI_INITIATORNAME
if [ -n "${ISCSI_SERVER}" ] ; then
iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}"
else
if [ -n "${ISCSI_SERVER}" ] ; then
iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}"
else
@@
-1043,7
+1043,7
@@
find_snap ()
try_snap ()
{
try_snap ()
{
-
# copy the contents of previously found snapshot to ${snap_mount}
+ # copy the contents of previously found snapshot to ${snap_mount}
# and remember the device and filename for resync on exit in live-boot.init
snapdata="${1}"
# and remember the device and filename for resync on exit in live-boot.init
snapdata="${1}"
@@
-1159,7
+1159,7
@@
setup_unionfs ()
{
image_directory="${1}"
rootmnt="${2}"
{
image_directory="${1}"
rootmnt="${2}"
-
addimage_directory="${3}"
+ addimage_directory="${3}"
case ${UNIONTYPE} in
aufs|unionfs)
case ${UNIONTYPE} in
aufs|unionfs)
@@
-1770,7
+1770,7
@@
integrity_check ()
mountroot ()
{
mountroot ()
{
-
if [ -x /scripts/local-top/cryptroot ]; then
+ if [ -x /scripts/local-top/cryptroot ]; then
/scripts/local-top/cryptroot
fi
/scripts/local-top/cryptroot
fi