projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing exporting of variables for reviewed options in the cmdline function, not...
[live-boot-grml.git]
/
scripts
/
boot.sh
diff --git
a/scripts/boot.sh
b/scripts/boot.sh
index
90750b5
..
94f5e18
100755
(executable)
--- a/
scripts/boot.sh
+++ b/
scripts/boot.sh
@@
-444,11
+444,16
@@
mountroot ()
. /live.vars
. /live.vars
- Arguments
+ _CMDLINE="$(cat /proc/cmdline)"
+ Cmdline
- # make sure all harddisk devices are read-only
- # this is important for forensic investigations
- case "${READ_ONLY}" in
+ case "${LIVE_DEBUG}" in
+ true)
+ set -x
+ ;;
+ esac
+
+ case "${LIVE_READ_ONLY}" in
true)
Read_only
;;
true)
Read_only
;;
@@
-512,10
+517,11
@@
mountroot ()
panic "Unable to find a medium containing a live file system"
fi
panic "Unable to find a medium containing a live file system"
fi
- if [ "${INTEGRITY_CHECK}" ]
- then
- integrity_check "${livefs_root}"
- fi
+ case "${LIVE_VERIFY_CHECKSUMS}" in
+ true)
+ Verify_checksums "${livefs_root}"
+ ;;
+ esac
if [ "${TORAM}" ]
then
if [ "${TORAM}" ]
then
@@
-624,12
+630,23
@@
mountroot ()
log_end_msg
fi
log_end_msg
fi
+ if ! [ -d "/root/usr/share/live-boot" ]
+ then
+ panic "A wrong rootfs was mounted."
+ fi
+
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
run_scripts /scripts/live-bottom
log_end_msg
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
run_scripts /scripts/live-bottom
log_end_msg
+ case "${LIVE_SWAPON}" in
+ true)
+ Swapon
+ ;;
+ esac
+
if [ "${UNIONFS}" = unionfs-fuse ]
then
umount "${rootmnt}/dev"
if [ "${UNIONFS}" = unionfs-fuse ]
then
umount "${rootmnt}/dev"