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 debian version 2.0~a1-1.
[live-boot-grml.git]
/
scripts
/
live
diff --git
a/scripts/live
b/scripts/live
index
6318643
..
4169c90
100755
(executable)
--- a/
scripts/live
+++ b/
scripts/live
@@
-20,6
+20,7
@@
USERFULLNAME="Live user"
HOSTNAME="host"
mkdir -p "${mountpoint}"
HOSTNAME="host"
mkdir -p "${mountpoint}"
+tried="/tmp/tried"
# Create /etc/mtab for debug purpose and future syncs
if [ ! -d /etc ]
# Create /etc/mtab for debug purpose and future syncs
if [ ! -d /etc ]
@@
-45,37
+46,26
@@
fi
Arguments ()
{
PRESEEDS=""
Arguments ()
{
PRESEEDS=""
+ LOCATIONS=""
for ARGUMENT in $(cat /proc/cmdline)
do
case "${ARGUMENT}" in
skipconfig)
NOACCESSIBILITY="Yes"
for ARGUMENT in $(cat /proc/cmdline)
do
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"
NOLOCALES="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 NOLOCALES NONETWORKING NOTIMEZONE NOXAUTOCONFIG NOXAUTOLOGIN
;;
access=*)
;;
access=*)
@@
-120,11
+110,6
@@
Arguments ()
export FORCEPERSISTENTFSCK
;;
export FORCEPERSISTENTFSCK
;;
- hook=*)
- HOOK="${ARGUMENT#hook=}"
- export HOOK
- ;;
-
ftpfs=*)
FTPFS="${ARGUMENT#ftpfs=}"
export FTPFS
ftpfs=*)
FTPFS="${ARGUMENT#ftpfs=}"
export FTPFS
@@
-135,12
+120,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
@@
-270,11
+249,6
@@
Arguments ()
export NOACCESSIBILITY
;;
export NOACCESSIBILITY
;;
- noapparmor)
- NOAPPARMOR="Yes"
- export NOAPPARMOR
- ;;
-
noaptcdrom)
NOAPTCDROM="Yes"
export NOAPTCDROM
noaptcdrom)
NOAPTCDROM="Yes"
export NOAPTCDROM
@@
-305,26
+279,11
@@
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
nolocales)
NOLOCALES="Yes"
export NOLOCALES
@@
-335,41
+294,11
@@
Arguments ()
export NONETWORKING
;;
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
@@
-417,8
+346,8
@@
Arguments ()
;;
preseed/file=*|file=*)
;;
preseed/file=*|file=*)
- LOCATION
="${ARGUMENT#*=
}"
- export LOCATION
+ LOCATION
S="${ARGUMENT#*=} ${LOCATIONS
}"
+ export LOCATION
S
;;
nopreseed)
;;
nopreseed)
@@
-427,7
+356,7
@@
Arguments ()
;;
url=*)
;;
url=*)
-
location
="${ARGUMENT#url=}"
+
URL_LOCATION
="${ARGUMENT#url=}"
mount -o bind /sys /root/sys
mount -o bind /proc /root/proc
mount -o bind /sys /root/sys
mount -o bind /proc /root/proc
@@
-435,14
+364,14
@@
Arguments ()
mkdir -p /root/var/run/network
[ "${NETBOOT}" ] || chroot /root dhclient eth0
mkdir -p /root/var/run/network
[ "${NETBOOT}" ] || chroot /root dhclient eth0
- chroot /root wget -P /tmp "${
location
}"
+ chroot /root wget -P /tmp "${
URL_LOCATION
}"
[ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
umount /root/sys
umount /root/proc
umount /root/dev
[ "${NETBOOT}" ] || chroot /root ifconfig eth0 down
umount /root/sys
umount /root/proc
umount /root/dev
- LOCATION
="/tmp/$(basename "${location}")
"
+ LOCATION
S="/tmp/$(basename ${URL_LOCATION}) ${LOCATIONS}
"
;;
*/*=*)
;;
*/*=*)
@@
-518,11
+447,6
@@
Arguments ()
export UNIONTYPE
;;
export UNIONTYPE
;;
- utc=*)
- UTC="${ARGUMENT#utc=}"
- export UTC
- ;;
-
xdebconf)
XDEBCONF="Yes"
export XDEBCONF
xdebconf)
XDEBCONF="Yes"
export XDEBCONF
@@
-665,12
+589,15
@@
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-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
then
return 0
elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
then
return 0
+ elif echo ${sysfs_path} | grep -q "^/block/dm-"
+ then
+ return 0
fi
return 1
fi
return 1
@@
-700,7
+627,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"
@@
-754,7
+681,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
@@
-775,6
+706,10
@@
do_netmount ()
udevadm trigger
udevadm settle
udevadm trigger
udevadm settle
+ if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
+ [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
+ then
+
# if ethdevice was not specified on the kernel command line
# make sure we try to get a working network configuration
# for *every* present network device (except for loopback of course)
# if ethdevice was not specified on the kernel command line
# make sure we try to get a working network configuration
# for *every* present network device (except for loopback of course)
@@
-818,6
+753,10
@@
do_netmount ()
fi
done
fi
done
+ else
+ ipconfig ${DEVICE} | tee /netboot.config
+ fi
+
# source relevant ipconfig output
OLDHOSTNAME=${HOSTNAME}
. /tmp/net-${DEVICE}.conf
# source relevant ipconfig output
OLDHOSTNAME=${HOSTNAME}
. /tmp/net-${DEVICE}.conf
@@
-995,7
+934,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"
@@
-1053,7
+992,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}"
@@
-1563,6
+1502,7
@@
check_dev ()
umount $mountpoint
fi
fi
umount $mountpoint
fi
fi
+ [ -e "$devname" ] || continue
if [ -n "${LIVE_MEDIA_OFFSET}" ]
then
if [ -n "${LIVE_MEDIA_OFFSET}" ]
then
@@
-1574,7
+1514,10
@@
check_dev ()
if is_supported_fs ${fstype}
then
if is_supported_fs ${fstype}
then
+ devuid=$(blkid -o value -s UUID "$devname")
+ [ -n "$devuid" ] && grep -qs "\<$devuid\>" $tried && continue
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
+ [ -n "$devuid" ] && echo "$devuid" >> $tried
if is_live_path ${mountpoint} && \
([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
if is_live_path ${mountpoint} && \
([ "${skip_uuid_check}" ] || matches_uuid ${mountpoint})
@@
-1660,7
+1603,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
@@
-1674,6
+1617,7
@@
find_livefs ()
for sysblock in $devices_to_scan
do
devname=$(sys2dev "${sysblock}")
for sysblock in $devices_to_scan
do
devname=$(sys2dev "${sysblock}")
+ [ -e "$devname" ] || continue
fstype=$(get_fstype "${devname}")
if /lib/udev/cdrom_id ${devname} > /dev/null
fstype=$(get_fstype "${devname}")
if /lib/udev/cdrom_id ${devname} > /dev/null
@@
-1699,7
+1643,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
@@
-1745,6
+1689,14
@@
integrity_check ()
fi
}
fi
}
+start_usplash_pulse ()
+{
+ if [ -x /sbin/usplash_write ]
+ then
+ /sbin/usplash_write "PULSELOGO"
+ fi
+}
+
mountroot ()
{
if [ -x /scripts/local-top/cryptroot ]; then
mountroot ()
{
if [ -x /scripts/local-top/cryptroot ]; then
@@
-1764,6
+1716,7
@@
mountroot ()
Arguments
set_usplash_timeout
Arguments
set_usplash_timeout
+ start_usplash_pulse
maybe_break live-premount
log_begin_msg "Running /scripts/live-premount"
maybe_break live-premount
log_begin_msg "Running /scripts/live-premount"
@@
-1858,6
+1811,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"