Adding casper 1.65+debian-1. 1.65+debian-1
authorDaniel Baumann <daniel@debian.org>
Sun, 23 Sep 2007 12:46:24 +0000 (14:46 +0200)
committerDaniel Baumann <daniel@debian.org>
Sun, 23 Sep 2007 12:46:24 +0000 (14:46 +0200)
17 files changed:
bin/casper-getty [new file with mode: 0644]
bin/casper-login [new file with mode: 0644]
debian/changelog
debian/changelog.upstream
debian/control
debian/install
debian/ubiquity-casper.install [new file with mode: 0644]
hooks/casper
scripts/casper
scripts/casper-bottom/02etc_casper_conf [new file with mode: 0644]
scripts/casper-bottom/05mountpoints
scripts/casper-bottom/14locales
scripts/casper-bottom/20xconfig
scripts/casper-bottom/23networking
scripts/casper-bottom/24preseed
scripts/casper-bottom/25configure_init
ubiquity-hooks/30accessibility [new file with mode: 0755]

diff --git a/bin/casper-getty b/bin/casper-getty
new file mode 100644 (file)
index 0000000..3b8cbeb
--- /dev/null
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+autologin=1
+for opt in $* ; do
+        if [ "$opt" = "-l" -o "$opt" = "-n" ] ; then
+                autologin=0
+        fi
+done
+
+if [ "$autologin" = "1" ] ; then
+         exec /sbin/getty -n -l /sbin/casper-login $*
+else
+         exec /sbin/getty $*
+fi
+
diff --git a/bin/casper-login b/bin/casper-login
new file mode 100644 (file)
index 0000000..030c63d
--- /dev/null
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+USERNAME=root
+[ -f /etc/casper.conf ] && . /etc/casper.conf
+exec /bin/login -f $USERNAME
+
index eb8357d..9da2e97 100644 (file)
@@ -1,3 +1,12 @@
+casper (1.65+debian-1) unstable; urgency=low
+
+  * New upstream release.
+  * Re-included ubiquity sources since it is here anyway in diff.gz.
+  * Included remote getty patch from Alex Owen (enable it with "casper-getty"
+    as kernel parameter).
+
+ -- Marco Amadori <marco.amadori@gmail.com>  Thu, 17 Aug 2006 14:06:10 +0200
+
 casper (1.63+debian-3) unstable; urgency=low
 
   * Really do not try to eject cd if netbooted.
