Adding casper 1.63+debian-1.

10 files changed, 469 insertions, 283 deletions

diff --git a/scripts/casper b/scripts/casper
index 3d8c453..2375bb6 100644
--- a/scripts/casper
+++ b/scripts/casper
@@ -4,306 +4,466 @@
 
 export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin
 
-mountpoint=/cdrom
+mountpoint=/live_media
 
-mkdir -p $mountpoint
+# Will be mounted if found as copy on write instead of tmpfs
+persistence_pattern="casper-rw"
+
+# Each file found with this pattern will be mounted directly in the 
+# mountpoint extracted from file name "${other_mounts_pattern}<mountpoint>"
+other_mounts_pattern="casper-mount-"
+netboot=""
+
+#overlay_method=unionfs
+#if [ "${DPKG_ARCH}" = "ia64" ] || [ "${DPKG_ARCH}" = "hppa" ] || [ "${DPKG_ARCH}" = "sparc" ]; then
+#    overlay_method=devmapper
+#fi
 
-overlay_method=unionfs
-if [ "${DPKG_ARCH}" = "ia64" ] || [ "${DPKG_ARCH}" = "hppa" ] || [ "${DPKG_ARCH}" = "sparc" ]; then
-    overlay_method=devmapper
-fi
+USERNAME="casper"
+USERFULLNAME="Live session user"
+HOST="live"
 
-USERNAME=ubuntu
-USERFULLNAME="Ubuntu LiveCD user"
-HOST=ubuntu
+mkdir -p $mountpoint
 
 [ -f /etc/casper.conf ] && . /etc/casper.conf
 
 export USERNAME USERFULLNAME HOST
 
