Dropping specifics for squeeze based distributions.

diff --git a/debian/control b/debian/control
index a4e0cf3..a0561dc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -25,8 +25,6 @@ Package: live-boot-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: live-boot (<< 3.0~a18~)
-Replaces: live-boot
 Description: Live System Boot Scripts (documentation)
  live-boot contains the scripts that configure a live system during the boot
  process (early userspace).

diff --git a/scripts/boot/3020-swapon b/scripts/boot/3020-swapon
index 7541c26..3df90de 100755 (executable)
--- a/scripts/boot/3020-swapon
+++ b/scripts/boot/3020-swapon
@@ -29,15 +29,6 @@ Swap ()
 
        LIVE_SWAP_DEVICES="${LIVE_SWAP_DEVICES:-/dev/sd* /dev/vd*}"
 
-       if [ -e /run ]
-       then
-               # wheezy
-               _FSTAB="/root/etc/fstab.d/swap"
-       else
-               # squeeze
-               _FSTAB="/root/etc/fstab"
-       fi
-
        for _DEVICE in $(echo ${LIVE_SWAP_DEVICES} | sed -e 's|,| |g')
        do
                if [ ! -b "${_DEVICE}" ]
@@ -57,15 +48,15 @@ Swap ()
        done
 
        # Remove all auto swap entries
-       if grep -qs "swap swap" "${_FSTAB}"
+       if grep -qs "swap swap" /root/etc/fstab.d/swap
        then
-               grep -v "swap swap" "${_FSTAB}" > "${_FSTAB}".tmp
-               mv "${_FSTAB}".tmp "${_FSTAB}"
+               grep -v "swap swap" /root/etc/fstab.d/swap > /root/etc/fstab.d/swap.tmp
+               mv /root/etc/fstab.d/swap.tmp /root/etc/fstab.d/swap
        fi
 
        # Add new swap entries
        for _DEVICE in ${_SWAP_DEVICES}
        do
-               echo "${_DEVICE} swap swap defaults 0 0" >> "${_FSTAB}"
+               echo "${_DEVICE} swap swap defaults 0 0" >> /root/etc/fstab.d/swap
        done
 }

diff --git a/scripts/boot/9990-aaa-fixme.sh b/scripts/boot/9990-aaa-fixme.sh
index a1eb14a..416d6b4 100755 (executable)
--- a/scripts/boot/9990-aaa-fixme.sh
+++ b/scripts/boot/9990-aaa-fixme.sh
@@ -40,8 +40,6 @@ else
        udevinfo='udevinfo'
 fi
 
-old_root_overlay_label="live-rw"
-old_home_overlay_label="home-rw"
 custom_overlay_label="persistence"
 persistence_list="persistence.conf"
 old_persistence_list="live-persistence.conf"

diff --git a/scripts/boot/9990-cmdline-old b/scripts/boot/9990-cmdline-old
index 85f1b62..b8fc4a6 100755 (executable)
--- a/scripts/boot/9990-cmdline-old
+++ b/scripts/boot/9990-cmdline-old
@@ -188,8 +188,6 @@ Cmdline_old ()
                                ;;
 
                        persistence-label=*)
-                               old_root_overlay_label="${_PARAMETER#persistence-label=*}"
-                               old_home_overlay_label="${_PARAMETER#persistence-label=*}"
                                custom_overlay_label="${_PARAMETER#persistence-label=*}"
                                ;;
 

diff --git a/scripts/boot/9990-fstab.sh b/scripts/boot/9990-fstab.sh
index dc3f07b..5ae9546 100755 (executable)
--- a/scripts/boot/9990-fstab.sh
+++ b/scripts/boot/9990-fstab.sh
@@ -13,25 +13,16 @@ Fstab ()
                return
        fi
 
-       if [ -e /run ]
-       then
-               # wheezy
-               _FSTAB="/root/etc/fstab.d/live"
-       else
-               # squeeze
-               _FSTAB="/root/etc/fstab"
-       fi
-
        log_begin_msg "Configuring fstab"
 
-       if ! grep -qs  "^${UNIONTYPE}" "${_FSTAB}"
+       if ! grep -qs  "^${UNIONTYPE}" /root/etc/fstab.d/live
        then
-               echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> "${_FSTAB}"
+               echo "${UNIONTYPE} / ${UNIONTYPE} rw 0 0" >> /root/etc/fstab.d/live
        fi
 