index 5385ac0..8e20a26 100644 (file)
@@ -1,3 +1,22 @@
+casper (1.65) edgy; urgency=low
+
+  * Update to call udevsettle/udevtrigger instead of udevplug
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Mon, 21 Aug 2006 19:37:58 +0200
+
+casper (1.64) edgy; urgency=low
+
+  * Fix moving of squashfs mount points so that /proc/mounts in the
+    installed system refers to them correctly (closes: Malone #55019). As a
+    bonus, this lets us mount them on subdirectories of /casper/ right from
+    the start.
+  * Treat locale= as equivalent to debian-installer/locale= (closes: Malone
+    #53444).
+  * Fix ubiquity-hooks/30accessibility not to use log_end_msg, and to chroot
+    to /target instead of /root (closes: Malone #53277).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu,  3 Aug 2006 14:00:22 +0100
+
 casper (1.63) edgy; urgency=low
 
   [ Tollef Fog Heen ]
index dd0d461..4445546 100644 (file)
@@ -1,8 +1,8 @@
 Source: casper
 Section: misc
 Priority: optional
-Maintainer: Marco Amadori <marco.amadori@gmail.com>
-Uploaders: Daniel Baumann <daniel@debian.org>
+Maintainer: Debian Live <debian-live-devel@lists.alioth.debian.org>
+Uploaders: Marco Amadori <marco.amadori@gmail.com>, Daniel Baumann <daniel@debian.org>
 Build-Depends: debhelper (>= 4)
 Standards-Version: 3.7.2
 
index 931c898..2514756 100644 (file)
@@ -1,4 +1,6 @@
 bin/casper-reconfigure         usr/share/casper
 bin/casper-preseed             usr/share/casper
+bin/casper-getty               sbin
+bin/casper-login               sbin
 hooks                          usr/share/initramfs-tools
 scripts                                usr/share/initramfs-tools
diff --git a/debian/ubiquity-casper.install b/debian/ubiquity-casper.install
new file mode 100644 (file)
index 0000000..866ebdd
--- /dev/null
@@ -0,0 +1,2 @@
+bin/casper-reconfigure usr/bin
+ubiquity-hooks/* usr/lib/ubiquity/target-config
index 7229612..191f2f5 100755 (executable)
@@ -38,14 +38,14 @@ copy_exec /usr/share/casper/casper-reconfigure /bin
 copy_exec /usr/share/casper/casper-preseed /bin
 
 # Ubuntu or Debian test
-if [ -x /sbin/udevplug ]; then
-       mkdir -p ${DESTDIR}/lib/udev
-       copy_exec /lib/udev/cdrom_id /lib/udev
-       copy_exec /lib/udev/vol_id /lib/udev
-       copy_exec /lib/udev/path_id /lib/udev
-else
-       copy_exec /sbin/udevtrigger /sbin
-fi
+#      mkdir -p ${DESTDIR}/lib/udev
+#      copy_exec /lib/udev/cdrom_id /lib/udev
+#      copy_exec /lib/udev/vol_id /lib/udev
+#      copy_exec /lib/udev/path_id /lib/udev
+# FIXME: add lsb check for ubuntu
+copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevsettle /sbin
+
 
 copy_exec /usr/bin/udevinfo /bin
 
index 5cfb66e..61e579c 100644 (file)
@@ -32,389 +32,379 @@ export USERNAME USERFULLNAME HOST
 
 # looking for casper specifics options as kernel parameters
 for x in $(cat /proc/cmdline); do
-       case $x in
-               netboot*)
-                       NETBOOT=${x#netboot=}
-                       export NETBOOT
-                       ;;
-               toram)
-                       TORAM=1
-                       export TORAM
-                       ;;
-               show-cow)
-                       SHOWCOW=1
-                       export SHOWCOW
-                       ;;
-               persistent)
-                       PERSISTENT=1
-                       export PERSISTENT
-                       ;;
-       esac
+    case $x in
+        netboot*)
+            export NETBOOT=${x#netboot=} ;;
+        toram)
+            export TORAM=1 ;;
+        show-cow)
+            export SHOWCOW=1 ;;
+        persistent)
+            export PERSISTENT=1 ;;
+        casper-getty)
+            export CASPERGETTY=1 ;;
+    esac
 done
 
 # sort of compatibility with netboot.h from linux docs
 if [ -z "${NETBOOT}" ]; then
-       if [ "${ROOT}" == "/dev/nfs" ]; then
-               NETBOOT="nfs"
-               export NETBOOT
-       elif [ "${ROOT}" == "/dev/cifs" ]; then
-               NETBOOT="cifs"
-               export NETBOOT
-       fi
+    if [ "${ROOT}" == "/dev/nfs" ]; then
+        NETBOOT="nfs"
+        export NETBOOT
+    elif [ "${ROOT}" == "/dev/cifs" ]; then
+        NETBOOT="cifs"
+        export NETBOOT
+    fi
 fi
 
 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
+    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*")
-                       ;;
-               *.squashfs|*.ext2)
-                       echo $(setup_loop "$1" "loop" "/sys/block/loop*")
-                       ;;
-               *.dir)
-                       echo "directory"
-                       ;;
-               *)
-                       panic "Unrecognized casper filesystem: $1"
-                       ;;
-       esac
+    case "$1" in
+        *.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"
+            ;;
+    esac
 }
 
 match_files_in_dir() {
-       # Does any files match pattern $1 ?
+    # Does any files match pattern $1 ?
 
-       local pattern="$1"
-       if [ "$(echo $pattern)" != "$pattern" ]; then
-               return 0
-       fi
-       return 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
+    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"
-       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"
+    local fspath=$1
+    local module=$2
+    local pattern=$3
+
+    modprobe -qb "$module"
+    udevsettle
+
+    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() {
-       #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
+    #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() {
-       copyfrom="$1"
-
-       if [ ! -z "${2}" ] ; then
-               # This will enable future rampersistence, todo yet
-               copyto="${2}"
-               moveit="False"
-       else
-               copyto="${copyfrom}_swap"
-               moveit="True"
-       fi
-
-       size=$(du -ks ${copyfrom} | 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 ${copyfrom}/* ${copyto} # "cp -a" from busybox also copies hidden files
-               umount ${copyfrom}
-               if [ "${moveit}" == "True" ]; then
-                       mount -r -o move ${copyto} ${copyfrom}
-                       rmdir ${copyto}
-               fi
-               [ "$quiet" != "y" ] && log_end_msg
-       fi
+    copyfrom="$1"
+
+    if [ ! -z "${2}" ] ; then
+        # This will enable future rampersistence, todo yet
+        copyto="${2}"
+        moveit="False"
+    else
+        copyto="${copyfrom}_swap"
+        moveit="True"
+    fi
+
+    size=$(du -ks ${copyfrom} | 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 ${copyfrom}/* ${copyto} # "cp -a" from busybox also copies hidden files
+        umount ${copyfrom}
+        if [ "${moveit}" == "True" ]; then
+            mount -r -o move ${copyto} ${copyfrom}
+            rmdir ${copyto}
+        fi
+        [ "$quiet" != "y" ] && log_end_msg
+    fi
 }
 
 find_cow_device() {
-       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
+    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() {
-       rc=1
+    rc=1
 
-       modprobe -q af_packet # For DHCP
+    modprobe -q af_packet # For DHCP
 
-       ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf
+    ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf
 
-       if [ "${NFSROOT}" = "auto" ]; then
-               NFSROOT=${ROOTSERVER}:${ROOTPATH}
-       fi
+    if [ "${NFSROOT}" = "auto" ]; then
+        NFSROOT=${ROOTSERVER}:${ROOTPATH}
+    fi
 
-       [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
-       
-       if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
-               rc=0
-       elif do_nfsmount ; then
-               NETBOOT=nfs
-               export NETBOOT
-               rc=0
-       fi
+    [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
+    
+    if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
+        rc=0
+    elif do_nfsmount ; then
+        NETBOOT="nfs"
+        export NETBOOT
+        rc=0
+    fi
 
-       [ "$quiet" != "y" ] && log_end_msg
-       return ${rc}
+    [ "$quiet" != "y" ] && log_end_msg
+    return ${rc}
 }
 
 do_nfsmount() {
-       rc=1
-       modprobe -q nfs
-       if [ -z "${NFSOPTS}" ]; then
-               NFSOPTS=""
-       fi
-
-       [ "$quiet" != "y" ] && log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
-       # FIXME: This for loop is an ugly HACK round an nfs bug
-       for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
-               nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
-               sleep 1
-       done
-       return ${rc}
+    rc=1
+    modprobe -q nfs
+    if [ -z "${NFSOPTS}" ]; then
+        NFSOPTS=""
+    fi
+
+    [ "$quiet" != "y" ] && log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
+    # FIXME: This for loop is an ugly HACK round an nfs bug
+    for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
+        nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
+        sleep 1
+    done
+    return ${rc}
 }
 
 do_cifsmount() {
-       rc=1
-       if [ -x "/sbin/mount.cifs" ]; then
-               if [ -z "${NFSOPTS}" ]; then
-                       CIFSOPTS="-ouser=root,password="
-               else
-                       CIFSOPTS="${NFSOPTS}"
-               fi
-
-               [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
-               modprobe -q cifs
-
-               if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
-                       rc=0
-               fi
-       fi
-       return ${rc}
+    rc=1
+    if [ -x "/sbin/mount.cifs" ]; then
+        if [ -z "${NFSOPTS}" ]; then
+            CIFSOPTS="-ouser=root,password="
+        else
+            CIFSOPTS="${NFSOPTS}"
+        fi
+
+        [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
+        modprobe -q cifs
+
+        if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
+            rc=0
+        fi
+    fi
+    return ${rc}
 }
 
 setup_unionfs() {
-       image_directory="$1"
-       rootmnt="$2"
-
-       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=""
-       if [ ${NETBOOT} == "nfs" ] ; then
-               roopt="nfsro" # go aroung a bug in nfs-unionfs locking
-       else
-               roopt="ro"
-       fi
-
-       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
-                               rofsstring="${image}=${roopt}:${rofsstring}"
-                               rofslist="${image} ${rofslist}"
-                       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}=${roopt}:${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 [ ! -z "${PERSISTENT}" ]; 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" || panic "Unionfs mount failed"
-       
-       for d in ${rofslist}; do
-               mkdir -p "${rootmnt}/casper/${d}"
-               mount -o bind "${d}" "${rootmnt}/casper/${d}"
-               case d in
-                       *.dir) ;; # do nothing
-                       *) umount "${d}" ;;
-               esac
-       done
-
-       # Adding other custom mounts
-       if [ ! -z "${PERSISTENT}" ]; 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 [ ! -z "${SHOWCOW}" ]; then
-               mkdir -p "$rootmnt/cow"
-               mount -o bind /cow "$rootmnt/cow"
-       fi
+    image_directory="$1"
+    rootmnt="$2"
+
+    modprobe -qb unionfs
+
+    # run-init can't deal with this, but we're going to move all of these
+    # away before it runs anyway.
+    croot="/casper"
+
+    # Let's just mount the read-only file systems first
+    rofsstring=""
+    rofslist=""
+    if [ "${NETBOOT}" == "nfs" ] ; then
+        roopt="nfsro" # go aroung a bug in nfs-unionfs locking
+    else
+        roopt="ro"
+    fi
+
+    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
+                rofsstring="${image}=${roopt}:${rofsstring}"
+                rofslist="${image} ${rofslist}"
+            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}=${roopt}:${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 [ ! -z "${PERSISTENT}" ]; 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" || panic "Unionfs mount failed"
+    
+    for d in ${rofslist}; do
+        mkdir -p "${rootmnt}/casper/${d##*/}"
+        case d in
+            *.dir) mount -o bind "${d}" "${rootmnt}/casper/${d##*/}" ;;
+            *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}" ;;
+        esac
+    done
+
+    # Adding other custom mounts
+    if [ ! -z "${PERSISTENT}" ]; 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 [ ! -z "${SHOWCOW}" ]; then
+        mkdir -p "$rootmnt/cow"
+        mount -o bind /cow "$rootmnt/cow"
+    fi
 }
 
 is_usb_device() {
@@ -426,106 +416,106 @@ is_usb_device() {
 }
 
 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 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
+    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 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
-
-       if [ ! -z "${NETBOOT}" ]; then
-               if do_netmount ; then
-                       livefs_root="${mountpoint}"
-               else
-                       panic "Unable to find a the network rootfs live file system"
-               fi
-       else
-               # Scan local 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
-               done
-
-               if [ "$?" -gt 0 ]; then
-                       panic "Unable to find a medium containing a live file system"
-               fi
-                       
-               if [ ! -z "${TORAM}" ]; then
-                       copy_to_ram "${livefs_root}"
-               fi
-       fi
-       sleep 1
-
-       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/"
+    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 [ ! -z "${NETBOOT}" ]; then
+        if do_netmount ; then
+            livefs_root="${mountpoint}"
+        else
+            panic "Unable to find a the network rootfs live file system"
+        fi
+    else
+        # Scan local 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
+        done
+
+        if [ "$?" -gt 0 ]; then
+            panic "Unable to find a medium containing a live file system"
+        fi
+            
+        if [ ! -z "${TORAM}" ]; then
+            copy_to_ram "${livefs_root}"
+        fi
+    fi
+    sleep 1
+
+    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/02etc_casper_conf b/scripts/casper-bottom/02etc_casper_conf
new file mode 100644 (file)
index 0000000..fd19ac9
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+PREREQ=""
+
+prereqs()
+{
+       echo "$PREREQ"
+}
+
+case $1 in
+# get pre-requisites
+prereqs)
+       prereqs
+       exit 0
+       ;;
+esac
+
+if [ -f /etc/casper.conf ] ; then 
+       cp -p /etc/casper.conf /root/etc/casper.conf
+else
+       cat <<EOF >/root/etc/casper.conf
+export USERNAME="$USERNAME"
+export USERFULLNAME="$USERFULLNAME"
+export HOST="$HOST"
+EOF
+
+fi
+
index 33f265d..20a28fd 100755 (executable)
@@ -21,7 +21,9 @@ esac
 log_begin_msg "$DESCRIPTION"
 
 # Move to the new root filesystem so that programs there can get at it.
