projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing debian version 3.0~a28-1.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
70ea06e
..
83114a2
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-340,7
+340,7
@@
do_netsetup ()
done
# this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
done
# this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
- # an endless loop; if
f
execution fails give it two further tries, that's
+ # an endless loop; if execution fails give it two further tries, that's
# why we use '$devlist $devlist $devlist' for the other for loop
for dev in $devlist $devlist $devlist ; do
echo "Executing ipconfig -t $ETHDEV_TIMEOUT $dev"
# why we use '$devlist $devlist $devlist' for the other for loop
for dev in $devlist $devlist $devlist ; do
echo "Executing ipconfig -t $ETHDEV_TIMEOUT $dev"
@@
-353,7
+353,7
@@
do_netsetup ()
fi
# if configuration of device worked we should have an assigned
fi
# if configuration of device worked we should have an assigned
- # IP address, if
f so let's use the according as $DEVICE for later usage
+ # IP address, if
so let's use the device as $DEVICE for later usage.
# simple and primitive approach which seems to work fine
if ifconfig $dev | grep -q 'inet.*addr:' ; then
export DEVICE="$dev"
# simple and primitive approach which seems to work fine
if ifconfig $dev | grep -q 'inet.*addr:' ; then
export DEVICE="$dev"
@@
-1001,12
+1001,12
@@
setup_unionfs ()
;;
esac
;;
esac
- if
echo ${PERSISTENCE_METHOD} | grep -qe "\<overlay\>"
+ if
is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
then
overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
fi
then
overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
fi
- if
echo ${PERSISTENCE_METHOD} | grep -qe "\<snapshot\>"
+ if
is_in_comma_sep_list snapshot ${PERSISTENCE_METHOD}
then
snapshots="${root_snapshot_label} ${home_snapshot_label}"
fi
then
snapshots="${root_snapshot_label} ${home_snapshot_label}"
fi
@@
-1108,15
+1108,15
@@
setup_unionfs ()
rofscount=$(echo ${rofslist} |wc -w)
rofscount=$(echo ${rofslist} |wc -w)
- # XXX: we now ensure that there can only be one read-only filesystem. Should this be inside the EXPOSED_ROOT if?
- if [ ${rofscount} -ne 1 ]
- then
- panic "only one RO file system supported with exposedroot: ${rofslist}"
- fi
rofs=${rofslist%% }
if [ -n "${EXPOSED_ROOT}" ]
then
rofs=${rofslist%% }
if [ -n "${EXPOSED_ROOT}" ]
then
+ if [ ${rofscount} -ne 1 ]
+ then
+ panic "only one RO file system supported with exposedroot: ${rofslist}"
+ fi
+
mount --bind ${rofs} ${rootmnt} || \
panic "bind mount of ${rofs} failed"
mount --bind ${rofs} ${rootmnt} || \
panic "bind mount of ${rofs} failed"