-casper_path() {
-    path=$1
-    if [ -e "$path/casper/filesystem.cloop" ]; then
-        echo "$path/casper/filesystem.cloop"
-        return 0
-    elif [ -e "$path/casper/filesystem.squashfs" ]; then
-        echo "$path/casper/filesystem.squashfs"
-        return 0
-    fi
-    return 1
+is_casper_path() {
+	path=$1
+	if [ -d "$path/casper" ]; then
+		if [ "$(echo $path/casper/*.cloop)" != "$path/casper/*.cloop" ] ||
+			[ "$(echo $path/casper/*.squashfs)" != "$path/casper/*.squashfs" ] ||
+			[ "$(echo $path/casper/*.ext2)" != "$path/casper/*.ext2" ] ||
+			[ "$(echo $path/casper/*.dir)" != "$path/casper/*.dir" ]; then
+			return 0
+		fi
+	fi
+	return 1
 }
 
 subdevices() {
-    sysblock=$1
-    r=""
-    for dev in "${sysblock}" "${sysblock}"/*; do
-        if [ -e "${dev}/dev" ]; then
-            r="${r} ${dev}"
-        fi
-    done
-    echo ${r}
+	sysblock=$1
+	r=""
+	for dev in "${sysblock}" "${sysblock}"/*; do
+		if [ -e "${dev}/dev" ]; then
+			r="${r} ${dev}"
+		fi
+	done
+	echo ${r}
 }
 
 get_backing_device() {
 	case "$1" in
-            *.cloop)
-                echo $(setup_loop "$1" "cloop" "/sys/block/cloop*")
+		*.cloop)
+			echo $(setup_loop "$1" "cloop" "/sys/block/cloop*")
+			;;
+		*.squashfs|*.ext2)
+			echo $(setup_loop "$1" "loop" "/sys/block/loop*")
+			;;
+		*.dir)
+			echo "directory"
+			;;
+		*)
+			panic "Unrecognized casper filesystem: $1"
 			;;
-            *.squashfs)
-                echo $(setup_loop "$1" "loop" "/sys/block/loop*")
-                ;;
-            *)
-                panic "Unrecognized casper filesystem: $1"
-                ;;
 	esac
 }
 
-setup_cow() {
-	case "$1" in
-            unionfs)
-                setup_unionfs "$2" "$rootmnt"
-                ;;
-            devmapper)
-                setup_devmapper "$2" "$rootmnt"
-	esac
+match_files_in_dir() {
+	# Does any files match pattern $1 ?
+
+	local pattern="$1"
+	if [ "$(echo $pattern)" != "$pattern" ]; then
+		return 0
+	fi
+	return 1
+}
+
+mount_images_in_directory() {
+	directory="$1"
+	rootmnt="$2"
+	if match_files_in_dir "$directory/casper/*.cloop"; then
+		# Let's hope there's just one matching *.cloop... FIXME
+		setup_devmapper $(get_backing_device "$directory/casper/*.cloop") "$rootmnt"
+	elif match_files_in_dir "$directory/casper/*.squashfs" || 
+		match_files_in_dir "$directory/casper/*.ext2" ||
+		match_files_in_dir "$directory/casper/*.dir"; then
+		setup_unionfs "$directory/casper" "$rootmnt"
+	else
+        :
+	fi
 }
 
 sys2dev() {
-    sysdev=${1#/sys}
-    echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
+	sysdev=${1#/sys}
+	echo "/dev/$(udevinfo -q name -p ${sysdev} 2>/dev/null|| echo ${sysdev##*/})"
 }
 
 setup_loop() {
-    local fspath=$1
-    local module=$2
-    local pattern=$3
-
-    modprobe -Qb "$module"
-    udevplug -W
- 
-    for loopdev in $pattern; do
-        if [ "$(cat $loopdev/size)" -eq 0 ]; then
-            dev=$(sys2dev "${loopdev}")
-            losetup "$dev" "$fspath"
-            echo "$dev"
-            return 0
-        fi
-    done
-    panic "No loop devices available"
+	local fspath=$1
+	local module=$2
+	local pattern=$3
+
+	modprobe -qb "$module"
+	if [ -x /sbin/udevplug ]; then
+		udevplug -W
+	else
+		udevtrigger
+	fi
+
+	for loopdev in $pattern; do
+		if [ "$(cat $loopdev/size)" -eq 0 ]; then
+			dev=$(sys2dev "${loopdev}")
+			losetup "$dev" "$fspath"
+			echo "$dev"
+			return 0
+		fi
+	done
+	panic "No loop devices available"
 }
 
 get_fstype() {
-    local FSTYPE
-    local FSSIZE
-    eval $(fstype < $1)
-    if [ "$FSTYPE" != "unknown" ]; then
-        echo $FSTYPE
-        return 0
-    fi
-    /lib/udev/vol_id -t $1 2>/dev/null
+	#FIXME# one use of this function expects "unknown" another does not!
+	# which is it???
+	local FSTYPE
+	local FSSIZE
+	eval $(fstype < $1)
+	if [ "$FSTYPE" != "unknown" ]; then
+		echo $FSTYPE
+		return 0
+	fi
+	/lib/udev/vol_id -t $1 2>/dev/null
 }
 
 setup_devmapper() {
-    backdev="$1"
-    rootmnt="$2"
+	backdev="$1"
+	rootmnt="$2"
 
-    modprobe -Qb dm-mod
-    COW_DEVICE=/dev/ram1
-    COW_NAME="casper-cow"
+	modprobe -qb dm-mod
+	COW_DEVICE=/dev/ram1
+	COW_NAME="casper-cow"
 
-    BACKING_FILE_SIZE=$(blockdev --getsize "$backdev")
-    MAX_COW_SIZE=$(blockdev --getsize "$COW_DEVICE")
-    CHUNK_SIZE=8 # sectors
+	BACKING_FILE_SIZE=$(blockdev --getsize "$backdev")
+	MAX_COW_SIZE=$(blockdev --getsize "$COW_DEVICE")
+	CHUNK_SIZE=8 # sectors
 
-    if [ -z "$COW_SIZE" -o "$COW_SIZE" -gt "$MAX_COW_SIZE" ]; then
-        COW_SIZE=$MAX_COW_SIZE
-    fi
+	if [ -z "$COW_SIZE" -o "$COW_SIZE" -gt "$MAX_COW_SIZE" ]; then
+		COW_SIZE=$MAX_COW_SIZE
+	fi
 
-    echo "0 $COW_SIZE linear $COW_DEVICE 0" | dmsetup create $COW_NAME
+	echo "0 $COW_SIZE linear $COW_DEVICE 0" | dmsetup create $COW_NAME
 
-    echo "0 $BACKING_FILE_SIZE snapshot $backdev /dev/mapper/$COW_NAME p $CHUNK_SIZE" | \
-        dmsetup create casper-snapshot
-    if [ "$(get_fstype $backdev)" = "unknown" ]; then
-        panic "Unknown file system type on $backdev"
-    fi
-    mount -t $(get_fstype "$backdev") /dev/mapper/casper-snapshot $rootmnt || panic "Can not mount /dev/mapper/casper/snapshot on $rootmnt"
+	echo "0 $BACKING_FILE_SIZE snapshot $backdev /dev/mapper/$COW_NAME p $CHUNK_SIZE" | \
+		dmsetup create casper-snapshot
+	if [ "$(get_fstype $backdev)" = "unknown" ]; then
+		panic "Unknown file system type on $backdev"
+	fi
+	mount -t $(get_fstype "$backdev") /dev/mapper/casper-snapshot $rootmnt || panic "Can not mount /dev/mapper/casper/snapshot on $rootmnt"
 
-    mkdir -p "$rootmnt/rofs"
-    echo "0 $BACKING_FILE_SIZE linear $backdev 0" | dmsetup create casper-backing
-    mount -t $(get_fstype "$backdev") /dev/mapper/casper-backing "$rootmnt/rofs"
+	mkdir -p "$rootmnt/rofs"
+	echo "0 $BACKING_FILE_SIZE linear $backdev 0" | dmsetup create casper-backing
+	mount -t $(get_fstype "$backdev") /dev/mapper/casper-backing "$rootmnt/rofs"
 }
 
 where_is_mounted() {
-    device=$1
-    if grep -q "^$device " /proc/mounts; then
-        grep "^$device " /proc/mounts | read d mountpoint rest
-        echo $mountpoint
-        return 0
-    fi
-    return 1
+	device=$1
+	if grep -q "^$device " /proc/mounts; then
+		grep "^$device " /proc/mounts | read d mountpoint rest
+		echo $mountpoint
+		return 0
+	fi
+	return 1
+}
+
+copy_to_ram() {
+	copyform="$1"
+	copyto="${copyform}_swap"
+
+	size=$(du -ks ${copyform} | cut -f1)
+	size=$(expr ${size} + ${size}/20 ) # Fixme: 5% more to be sure
+	needed_space=$(expr ${size} * 1024)
+	freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
+	
+	if [ ! ${freespace} -lt ${needed_space}  ] ; then
+		[ "$quiet" != "y" ] && log_begin_msg "Not enough free memory to copy to ram"
+		[ "$quiet" != "y" ] && log_end_msg
+		return
+	else
+		[ "$quiet" != "y" ] && log_begin_msg "Copying live media to ram..."
+		mkdir "${copyto}"
+		mount -t tmpfs -o size=${size}k /dev/shm ${copyto}
+		cp -a ${copyform}/* ${copyto}
+		umount ${copyform}
+		mount -r -o move ${copyto} ${copyform}
+		rmdir ${copyto}
+		[ "$quiet" != "y" ] && log_end_msg
+	fi
 }
 
 find_cow_device() {
-    for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
-        for dev in $(subdevices "${sysblock}"); do
-            devname=$(sys2dev "${dev}")
-            if [ "$(/lib/udev/vol_id -l $devname 2>/dev/null)" = "casper-rw" ]; then
-                echo "$devname"
-                return
-            elif [ "$(get_fstype ${devname})" = "vfat" ]; then
-                mkdir -p /cow-backing
-                if where_is_mounted ${devname} > /dev/null; then
-                    mount -o remount,rw ${devname} $(where_is_mounted ${devname}) || panic "Remounting failed"
-                    mount -o bind $(where_is_mounted ${devname}) /cow-backing || panic "Cannot bind-mount"
-                else
-                    mount -t $(get_fstype "${devname}") -o rw "${devname}" /cow-backing || panic "Cannot mount $devname on /cow-backing"
-                fi
-
-                if [ -e "/cow-backing/casper-rw" ]; then
-                    echo $(setup_loop "/cow-backing/casper-rw" "loop" "/sys/block/loop*")
-                    return 0
-                else
-                    umount /cow-backing
-                fi
-            fi
-            
-        done
-    done
-    return 1    
+	pers_label="${1}"
+	cow_backing="/${pers_label}-backing"
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop); do
+		for dev in $(subdevices "${sysblock}"); do
+			devname=$(sys2dev "${dev}")
+			if [ "$(/lib/udev/vol_id -l $devname 2>/dev/null)" = "${pers_label}" ]; then
+				echo "$devname"
+				return
+			elif [ "$(get_fstype ${devname})" = "vfat" ]; then
+				mkdir -p "${cow_backing}"
+				if where_is_mounted ${devname} > /dev/null; then
+					mount -o remount,rw ${devname} $(where_is_mounted ${devname}) || panic "Remounting failed"
+					mount -o bind $(where_is_mounted ${devname}) ${cow_backing} || panic "Cannot bind-mount"
+				else
+					mount -t $(get_fstype "${devname}") -o rw "${devname}" ${cow_backing} || panic "Cannot mount $devname on /cow-backing"
+				fi
+
+				if [ -e "${cow_backing}/${pers_label}" ]; then
+					echo $(setup_loop "${cow_backing}/${pers_label}" "loop" "/sys/block/loop*")
+					return 0
+				else
+					umount ${cow_backing}
+				fi
+			fi
+		done
+	done
+}
+
+do_netmount() {
+	# Will mount a remote share and return the mountpoint
+
+	modprobe -q nfs
+	# For DHCP
+	modprobe -q af_packet
+
+	ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf
+	if [ "x${NFSROOT}" = "xauto" ]; then
+		NFSROOT=${ROOTSERVER}:${ROOTPATH}
+	fi
+
+	#choose NFS or CIFS mount 
+	if [ ${netboot} = "NFS"  ] ; then
+		echo $(do_nfsmount)
+	else
+		echo $(do_cifsmount)
+	fi
+}
+
+do_nfsmount() {
+	if [ "x${NFSOPTS}" = "x" ]; then
+		NFSOPTS=""
+	fi
+
+	[ "$quiet" != "y" ] && log_begin_msg "Mounting NFS with nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
+	while true ; do 
+			nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && break
+		sleep 1
+	done
+	echo "${mountpoint}"
+	# FIXME: add error check
+	[ "$quiet" != "y" ] && log_end_msg
+}
+
+do_cifsmount() {
+	NFSOPTS="-ouser=root,password="
+
+	[ "$quiet" != "y" ] && log_begin_msg "Mounting using mount.cifs with ${NFSROOT} ${mountpoint} ${NFSOPTS}"
+	mount.cifs "${NFSROOT}" "${mountpoint}" "${NFSOPTS}" && echo "${mountpoint}"
+	# FIXME: add error check
+	[ "$quiet" != "y" ] && log_end_msg
 }
 
 setup_unionfs() {
-	backdev="$1"
+	image_directory="$1"
 	rootmnt="$2"
-        modprobe -Qb unionfs
-        mkdir -p /cow
-
-        if grep -q persistent /proc/cmdline; then
-            i=0
-            # We love udev and the kernel!
-            while [ "$i" -lt 300 ]; do
-                cowdevice=$(find_cow_device) 
-                if [ -b "$cowdevice" ]; then
-                    mount -t $(get_fstype "$cowdevice") -o rw "$cowdevice" /cow || panic "Can not mount $cowdevice on /cow"
-                    break
-                fi
-                sleep 5
-#                sleep 0.1
-                i=$(( $i + 1 ))
-            done
-        else
-            mount -t tmpfs tmpfs /cow
-        fi
-
-	mkdir -p /rofs
-    if [ "$(get_fstype $backdev)" = "unknown" ]; then
-        panic "Unknown file system type on $backdev"
-    fi
-	mount -t $(get_fstype "$backdev") -o ro "$backdev" /rofs || panic "Can not mount $backdev on /rofs"
-
-	mount -t unionfs -o dirs=/cow=rw:/rofs=ro unionfs "$rootmnt"
-        if grep -q show-cow /proc/cmdline; then
-            mkdir -p "$rootmnt/cow"
-            mount -o bind /cow "$rootmnt/cow"
-        fi
-        mkdir -p "$rootmnt/rofs"
-        mount -o bind /rofs "$rootmnt/rofs"
+	image_type="$3"
+
+	modprobe -qb unionfs
+	croot=""	# Should really be /casper, but run-init doesn't handle
+				# mount-points in subdirectories at all
+
+	# Let's just mount the read-only file systems first
+	rofsstring=""
+	rofslist=""
+	mkdir -p "${croot}"
+	for image_type in "ext2" "squashfs" "dir" ; do
+		for image in "${image_directory}"/*."${image_type}"; do
+			imagename=$(basename "${image}")
+			if [ -d "${image}" ]; then
+				# it is a plain directory: do nothing
+				rofslist="${image} ${rofslist}"
+				rofsstring="${image}=ro:${rofsstring}"
+			elif [ -f "${image}" ]; then
+				backdev=$(get_backing_device "$image")
+				fstype=$(get_fstype "${backdev}")
+				if [ "${fstype}" = "unknown" ]; then
+					panic "Unknown file system type on ${backdev} (${image})"
+				fi
+				mkdir -p "${croot}/${imagename}"
+				mount -t "${fstype}" -o ro "${backdev}" "${croot}/${imagename}" || panic "Can not mount $backdev ($image) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=ro:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
+			fi
+		done
+	done
+	rofsstring=${rofsstring%:}
+
+	mkdir -p /cow
+	cowdevice="tmpfs"
+	cow_fstype="tmpfs"
+	
+	# Looking for "${root_persistence}" device or file
+	if grep -q persistent /proc/cmdline; then
+		cowprobe=$(find_cow_device "${root_persistence}")
+		if [ -b "${cowprobe}" ]; then
+			cowdevice=${cowprobe}
+			cow_fstype=$(get_fstype "${cowprobe}")
+		else
+			[ "$quiet" != "y" ] &&	log_begin_msg "Unable to find the persistent medium"
+		fi
+	fi
+
+	mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
+	
+	mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt"
+	
+	for d in ${rofslist}; do
+		mkdir -p "${rootmnt}/casper/${d}"
+		mount -o bind "${d}" "${rootmnt}/${d}"
+		case d in 
+			*.dir) ;; # do nothing
+			*) umount "${d}" ;;
+		esac
+	done
+
+	# Adding other custom mounts
+	if grep -q homepersistence /proc/cmdline; then
+		homecow=$(find_cow_device "${home_persistence}" )
+		if [ -b "${homecow}" ]; then
+			mount ${homecow} -t $(get_fstype "${homecow}") -o rw "${rootmnt}/home"
+		else 
+			[ "$quiet" != "y" ] &&  log_begin_msg "Unable to find the persistent home medium"
+		fi
+	fi
+
+	if grep -q show-cow /proc/cmdline; then
+		mkdir -p "$rootmnt/cow"
+		mount -o bind /cow "$rootmnt/cow"
+	fi
 }
 
 is_usb_device() {
     sysfs_path="${1#/sys}"
-    if /lib/udev/path_id "${sysfs_path}" | grep -q "ID_PATH=usb"; then
+    if /lib/udev/path_id "${sysfs_path}" | grep -Eq "ID_PATH=(usb|pci-[^-]*-usb)"; then
         return 0
     fi
     return 1
 }
 
-find_cd() {
+find_livefs() {
 	mounted=
-        for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram); do
-            devname=$(sys2dev "${sysblock}")
-            fstype=$(get_fstype "${devname}")
-            if /lib/udev/cdrom_id ${devname} > /dev/null; then
-                mount -t ${fstype} -o ro "$devname" $mountpoint || continue
-                if casper_path $mountpoint; then
-                    echo $(casper_path $mountpoint)
-                    return
-                else
-                    umount $mountpoint
-                fi
-            elif is_usb_device "$sysblock"; then
-                for dev in $(subdevices "${sysblock}"); do
-                    devname=$(sys2dev "${dev}")
-                    fstype=$(get_fstype "${devname}")
-                    case ${fstype} in
-                        vfat|iso9660|udf)
-                            mount -t ${fstype} -o ro "${devname}" $mountpoint || continue
-                            if casper_path $mountpoint; then
-                                echo $(casper_path $mountpoint)
-                                return
-                            else
-                                umount $mountpoint
-                            fi
-                            ;;
-                    esac
-                done
-	    elif [ "${fstype}" = "squashfs" ]; then
-
-                # This is an ugly hack situation, the block device has
-                # a squashfs image directly on it.  It's hopefully
-                # casper, so take it and run with it.
-
-                ln -s "${devname}" "${devname}.${fstype}"
-                echo "${devname}.${fstype}"
-                return
-            fi
-        done
+	for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram); do
+		devname=$(sys2dev "${sysblock}")
+		fstype=$(get_fstype "${devname}")
+		if /lib/udev/cdrom_id ${devname} > /dev/null; then
+			mount -t ${fstype} -o ro "$devname" $mountpoint || continue
+			if is_casper_path $mountpoint; then
+				echo $mountpoint
+				return
+			else
+				umount $mountpoint
+			fi
+		elif is_usb_device "$sysblock"; then
+			for dev in $(subdevices "${sysblock}"); do
+				devname=$(sys2dev "${dev}")
+				fstype=$(get_fstype "${devname}")
+				case ${fstype} in
+					vfat|iso9660|udf)
+						mount -t ${fstype} -o ro "${devname}" $mountpoint || continue
+						if is_casper_path $mountpoint; then
+							echo $mountpoint
+							return
+						else
+							umount $mountpoint
+						fi
+						;;
+				esac
+			done
+		elif [ "${fstype}" = "squashfs" ||  \
+				"${fstype}" = "ext2" ]; then
+		
+			# This is an ugly hack situation, the block device has
+			# an image directly on it.  It's hopefully
+			# casper, so take it and run with it.
+		
+			ln -s "${devname}" "${devname}.${fstype}"
+			echo "${devname}.${fstype}"
+			return
+		fi
+	done
 }
 
 set_usplash_timeout() {
-    if [ -x /sbin/usplash_write ]; then
-        /sbin/usplash_write "TIMEOUT 120"
-    fi
+	if [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "TIMEOUT 120"
+	fi
 }
 
 mountroot() {
-    exec 6>&1
-    exec 7>&2
-    exec > casper.log
-    exec 2>&1
-
-    set_usplash_timeout
-    [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount"
-    run_scripts /scripts/casper-premount
-    [ "$quiet" != "y" ] && log_end_msg
-
-    # Needed here too because some things (*cough* udev *cough*)
-    # changes the timeout
-
-    set_usplash_timeout
-
-    for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
-        live_image=$(find_cd)
-        if [ "${live_image}" ]; then
-            break
-        fi
-        sleep 1
-    done
-    if [ "$?" -gt 0 ]; then
-        panic "Unable to find a CD-ROM containing a live file system"
-    fi
-    
-    setup_cow "$overlay_method" "$(get_backing_device $live_image)" "$rootmnt"
-
-    log_end_msg
-
-    maybe_break casper-bottom
-    [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
-
-    run_scripts /scripts/casper-bottom
-    [ "$quiet" != "y" ] && log_end_msg
-
-    exec 1>&6 6>&-
-    exec 2>&7 7>&-
-    cp casper.log "${rootmnt}/var/log/"
+	exec 6>&1
+	exec 7>&2
+	exec > casper.log
+	exec 2>&1
+	
+	set_usplash_timeout
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount"
+	run_scripts /scripts/casper-premount
+	[ "$quiet" != "y" ] && log_end_msg
+
+	# Needed here too because some things (*cough* udev *cough*)
+	# changes the timeout
+
+	set_usplash_timeout
+
+	if grep -q netboot /proc/cmdline; then
+		netboot="CIFS"
+		for x in $(cat /proc/cmdline); do
+			case $x in
+				netboot=*)
+					netboot=${x#netboot=}
+				;;
+			esac
+		done
+		livefs_root=$(do_netboot)
+	else
+		# Scan devices for the image
+		for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
+			livefs_root=$(find_livefs)
+			if [ "${livefs_root}" ]; then
+				break
+			fi
+			sleep 1
+		done
+	fi
+		
+	if [ "$?" -gt 0 ]; then
+		panic "Unable to find a medium containing a live file system"
+	fi
+		
+	if grep -q toram /proc/cmdline; then
+		copy_to_ram "${livefs_root}"
+	fi
+	
+	mount_images_in_directory "$livefs_root" "$rootmnt"
+
+	log_end_msg
+
+	maybe_break casper-bottom
+	[ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom"
+
+	run_scripts /scripts/casper-bottom
+	[ "$quiet" != "y" ] && log_end_msg
+
+	exec 1>&6 6>&-
+	exec 2>&7 7>&-
+	cp casper.log "${rootmnt}/var/log/"
 }
diff --git a/scripts/casper-bottom/01integrity_check b/scripts/casper-bottom/01integrity_check
index 637a1ff..8c8e153 100755
--- a/scripts/casper-bottom/01integrity_check
+++ b/scripts/casper-bottom/01integrity_check
@@ -15,4 +15,4 @@ prereqs)
        ;;
 esac
 
-grep integrity-check /proc/cmdline && casper-md5check /cdrom /cdrom/md5sum.txt < /dev/tty8
+grep integrity-check /proc/cmdline && casper-md5check /live_media /live_media/md5sum.txt < /dev/tty8
diff --git a/scripts/casper-bottom/05mountpoints b/scripts/casper-bottom/05mountpoints
index ca8845a..33f265d 100755
--- a/scripts/casper-bottom/05mountpoints
+++ b/scripts/casper-bottom/05mountpoints
@@ -21,7 +21,7 @@ esac
 log_begin_msg "$DESCRIPTION"
 
 # Move to the new root filesystem so that programs there can get at it.
-mkdir -p /root/cdrom
-mount -n -o move /cdrom /root/cdrom
+mkdir -p /root/live_media
+mount -n -o move /live_media /root/live_media
 
 log_end_msg
diff --git a/scripts/casper-bottom/10adduser b/scripts/casper-bottom/10adduser
index a37d831..700f8c3 100755
--- a/scripts/casper-bottom/10adduser
+++ b/scripts/casper-bottom/10adduser
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-DESCRIPTION="Adding live CD user..."
+DESCRIPTION="Adding live session user..."
 
 . /scripts/functions
 
@@ -20,15 +20,18 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
+# U6aMy0wojraho is just a blank password
 chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
 set passwd/root-password-crypted *
-set passwd/user-password-crypted U6aMy0wojraho
+set passwd/user-password-crypted UMxWpqk1F1hww
 set passwd/user-fullname $USERFULLNAME 
 set passwd/username $USERNAME
 set passwd/user-uid 999
 EOF
 
-chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
+chroot /root /usr/bin/env -i HOME="/root" \
+       TERM="${TERM}" PATH="/usr/sbin:/usr/bin:/sbin:/bin" \
+       /usr/lib/user-setup/user-setup-apply > /dev/null
 
 # Clear out debconf database again to avoid confusing ubiquity later.
 chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
@@ -40,18 +43,21 @@ set passwd/user-uid
 EOF
 
 if [ -f /root/etc/sudoers ]; then
-    grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
-fi
-
-# XXX - awful hack to stop xscreensaver locking the screen (#7150)
-echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
-
-for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop; do
-    if [ -f "/root/$file" ]; then
-        chroot /root install -D -o $USERNAME -g $USERNAME $file /home/$USERNAME/Desktop/$(basename "$file")
-        break
+	if [ -x /sbin/udevplug ]; then 
+		# FIXME: ugly hack, admin is not present in debian so we do here ubuntu stuff
+		# XXX - awful hack to stop xscreensaver locking the screen (#7150)
+		echo 'RUNNING_UNDER_GDM="yes"' >> /root/etc/environment
+        grep -q '^%admin' /root/etc/sudoers && sed -i -e '/^%admin/s/ALL$/NOPASSWD: ALL/' /root/etc/sudoers || echo '%admin  ALL=(ALL) NOPASSWD: ALL' >> /root/etc/sudoers
+		for file in /usr/share/applications/ubiquity-gtkui.desktop /usr/share/applications/kde/ubiquity-kdeui.desktop; do
+		    if [ -f "/root/$file" ]; then
+		        chroot /root install -D -o $USERNAME -g $USERNAME $file /home/$USERNAME/Desktop/$(basename "$file")
+	        	break
+    		fi
+		done
+    else # We are in debian :-)
+        echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> /root/etc/sudoers	    
     fi
-done
+fi
 
 if [ -L /root/home/$USERNAME/Examples ]; then
     chroot /root install -o $USERNAME -g $USERNAME -d /home/$USERNAME/Desktop/
diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index d9343cd..0d4e171 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -20,18 +20,33 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-locale=en_US.UTF-8
+if [ -e /root/etc/default/locale ]; then
+	grep_file=/root/etc/default/locale
+	locale=$(grep 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' ) 
+elif [ -e /root/etc/environment ]; then # Old locales policy
+	grep_file=/root/etc/environment
+fi
+
+# commandline
 for x in $(cat /proc/cmdline); do
-                case $x in
-                        debian-installer/locale=*)
-                                locale=${x#debian-installer/locale=}
-                                ;;
-                esac
+	case $x in
+		debian-installer/locale=*)
+			locale=${x#debian-installer/locale=}
+			set_locale="true"
+			;;
+	esac
 done
 
-LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
-
-printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
-chroot /root /usr/sbin/locale-gen "${LANG}"
+if [ -z "${locale}" ]; then
+	# Set a default one
+	locale=en_US.UTF-8
+	set_locale="true"
+fi
+
+if [ "${set_locale}" ]; then
+	LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
+	printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}" 
+	chroot /root /usr/sbin/locale-gen "${LANG}"
+fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/15autologin b/scripts/casper-bottom/15autologin
index 5f7797a..745e6ce 100755
--- a/scripts/casper-bottom/15autologin
+++ b/scripts/casper-bottom/15autologin
@@ -27,6 +27,8 @@ else
 fi
 
 if chroot /root [ -f ${GDMCONF} ]; then
+	# true hack ! -- nohar
+    chroot /root cp /usr/share/gdm/defaults.conf /etc/gdm/gdm.conf
     # Configure GDM autologin
     chroot /root sed -i \
         -e "s/^AutomaticLoginEnable=.*\$/AutomaticLoginEnable=true/" \
diff --git a/scripts/casper-bottom/22gnome_panel_data b/scripts/casper-bottom/22gnome_panel_data
index b232c27..e87c94f 100755
--- a/scripts/casper-bottom/22gnome_panel_data
+++ b/scripts/casper-bottom/22gnome_panel_data
@@ -20,8 +20,10 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-if chroot /root /bin/sh -c laptop-detect; then
-    casper-reconfigure /root gnome-panel-data
+if [ -x /root/usr/sbin/laptop-detect ]; then
+	if chroot /root laptop-detect; then
+	    casper-reconfigure /root gnome-panel-data
+	fi
 fi
 
 panel_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-panel-data 2>/dev/null) || panel_version=""
diff --git a/scripts/casper-bottom/23networking b/scripts/casper-bottom/23networking
index 021aca9..7238773 100755
--- a/scripts/casper-bottom/23networking
+++ b/scripts/casper-bottom/23networking
@@ -27,7 +27,11 @@ iface lo inet loopback
 
 EOF
 
-udevplug -Bpci -Iclass="0x02*"
+if [ -x /sbin/udevplug ]; then
+	udevplug -Bpci -Iclass="0x02*"
+else
+	udevtrigger
+fi
 
 for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
     [ -e $interface ] || continue
diff --git a/scripts/casper-bottom/25configure_init b/scripts/casper-bottom/25configure_init
index 12e6315..7c39478 100755
--- a/scripts/casper-bottom/25configure_init
+++ b/scripts/casper-bottom/25configure_init
@@ -23,14 +23,16 @@ log_begin_msg "$DESCRIPTION"
 # Arrange for shells on virtual consoles, rather than login prompts
 
 if [ -n "$USERNAME" ]; then
-    sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9]*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+    sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9].*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
 fi
 
 # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
 # /etc/crontab remaining disabled, yet also not run by anacron
-for f in /root/etc/rc?.d/S??anacron; do
-    mv ${f} ${f%/*}/K00anacron
-done
+if [ -x /root/etc/init.d/anacron ]; then
+    for f in /root/etc/rc?.d/S??anacron; do
+        mv ${f} ${f%/*}/K00anacron
+    done
+fi
 
 # No point, really
 rm -f /root/etc/rc?.d/[SK]??postfix
@@ -40,15 +42,8 @@ rm -f /root/etc/rc?.d/K??hwclock.sh
 
 # Disable readahead since it doesn't play well with squashfs + unionfs
 # use chmod instead of mv to not trigger unionfs bugs.
-chmod -x /root/sbin/readahead-list
-
-# Install shutdown script
-cp -a /lib/casper/shutdown /root/etc/init.d/casper-shutdown
-if [ -f /root/etc/rc0.d/S90halt ]; then
-    ln -s ../init.d/casper-shutdown /root/etc/rc0.d/S89casper
-fi
-if [ -f /root/etc/rc6.d/S90reboot ]; then
-    ln -s ../init.d/casper-shutdown /root/etc/rc6.d/S89casper
+if [ -e /root/sbin/readahead-list ]; then
+    chmod -x /root/sbin/readahead-list
 fi
 
 log_end_msg
diff --git a/scripts/casper-bottom/33disable_binary_drivers b/scripts/casper-bottom/33disable_binary_drivers
index 52bcbf4..6bc2279 100755
--- a/scripts/casper-bottom/33disable_binary_drivers
+++ b/scripts/casper-bottom/33disable_binary_drivers
@@ -20,4 +20,6 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-echo 'DISABLED_MODULES="fglrx nv"' >> /root/etc/default/linux-restricted-modules-common
+if [ -e /root/etc/default/linux-restricted-modules-common ]; then
+    echo 'DISABLED_MODULES="fglrx nv"' >> /root/etc/default/linux-restricted-modules-common
+fi