-       if ! grep -qs "^tmpfs /tmp" "${_FSTAB}"
+       if ! grep -qs "^tmpfs /tmp" /root/etc/fstab.d/live
        then
-               echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> "${_FSTAB}"
+               echo "tmpfs /tmp tmpfs nosuid,nodev 0 0" >> /root/etc/fstab.d/live
        fi
 
        log_end_msg

diff --git a/scripts/boot/9990-misc-helpers.sh b/scripts/boot/9990-misc-helpers.sh
index ace130b..358448b 100755 (executable)
--- a/scripts/boot/9990-misc-helpers.sh
+++ b/scripts/boot/9990-misc-helpers.sh
@@ -99,16 +99,7 @@ is_nice_device ()
 {
        sysfs_path="${1#/sys}"
 
-       if [ -e /lib/udev/path_id ]
-       then
-               # squeeze
-               PATH_ID="/lib/udev/path_id"
-       else
-               # wheezy/sid (udev >= 174)
-               PATH_ID="/sbin/udevadm test-builtin path_id"
-       fi
-
-       if ${PATH_ID} "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
+       if /sbin/udevadm test-builtin path_id "${sysfs_path}" | egrep -q "ID_PATH=(usb|pci-[^-]*-(ide|sas|scsi|usb|virtio)|platform-sata_mv|platform-orion-ehci|platform-mmc|platform-mxsdhci)"
        then
                return 0
        elif echo "${sysfs_path}" | grep -q '^/block/vd[a-z]$'
@@ -1532,31 +1523,6 @@ activate_custom_mounts ()
        echo ${used_devices}
 }
 
-fix_backwards_compatibility ()
-{
-       local device=${1}
-       local dir=${2}
-       local opt=${3}
-
-       if [ -n "${PERSISTENCE_READONLY}" ]
-       then
-               return
-       fi
-
-       local backing="$(mount_persistence_media ${device})"
-       if [ -z "${backing}" ]
-       then
-               return
-       fi
-
-       local include_list="${backing}/${persistence_list}"
-       if [ ! -r "${include_list}" ]
-       then
-               echo "# persistence backwards compatibility:
-${dir} ${opt},source=." > "${include_list}"
-       fi
-}
-
 is_mountpoint ()
 {
        directory="$1"

diff --git a/scripts/boot/9990-networking.sh b/scripts/boot/9990-networking.sh
index f32ae6c..d9607b7 100755 (executable)
--- a/scripts/boot/9990-networking.sh
+++ b/scripts/boot/9990-networking.sh
@@ -111,10 +111,6 @@ do_netsetup ()
                for interface in ${DEVICE}; do
                        ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
 
-                       # squeeze
-                       [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
-
-                       # wheezy
                        [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
 
                        if [ "$IPV4ADDR" != "0.0.0.0" ]
@@ -129,10 +125,6 @@ do_netsetup ()
                # source relevant ipconfig output
                OLDHOSTNAME=${HOSTNAME}
 
-               # squeeze
-               [ -e /tmp/net-${interface}.conf ] && . /tmp/net-${interface}.conf
-
-               # wheezy
                [ -e /run/net-${interface}.conf ] && . /run/net-${interface}.conf
 
                [ -z ${HOSTNAME} ] && HOSTNAME=${OLDHOSTNAME}

diff --git a/scripts/boot/9990-overlay.sh b/scripts/boot/9990-overlay.sh
index acb2e91..e8e00b6 100755 (executable)
--- a/scripts/boot/9990-overlay.sh
+++ b/scripts/boot/9990-overlay.sh
@@ -205,7 +205,7 @@ setup_unionfs ()
 
                if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
                then
-                       overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label}"
+                       overlays="${custom_overlay_label}"
                fi
 
                local overlay_devices=""
@@ -214,18 +214,6 @@ setup_unionfs ()
                        media="$(echo ${media} | tr ":" " ")"
 
                        case ${media} in
-                               ${old_root_overlay_label}=*)
-                                       device="${media#*=}"
-                                       fix_backwards_compatibility ${device} / union
-                                       overlay_devices="${overlay_devices} ${device}"
-                                       ;;
-
-                               ${old_home_overlay_label}=*)
-                                       device="${media#*=}"
-                                       fix_backwards_compatibility ${device} /home bind
-                                       overlay_devices="${overlay_devices} ${device}"
-                                       ;;
-
                                ${custom_overlay_label}=*)
                                        device="${media#*=}"
                                        overlay_devices="${overlay_devices} ${device}"