export DEFCONSOLE
;;
+ BOOTIF=*)
+ BOOTIF="${x#BOOTIF=}"
+ ;;
+
debug)
DEBUG="Yes"
export DEBUG
;;
fetch=*)
- FETCH="${ARGUMENT#fetch=}"
- export FETCH
- ;;
+ FETCH="${ARGUMENT#fetch=}"
+ export FETCH
+ ;;
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
httpfs=*)
HTTPFS="${ARGUMENT#httpfs=}"
export HTTPFS
- ;;
+ ;;
iscsi=*)
ISCSI="${ARGUMENT#iscsi=}"
export NONETWORKING
;;
+ ramdisk-size=*)
+ ramdisk_size="${ARGUMENT#ramdisk-size=}"
+ ;;
+
swapon)
SWAPON="Yes"
export SWAPON
export NOPERSISTENT
;;
+ noprompt)
+ NOPROMPT="Yes"
+ export NOPROMPT
+ ;;
+
+ noprompt=*)
+ NOPROMPT="${ARGUMENT#noprompt=}"
+ export NOPROMPT
+ ;;
+
quickusbmodules)
QUICKUSBMODULES="Yes"
export QUICKUSBMODULES
;;
skipunion)
- SKIP_UNION_MOUNTS="Yes"
- export SKIP_UNION_MOUNTS
- ;;
+ SKIP_UNION_MOUNTS="Yes"
+ export SKIP_UNION_MOUNTS
+ ;;
root=*)
ROOT="${ARGUMENT#root=}"
elif echo ${sysfs_path} | grep -q "^/block/dm-"
then
return 0
+ elif echo ${sysfs_path} | grep -q "^/block/mtdblock"
+ then
+ return 0
fi
return 1
return 1
fi
+ # Custom ramdisk size
+ if [ -z "${mount_options}" ] && [ -n "${ramdisk_size}" ]
+ then
+ # FIXME: should check for wrong values
+ mount_options="-o size=${ramdisk_size}"
+ fi
+
# begin copying (or uncompressing)
mkdir "${copyto}"
log_begin_msg "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
udevadm trigger
udevadm settle
+ [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
+ echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
+
if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
[ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
then
+
+ # support for Syslinux IPAPPEND parameter
+ # it sets the BOOTIF variable on the kernel parameter
+
+ if [ -n "${BOOTIF}" ]
+ then
+ # pxelinux sets BOOTIF to a value based on the mac address of the
+ # network card used to PXE boot, so use this value for DEVICE rather
+ # than a hard-coded device name from initramfs.conf. this facilitates
+ # network booting when machines may have multiple network cards.
+ # pxelinux sets BOOTIF to 01-$mac_address
+
+ # strip off the leading "01-", which isn't part of the mac
+ # address
+ temp_mac=${BOOTIF#*-}
+
+ # convert to typical mac address format by replacing "-" with ":"
+ bootif_mac=""
+ IFS='-'
+ for x in $temp_mac
+ do
+ if [ -z "$bootif_mac" ]
+ then
+ bootif_mac="$x"
+ else
+ bootif_mac="$bootif_mac:$x"
+ fi
+ done
+ unset IFS
+
+ # look for devices with matching mac address, and set DEVICE to
+ # appropriate value if match is found.
+
+ for device in /sys/class/net/*
+ do
+ if [ -f "$device/address" ]
+ then
+ current_mac=$(cat "$device/address")
+
+ if [ "$bootif_mac" = "$current_mac" ]
+ then
+ DEVICE=${device##*/}
+ break
+ fi
+ fi
+ done
+ fi
+
# 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)
devlist="$devlist $device"
done
- [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
- echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
-
# this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
# an endless loop; iff execution fails give it two further tries, that's
# why we use '$devlist $devlist $devlist' for the other for loop
done
else
- ipconfig ${DEVICE} | tee /netboot.config
- fi
-
- # source relevant ipconfig output
- OLDHOSTNAME=${HOSTNAME}
- . /tmp/net-${DEVICE}.conf
- [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
- export HOSTNAME
-
- if [ -n "${DEVICE}" ]
- then
- HWADDR="$(cat /sys/class/net/${DEVICE}/address)"
+ for interface in ${DEVICE}; do
+ ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
+ [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+ if [ "$IPV4ADDR" != "0.0.0.0" ]
+ then
+ break
+ fi
+ done
fi
- if [ ! -e "/etc/resolv.conf" ]
- then
- echo "Creating /etc/resolv.conf"
+ for interface in ${DEVICE}; do
+ # source relevant ipconfig output
+ OLDHOSTNAME=${HOSTNAME}
+ [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
+ [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}
+ export HOSTNAME
- if [ -n "${DNSDOMAIN}" ]
+ if [ -n "${interface}" ]
then
- echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
- echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+ HWADDR="$(cat /sys/class/net/${interface}/address)"
fi
- for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
- do
- echo "nameserver $i" >> /etc/resolv.conf
- done
- fi
+ if [ ! -e "/etc/resolv.conf" ]
+ then
+ echo "Creating /etc/resolv.conf"
- # Check if we have a network device at all
- if ! ls /sys/class/net/"$DEVICE" > /dev/null 2>&1 && \
- ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
- ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \
- ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \
- ! ls /sys/class/net/ra0 > /dev/null 2>&1
- then
- panic "No supported network device found, maybe a non-mainline driver is required."
- fi
+ if [ -n "${DNSDOMAIN}" ]
+ then
+ echo "domain ${DNSDOMAIN}" > /etc/resolv.conf
+ echo "search ${DNSDOMAIN}" > /etc/resolv.conf
+ fi
+
+ for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
+ do
+ echo "nameserver $i" >> /etc/resolv.conf
+ done
+ fi
+
+ # Check if we have a network device at all
+ if ! ls /sys/class/net/"$interface" > /dev/null 2>&1 && \
+ ! ls /sys/class/net/eth0 > /dev/null 2>&1 && \
+ ! ls /sys/class/net/wlan0 > /dev/null 2>&1 && \
+ ! ls /sys/class/net/ath0 > /dev/null 2>&1 && \
+ ! ls /sys/class/net/ra0 > /dev/null 2>&1
+ then
+ panic "No supported network device found, maybe a non-mainline driver is required."
+ fi
+ done
}
do_netmount()
[ "${DEBUG}" == "Yes" ] && debugopt="-d 8"
#FIXME this name is supposed to be unique - some date + ifconfig hash?
ISCSI_INITIATORNAME="iqn.1993-08.org.debian.live:01:$(echo "${HWADDR}" | sed -e s/://g)"
- export ISCSI_INITIATORNAME
+ export ISCSI_INITIATORNAME
if [ -n "${ISCSI_SERVER}" ] ; then
iscsistart $debugopt -i "${ISCSI_INITIATORNAME}" -t "${ISCSI_TARGET}" -g 1 -a "${ISCSI_SERVER}" -p "${ISCSI_PORT}"
else
try_snap ()
{
- # copy the contents of previously found snapshot to ${snap_mount}
+ # copy the contents of previously found snapshot to ${snap_mount}
# and remember the device and filename for resync on exit in live-boot.init
snapdata="${1}"
{
image_directory="${1}"
rootmnt="${2}"
- addimage_directory="${3}"
+ addimage_directory="${3}"
case ${UNIONTYPE} in
aufs|unionfs)
if [ "$ISO_DEVICE" = "/" ]
then
- echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live.log
+ echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
else
mkdir /isofrom
- mount "$ISO_DEVICE" /isofrom
+ mount -t auto "$ISO_DEVICE" /isofrom
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
devname="${loopdevname}"
do
if [ "$(cat ${sysblock}/removable)" = "1" ]
then
- if readlink ${sysblock} | grep -q usb ||
- readlink ${sysblock}/device | grep -q usb # linux < 2.6.29
+ if readlink ${sysblock} | grep -q usb
then
for dev in $(subdevices "${sysblock}")
do
mountroot ()
{
- if [ -x /scripts/local-top/cryptroot ]; then
+ if [ -x /scripts/local-top/cryptroot ]; then
/scripts/local-top/cryptroot
fi
exec 6>&1
exec 7>&2
- exec > live.log
+ exec > live-boot.log
exec 2>&1
- tail -f live.log >&7 &
+ tail -f live-boot.log >&7 &
tailpid="${!}"
# Ensure 'panic' function is overridden
exec 1>&6 6>&-
exec 2>&7 7>&-
kill ${tailpid}
- [ -w "${rootmnt}/var/log/" ] && cp live.log "${rootmnt}/var/log/" 2>/dev/null
+ [ -w "${rootmnt}/var/log/" ] && cp live-boot.log "${rootmnt}/var/log/" 2>/dev/null
}