-mkdir -p /root/live_media
-mount -n -o move /live_media /root/live_media
+if [ ! -d /root/live_media ]; then
+    mkdir -p /root/live_media
+    mount -n -o move /live_media /root/live_media
+fi
 
 log_end_msg
index 0d4e171..ebe7616 100755 (executable)
@@ -34,6 +34,10 @@ for x in $(cat /proc/cmdline); do
                        locale=${x#debian-installer/locale=}
                        set_locale="true"
                        ;;
+               locale=*)
+                       locale=${x#locale=}
+                       set_locale="true"
+                       ;;
        esac
 done
 
index 840200d..b8a4552 100755 (executable)
@@ -33,6 +33,9 @@ for x in $(cat /proc/cmdline); do
                         debian-installer/locale=*)
                                 locale=${x#debian-installer/locale=}
                                 ;;
+                        locale=*)
+                                locale=${x#locale=}
+                                ;;
                 esac
 done
 
index ca7dd13..10d4ab2 100755 (executable)
@@ -27,14 +27,9 @@ iface lo inet loopback
 
 EOF
 
-if [ -x /sbin/udevplug ]; then
-       udevplug -Bpci -Iclass="0x02*"
-else
-       udevtrigger
-fi
+udevtrigger  
 
 if [ -z "${NETBOOT}" ] ; then
-
        for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*; do
                [ -e $interface ] || continue
                i="$(basename $interface)"
index 468ec2e..98a9864 100755 (executable)
@@ -31,6 +31,10 @@ for x in $(cat /proc/cmdline); do
                        value="${x#*=}"
                        casper-preseed /root "$question" "$value"
                        ;;
+               locale=*)
+                       value="${x#*=}"
+                       casper-preseed /root debian-installer/locale "$value"
+                       ;;
        esac
 done
 
