projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding hook parameter to execute custom scripts.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
0443e35
..
ea770f4
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-60,6
+60,11
@@
Arguments ()
export FETCH
;;
export FETCH
;;
+ hook=*)
+ HOOK="${ARGUMENT#hook=}"
+ export HOOK
+ ;;
+
hostname=*)
HOSTNAME="${ARGUMENT#hostname=}"
LIVECONF="changed"
hostname=*)
HOSTNAME="${ARGUMENT#hostname=}"
LIVECONF="changed"
@@
-396,6
+401,11
@@
Arguments ()
export XDEBCONF
;;
export XDEBCONF
;;
+ xdriver=*)
+ XDRIVER="${ARGUMENT#xdriver=}"
+ export XDRIVER
+ ;;
+
xvideomode=*)
XVIDEOMODE="${ARGUMENT#xvideomode=}"
export XVIDEOMODE
xvideomode=*)
XVIDEOMODE="${ARGUMENT#xvideomode=}"
export XVIDEOMODE
@@
-892,6
+902,9
@@
setup_unionfs ()
then
# go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
roopt="nfsro"
then
# go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
roopt="nfsro"
+ elif [ "${UNIONTYPE}" = "aufs" ]
+ then
+ roopt="rr"
else
roopt="ro"
fi
else
roopt="ro"
fi
@@
-1163,7
+1176,7
@@
find_livefs ()
fi
# or do the scan of block devices
fi
# or do the scan of block devices
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram)
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram
| grep -v 'dm-'
)
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
do
devname=$(sys2dev "${sysblock}")
fstype=$(get_fstype "${devname}")
@@
-1210,6
+1223,11
@@
set_usplash_timeout ()
mountroot ()
{
mountroot ()
{
+
+ if [ -x /scripts/local-top/cryptroot ]; then
+ /scripts/local-top/cryptroot
+ fi
+
exec 6>&1
exec 7>&2
exec > live.log
exec 6>&1
exec 7>&2
exec > live.log