X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;h=03905b52c1af67a0246186dc2bfe2264058fc36e;hb=f0d756e45675fbf829e8ee71ded7c42126dd43ab;hp=58672094c3e9b4369568f72d5ed8e0abb4047683;hpb=c4912ed805864433954e13e3b33b597241e74829;p=live-boot-grml.git diff --git a/scripts/live b/scripts/live index 5867209..03905b5 100755 --- a/scripts/live +++ b/scripts/live @@ -60,6 +60,11 @@ Arguments () export FETCH ;; + hook=*) + HOOK="${ARGUMENT#hook=}" + export HOOK + ;; + hostname=*) HOSTNAME="${ARGUMENT#hostname=}" LIVECONF="changed" @@ -229,11 +234,6 @@ Arguments () export NOKPERSONALIZER ;; - nokwallet) - NOKWALLET="Yes" - export NOKWALLET - ;; - nolanguageselector) NOLANGUAGESELECTOR="Yes" export NOLANGUAGESELECTOR @@ -322,9 +322,9 @@ Arguments () mount -n -o bind /dev /root/dev mkdir -p /root/var/run/network - chroot /root ifup -a + chroot /root dhclient eth0 chroot /root wget -P /tmp "${location}" - chroot /root ifdown -a + chroot /root ifconfig eth0 down umount /root/sys umount /root/proc @@ -381,6 +381,16 @@ Arguments () export EXPOSED_ROOT ;; + plainroot) + PLAIN_ROOT="Yes" + export PLAIN_ROOT + ;; + + root=*) + ROOT="${ARGUMENT#root=}" + export ROOT + ;; + union=*) UNIONTYPE="${ARGUMENT#union=}" export UNIONTYPE @@ -396,6 +406,11 @@ Arguments () export XDEBCONF ;; + xdriver=*) + XDRIVER="${ARGUMENT#xdriver=}" + export XDRIVER + ;; + xvideomode=*) XVIDEOMODE="${ARGUMENT#xvideomode=}" export XVIDEOMODE @@ -436,7 +451,7 @@ is_live_path () if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ] then - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs dir jffs2 do if [ "$(echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM})" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ] then @@ -476,7 +491,7 @@ matches_uuid () get_backing_device () { case "${1}" in - *.squashfs|*.ext2|*.ext3) + *.squashfs|*.ext2|*.ext3|*.jffs2) echo $(setup_loop "${1}" "loop" "/sys/block/loop*" '0' "${LIVE_MEDIA_ENCRYPTION}") ;; @@ -507,15 +522,16 @@ mount_images_in_directory () { directory="${1}" rootmnt="${2}" - mac="$3" + mac="${3}" if match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.squashfs" || match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext2" || match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.ext3" || + match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.jffs2" || match_files_in_dir "${directory}/${LIVE_MEDIA_PATH}/*.dir" then - [ -n "$mac" ] && adddirectory="$directory/${LIVE_MEDIA_PATH}/${mac}" + [ -n "${mac}" ] && adddirectory="${directory}/${LIVE_MEDIA_PATH}/${mac}" setup_unionfs "${directory}/${LIVE_MEDIA_PATH}" "${rootmnt}" "${adddirectory}" else : @@ -540,7 +556,7 @@ is_supported_fs () fstype="${1}" case ${fstype} in - vfat|iso9660|udf|ext2|ext3|ntfs) + vfat|iso9660|udf|ext2|ext3|ntfs|jffs2) return 0 ;; esac @@ -804,7 +820,7 @@ try_snap () snap_label="${1}" snap_mount="${2}" snap_type="${3}" - snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3") + snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2 ${snap_label}.ext3 ${snap_label}.jffs2") if [ ! -z "${snapdata}" ] then @@ -812,9 +828,9 @@ try_snap () snapback="$(echo ${snapdata} | cut -f2 -d ' ')" snapfile="$(echo ${snapdata} | cut -f3 -d ' ')" - if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\)' + if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\|ext3\|jffs2\)' then - # squashfs or ext2/ext3 snapshot + # squashfs, jffs2 or ext2/ext3 snapshot dev=$(get_backing_device "${snapback}/${snapfile}") if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" @@ -872,7 +888,7 @@ setup_unionfs () { image_directory="${1}" rootmnt="${2}" - addimage_directory="$3" + addimage_directory="${3}" modprobe -q -b ${UNIONTYPE} # run-init can't deal with images in a subdir, but we're going to @@ -891,6 +907,9 @@ setup_unionfs () 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 @@ -910,7 +929,7 @@ setup_unionfs () done else # ${MODULE}.module does not exist, create a list of images - for FILESYSTEM in squashfs ext2 ext3 xfs dir + for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir do for IMAGE in "${image_directory}"/*."${FILESYSTEM}" do @@ -921,18 +940,19 @@ setup_unionfs () done done - if [ -n "${addimage_directory}" -a -d "${addimage_directory}" ]; then - for FILESYSTEM in squashfs ext2 ext3 xfs dir - do - for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}" - do - if [ -e "${IMAGE}" ] - then - image_string="${image_string} ${IMAGE}" - fi - done - done - fi + if [ -n "${addimage_directory}" ] && [ -d "${addimage_directory}" ] + then + for FILESYSTEM in squashfs ext2 ext3 xfs jffs2 dir + do + for IMAGE in "${addimage_directory}"/*."${FILESYSTEM}" + do + if [ -e "${IMAGE}" ] + then + image_string="${image_string} ${IMAGE}" + fi + done + done + fi # Now sort the list image_string="$(echo ${image_string} | sed -e 's/ /\n/g' | sort )" @@ -982,6 +1002,8 @@ setup_unionfs () cow_fstype=$(get_fstype "${cowprobe}") else [ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent medium" + cowdevice="tmpfs" + cow_fstype="tmpfs" fi elif [ -n "${NFS_COW}" ] then @@ -994,7 +1016,7 @@ setup_unionfs () nfs_cow_opts="-o nolock" nfs_cow=${NFS_COW} fi - mac=$(get_mac) + mac="$(get_mac)" if [ -n "${mac}" ] then cowdevice=$(echo ${nfs_cow}|sed "s/client_mac_address/${mac}/") @@ -1159,7 +1181,7 @@ find_livefs () 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}") @@ -1181,7 +1203,8 @@ find_livefs () done elif [ "${fstype}" = "squashfs" -o \ "${fstype}" = "ext2" -o \ - "${fstype}" = "ext3" ] + "${fstype}" = "ext3" -o \ + "${fstype}" = "jffs2" ] then # This is an ugly hack situation, the block device has # an image directly on it. It's hopefully @@ -1195,14 +1218,6 @@ find_livefs () return 1 } -pulsate () -{ - if [ -x /sbin/usplash_write ] - then - /sbin/usplash_write "PULSATE" - fi -} - set_usplash_timeout () { if [ -x /sbin/usplash_write ] @@ -1213,6 +1228,11 @@ set_usplash_timeout () mountroot () { + + if [ -x /scripts/local-top/cryptroot ]; then + /scripts/local-top/cryptroot + fi + exec 6>&1 exec 7>&2 exec > live.log @@ -1222,7 +1242,6 @@ mountroot () set_usplash_timeout [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-premount" - pulsate run_scripts /scripts/live-premount [ "${quiet}" != "y" ] && log_end_msg @@ -1240,18 +1259,24 @@ mountroot () panic "Unable to find a live file system on the network" fi else - # Scan local devices for the image - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 - do - livefs_root=$(find_livefs ${i}) + if [ -n "${PLAIN_ROOT}" ] && [ -n "${ROOT}" ] + then + # Do a local boot from hd + livefs_root=${ROOT} + else + # Scan local devices for the image + for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 + do + livefs_root=$(find_livefs ${i}) - if [ -n "${livefs_root}" ] - then - break - fi + if [ -n "${livefs_root}" ] + then + break + fi - sleep 1 - done + sleep 1 + done + fi fi if [ -z "${livefs_root}" ] @@ -1278,8 +1303,8 @@ mountroot () then setup_unionfs "${livefs_root}" "${rootmnt}" else - mac=$(get_mac) - mac=$(echo ${mac}|sed "s/-//g") + mac="$(get_mac)" + mac="$(echo ${mac} | sed 's/-//g')" mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}" fi @@ -1288,7 +1313,6 @@ mountroot () maybe_break live-bottom [ "${quiet}" != "y" ] && log_begin_msg "Running /scripts/live-bottom" - pulsate run_scripts /scripts/live-bottom [ "${quiet}" != "y" ] && log_end_msg