index 7c39478..010e2eb 100755 (executable)
@@ -23,7 +23,34 @@ 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
+    if [ -z "${CASPERGETTY}" ]; then
+        sed -i -e "s|^\([^:]*:[^:]*:[^:]*\):.*getty.*\<\(tty[0-9].*\).*$|\1:/bin/login -f $USERNAME </dev/\2 >/dev/\2 2>\&1|" /root/etc/inittab
+    else
+        sed -i -e'/^[^#]/s%respawn:/sbin/getty%respawn:/sbin/casper-getty%' /root/etc/inittab
+        # AUTOMATIC SERIAL CONSOLE #
+        defconsole=$(sed -e 's%.*console=%console=%' /proc/cmdline)
+        if echo "${defconsole}" | grep -qs console=ttyS; then
+            PORT=$(echo "${defconsole}" | \
+                sed -e's%^console=%%' -e's%,.*%%')
+            SPEED=$(echo "${defconsole}" | \
+                    sed -e 's%^console=ttyS[0-9]\+,%%' \
+                        -e's%\([0-9]\+\).*%\1%')
+            if ! ( sed -n -e'/^[^#]/p' /root/etc/inittab | grep -qs ":respawn:/sbin/getty.*${PORT}" ) ; then
+                IDs="A B C D E F G H I J K L M N O P Q R S T Q U V V X Y Z 0 1 2 3 4 5 6 7 8 9" 
+                for ID1 in $IDs; do
+                    for ID2 in $IDs; do
+                        ID="${ID1}${ID2}"
+                           if ! grep "^${ID}:" /etc/inittab ; then
+                            #make sure it is not already in use
+                            break 2
+                        fi
+                    done
+                done
+                echo "${ID}:2345:respawn:/sbin/casper-getty -L ${PORT} ${SPEED} vt100" \
+                >>/root/etc/inittab
+            fi
+        fi
+    fi
 fi
 
 # This has the nice side effect of the cron.{daily,weekly,monthly} jobs in
