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:
9ce1683
)
Renaming internal ext_mountpoint variable to alt_mountpoint for clarity.
author
Daniel Baumann
<daniel@debian.org>
Fri, 4 Jun 2010 07:18:13 +0000
(09:18 +0200)
committer
Daniel Baumann
<daniel@debian.org>
Wed, 9 Mar 2011 16:53:26 +0000
(17:53 +0100)
scripts/live
patch
|
blob
|
history
diff --git
a/scripts/live
b/scripts/live
index
a9c0f13
..
e93570f
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-8,7
+8,7
@@
echo "/root/lib" >> /etc/ld.so.conf
echo "/root/usr/lib" >> /etc/ld.so.conf
mountpoint="/live/image"
echo "/root/usr/lib" >> /etc/ld.so.conf
mountpoint="/live/image"
-
ext_mountpoint="/ext_volume
"
+
alt_mountpoint="/media
"
LIVE_MEDIA_PATH="live"
root_persistence="live-rw"
LIVE_MEDIA_PATH="live"
root_persistence="live-rw"
@@
-804,8
+804,8
@@
do_httpmount ()
iso|squashfs|tgz|tar)
if [ "${extension}" = "iso" ]
then
iso|squashfs|tgz|tar)
if [ "${extension}" = "iso" ]
then
- mkdir -p "${
ex
t_mountpoint}"
- dest="${
ex
t_mountpoint}"
+ mkdir -p "${
al
t_mountpoint}"
+ dest="${
al
t_mountpoint}"
else
local dest="${mountpoint}/${LIVE_MEDIA_PATH}"
mount -t ramfs ram "${mountpoint}"
else
local dest="${mountpoint}/${LIVE_MEDIA_PATH}"
mount -t ramfs ram "${mountpoint}"
@@
-859,10
+859,10
@@
do_httpmount ()
if [ ${rc} != 0 ]
then
if [ ${rc} != 0 ]
then
- if [ -d "${
ex
t_mountpoint}" ]
+ if [ -d "${
al
t_mountpoint}" ]
then
then
- umount "${
ex
t_mountpoint}"
- rmdir "${
ex
t_mountpoint}"
+ umount "${
al
t_mountpoint}"
+ rmdir "${
al
t_mountpoint}"
fi
umount "${mountpoint}"
elif [ "${webfile}" != "FETCH" ] ; then
fi
umount "${mountpoint}"
elif [ "${webfile}" != "FETCH" ] ; then