projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging casper 1.112.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
9fff065
..
a01221b
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-983,6
+983,8
@@
setup_unionfs ()
cow_fstype=$(get_fstype "${cowprobe}")
else
[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
cow_fstype=$(get_fstype "${cowprobe}")
else
[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium"
+ cowdevice="tmpfs"
+ cow_fstype="tmpfs"
fi
elif [ -n "${NFS_COW}" ]
then
fi
elif [ -n "${NFS_COW}" ]
then
@@
-1196,14
+1198,6
@@
find_livefs ()
return 1
}
return 1
}
-pulsate ()
-{
- if [ -x /sbin/usplash_write ]
- then
- /sbin/usplash_write "PULSATE"
- fi
-}
-
set_usplash_timeout ()
{
if [ -x /sbin/usplash_write ]
set_usplash_timeout ()
{
if [ -x /sbin/usplash_write ]
@@
-1223,7
+1217,6
@@
mountroot ()
set_usplash_timeout
[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
set_usplash_timeout
[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount"
- pulsate
run_scripts /scripts/live-premount
[ "${quiet}" != "y" ] && log_end_msg
run_scripts /scripts/live-premount
[ "${quiet}" != "y" ] && log_end_msg
@@
-1289,7
+1282,6
@@
mountroot ()
maybe_break live-bottom
[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
maybe_break live-bottom
[ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
- pulsate
run_scripts /scripts/live-bottom
[ "${quiet}" != "y" ] && log_end_msg
run_scripts /scripts/live-bottom
[ "${quiet}" != "y" ] && log_end_msg