diff --git a/ubiquity-hooks/30accessibility b/ubiquity-hooks/30accessibility
new file mode 100755 (executable)
index 0000000..ab1c2e9
--- /dev/null
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+. /usr/share/debconf/confmodule
+
+PREREQ=""
+DESCRIPTION="Configuring accessibility options..."
+USERNAME=$(db_get passwd/username)
+
+gct() {
+    chroot /target su $USERNAME -- gconftool-2 "$@"
+}
+
+for x in $(cat /proc/cmdline); do
+                case $x in
+                        # Lesser Visual Impairment
+                        access=v1)
+                        gct -s -t string /desktop/gnome/interface/gtk_theme HighContrastLargePrint
+                        gct -s -t string /desktop/gnome/interface/icon_theme HighContrast
+                        gct -s -t string /desktop/gnome/interface/monospace_font_name "monospace 18"
+                        gct -s -t string /desktop/gnome/interface/font_name "sans 18"
+                        gct -s -t string /apps/metacity/general/theme Atlanta
+                        gct -s -t string /desktop/gnome/background/picture_filename ""
+                        gct -s -t string /desktop/gnome/background/picture_options none
+                        gct "-s -t string /desktop/gnome/background/primary_color \#666666"
+                        gct "-s -t string /desktop/gnome/background/secondary_color \#7F7F7F"
+                        gct -s -t string /desktop/gnome/background/color_shading_type solid
+                        gct -s -t int /desktop/gnome/peripherals/mouse/cursor_size 48
+                        gct -s -t string /desktop/gnome/peripherals/mouse/cursor_theme whiteglass
+                        ;;
+                        # Moderate Visual Impairment
+                        access=v2)
+                        gct -s -t bool /desktop/gnome/interface/accessibility true
+                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [gnopernicus]
+                        gct -s -t bool /apps/gnopernicus/srcore/mag_active true
+                        gct -s -t bool /apps/gnopernicus/srcore/sp_active false
+                        ;;
+                        # Blindness
+                        access=v3)
+                        gct -s -t bool /desktop/gnome/sound/enable_esd false
+                        gct -s -t bool /desktop/gnome/interface/accessibility true
+                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats [gnopernicus]
+                        gct -s -t bool /apps/gnopernicus/srcore/sp_active true
+                        gct -s -t bool /apps/gnopernicus/srcore/mag_active false
+                        ;;
+                        # Minor Motor Difficulties
+                        access=m1)
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/mousekeys_enable true
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep true
+                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
+                        gct -s -t bool /desktop/gnome/peripherals/keyboard/repeat true
+                        gct -s -t int /desktop/gnome/peripherals/keyboard/delay 700
+                        gct -s -t int /desktop/gnome/peripherals/keyboard/rate 10
+                        ;;
+                        # Motor Difficulties - pointing devices
+                        access=m2)
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/enable true
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_enable true
+                        gct -s -t bool /desktop/gnome/accessibility/keyboard/stickykeys_modifier_beep false
+                        gct -s -t bool /desktop/accessibility/gnome/keyboard/stickykeys_two_key_off false
+                        gct -s -t bool /desktop/gnome/interface/accessibility true
+                        gct -s -t list --list-type=string /desktop/gnome/accessibility/startup/exec_ats gok
+                        ;;
+               esac
+done