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 upstream version 2.0~a3.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
6f4f5c1
..
afe0f4b
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-53,31
+53,18
@@
Arguments ()
case "${ARGUMENT}" in
skipconfig)
NOACCESSIBILITY="Yes"
case "${ARGUMENT}" in
skipconfig)
NOACCESSIBILITY="Yes"
- NOAPPARMOR="Yes"
NOAPTCDROM="Yes"
NOAUTOLOGIN="Yes"
NOCONSOLEKEYBOARD="Yes"
NOFASTBOOT="Yes"
NOFSTAB="Yes"
NOAPTCDROM="Yes"
NOAUTOLOGIN="Yes"
NOCONSOLEKEYBOARD="Yes"
NOFASTBOOT="Yes"
NOFSTAB="Yes"
- NOGNOMEPANEL="Yes"
NOHOSTS="Yes"
NOHOSTS="Yes"
- NOJOCKEY="Yes"
- NOKPERSONALIZER="Yes"
- NOLANGUAGESELECTOR="Yes"
- NOLOCALES="Yes"
NONETWORKING="Yes"
NONETWORKING="Yes"
- NOPOLKITCONF="Yes"
- NOPOWERMANAGEMENT="Yes"
- NOPROGRAMCRASHES="Yes"
- NOSUDO="Yes"
NOTIMEZONE="Yes"
NOTIMEZONE="Yes"
- NOUPDATENOTIFIER="Yes"
- NOUSER="Yes"
NOXAUTOCONFIG="Yes"
NOXAUTOLOGIN="Yes"
NOXAUTOCONFIG="Yes"
NOXAUTOLOGIN="Yes"
- NOXSCREENSAVER="Yes"
- export NOACCESSIBILITY NOAP
PARMOR NOAPTCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOGNOMEPANEL NOHOSTS NOJOCKEY NOKPERSONALIZER NOLANGUAGESELECTOR NOLOCALES NONETWORKING NOPOLKITCONF NOPOWERMANAGEMENT NOPROGRAMCRASHES NOSUDO NOTIMEZONE NOUPDATENOTIFIER NOUSER NOXAUTOCONFIG NOXAUTOLOGIN NOXSCREENSAVER
+ export NOACCESSIBILITY NOAP
TCDROM NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NOHOSTS NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
;;
access=*)
;;
access=*)
@@
-122,11
+109,6
@@
Arguments ()
export FORCEPERSISTENTFSCK
;;
export FORCEPERSISTENTFSCK
;;
- hook=*)
- HOOK="${ARGUMENT#hook=}"
- export HOOK
- ;;
-
ftpfs=*)
FTPFS="${ARGUMENT#ftpfs=}"
export FTPFS
ftpfs=*)
FTPFS="${ARGUMENT#ftpfs=}"
export FTPFS
@@
-137,12
+119,6
@@
Arguments ()
export HTTPFS
;;
export HTTPFS
;;
- hostname=*)
- HOSTNAME="${ARGUMENT#hostname=}"
- LIVECONF="changed"
- export HOSTNAME LIVECONF
- ;;
-
isofrom=*|fromiso=*)
FROMISO="${ARGUMENT#*=}"
export FROMISO
isofrom=*|fromiso=*)
FROMISO="${ARGUMENT#*=}"
export FROMISO
@@
-236,17
+212,6
@@
Arguments ()
export LIVE_MEDIA_TIMEOUT
;;
export LIVE_MEDIA_TIMEOUT
;;
- language=*|debian-installer/language=*)
- language=${x#debian-installer/language=}
- locale="$(lang2locale "$language")"
- set_locale="true"
- ;;
-
- locale=*|debian-installer/locale=*)
- LOCALE="${ARGUMENT#*=}"
- export LOCALE
- ;;
-
module=*)
MODULE="${ARGUMENT#module=}"
export MODULE
module=*)
MODULE="${ARGUMENT#module=}"
export MODULE
@@
-272,11
+237,6
@@
Arguments ()
export NOACCESSIBILITY
;;
export NOACCESSIBILITY
;;
- noapparmor)
- NOAPPARMOR="Yes"
- export NOAPPARMOR
- ;;
-
noaptcdrom)
NOAPTCDROM="Yes"
export NOAPTCDROM
noaptcdrom)
NOAPTCDROM="Yes"
export NOAPTCDROM
@@
-307,71
+267,21
@@
Arguments ()
export NOFSTAB
;;
export NOFSTAB
;;
- nognomepanel)
- NOGNOMEPANEL="Yes"
- export NOGNOMEPANEL
- ;;
-
nohosts)
NOHOSTS="Yes"
export NOHOSTS
;;
nohosts)
NOHOSTS="Yes"
export NOHOSTS
;;
- nokpersonalizer)
- NOKPERSONALIZER="Yes"
- export NOKPERSONALIZER
- ;;
-
- nolanguageselector)
- NOLANGUAGESELECTOR="Yes"
- export NOLANGUAGESELECTOR
- ;;
-
- nolocales)
- NOLOCALES="Yes"
- export NOLOCALES
- ;;
-
nonetworking)
NONETWORKING="Yes"
export NONETWORKING
;;
nonetworking)
NONETWORKING="Yes"
export NONETWORKING
;;
- nopowermanagement)
- NOPOWERMANAGEMENT="Yes"
- export NOPOWERMANAGEMENT
- ;;
-
- noprogramcrashes)
- NOPROGRAMCRASHES="Yes"
- export NOPROGRAMCRASHES
- ;;
-
- nojockey)
- NOJOCKEY="Yes"
- export NOJOCKEY
- ;;
-
- nosudo)
- NOSUDO="Yes"
- export NOSUDO
- ;;
-
swapon)
SWAPON="Yes"
export SWAPON
;;
swapon)
SWAPON="Yes"
export SWAPON
;;
- noupdatenotifier)
- NOUPDATENOTIFIER="Yes"
- export NOUPDATENOTIFIER
- ;;
-
- nouser)
- NOUSER="Yes"
- export NOUSER
- ;;
-
noxautoconfig)
NOXAUTOCONFIG="Yes"
export NOXAUTOCONFIG
noxautoconfig)
NOXAUTOCONFIG="Yes"
export NOXAUTOCONFIG
@@
-520,11
+430,6
@@
Arguments ()
export UNIONTYPE
;;
export UNIONTYPE
;;
- utc=*)
- UTC="${ARGUMENT#utc=}"
- export UTC
- ;;
-
xdebconf)
XDEBCONF="Yes"
export XDEBCONF
xdebconf)
XDEBCONF="Yes"
export XDEBCONF
@@
-667,7
+572,7
@@
is_nice_device ()
{
sysfs_path="${1#/sys}"
{
sysfs_path="${1#/sys}"
- if /lib/udev/path_id "${sysfs_path}" |
grep -E
-q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
+ if /lib/udev/path_id "${sysfs_path}" |
egrep
-q "ID_PATH=(usb|pci-|platform-orion-ehci|platform-mmc|platform-mxsdhci|)"
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@
-705,7
+610,7
@@
copy_live_to ()
if [ "${copytodev}" = "ram" ]
then
# copying to ram:
if [ "${copytodev}" = "ram" ]
then
# copying to ram:
- freespace=$(
expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo )
)
+ freespace=$(
awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo
)
mount_options="-o size=${size}k"
free_string="memory"
fstype="tmpfs"
mount_options="-o size=${size}k"
free_string="memory"
fstype="tmpfs"
@@
-759,7
+664,11
@@
copy_live_to ()
rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console # "cp -a" from busybox also copies hidden files
else
mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console # "cp -a" from busybox also copies hidden files
else
mkdir -p ${copyto}/${LIVE_MEDIA_PATH}
- cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH} # "cp -a" from busybox also copies hidden files
+ cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/* ${copyto}/${LIVE_MEDIA_PATH}
+ if [ -e ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ]
+ then
+ cp -a ${copyfrom}/${LIVE_MEDIA_PATH}/.disk ${copyto}
+ fi
fi
fi
fi
fi
@@
-1008,7
+917,7
@@
do_snap_copy ()
todev=$(awk -v pat="$(base_path ${todir})" '$2 == pat { print $1 }' /proc/mounts)
freespace=$(df -k | awk '/'${todev}'/{print $4}')
else
todev=$(awk -v pat="$(base_path ${todir})" '$2 == pat { print $1 }' /proc/mounts)
freespace=$(df -k | awk '/'${todev}'/{print $4}')
else
- freespace=$(
expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( awk '/\<Cached/{print $2}' /proc/meminfo)
)
+ freespace=$(
awk '/^MemFree:/{f=$2} /^Cached:/{c=$2} END{print f+c}' /proc/meminfo
)
fi
tomount="/mnt/tmpsnap"
fi
tomount="/mnt/tmpsnap"
@@
-1066,7
+975,7
@@
find_snap ()
try_snap ()
{
# copy the contents of previously found snapshot to ${snap_mount}
try_snap ()
{
# copy the contents of previously found snapshot to ${snap_mount}
- # and remember the device and filename for resync on exit in live-
initramfs
.init
+ # and remember the device and filename for resync on exit in live-
boot
.init
snapdata="${1}"
snap_mount="${2}"
snapdata="${1}"
snap_mount="${2}"
@@
-1677,7
+1586,7
@@
find_livefs ()
# or do the scan of block devices
# prefer removable devices over non-removable devices, so scan them first
# or do the scan of block devices
# prefer removable devices over non-removable devices, so scan them first
- for sysblock in $(echo /sys/block/* | tr ' ' '\n' |
grep -vE
"/(loop|ram|dm-|fd)")
+ for sysblock in $(echo /sys/block/* | tr ' ' '\n' |
egrep -v
"/(loop|ram|dm-|fd)")
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
@@
-1717,7
+1626,7
@@
find_livefs ()
then
# This is an ugly hack situation, the block device has
# an image directly on it. It's hopefully
then
# This is an ugly hack situation, the block device has
# an image directly on it. It's hopefully
- # live-
initramfs
, so take it and run with it.
+ # live-
boot
, so take it and run with it.
ln -s "${devname}" "${devname}.${fstype}"
echo "${devname}.${fstype}"
return 0
ln -s "${devname}" "${devname}.${fstype}"
echo "${devname}.${fstype}"
return 0
@@
-1885,6
+1794,13
@@
mountroot ()
mount -n -o bind /dev "${rootmnt}/dev"
fi
mount -n -o bind /dev "${rootmnt}/dev"
fi
+ # Move to the new root filesystem so that programs there can get at it.
+ if [ ! -d /root/live/image ]
+ then
+ mkdir -p /root/live/image
+ mount --move /live/image /root/live/image
+ fi
+
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"
maybe_break live-bottom
log_begin_msg "Running /scripts/live-bottom\n"