Skip to content

Commit

Permalink
Merging casper 1.106.
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-baumann committed Sep 28, 2007
1 parent f0f15ab commit 1cf746f
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 10 deletions.
12 changes: 12 additions & 0 deletions docs/ChangeLog.casper
@@ -1,3 +1,15 @@
casper (1.106) gutsy; urgency=low

* Support preseed/early_command; code supplied here will be run using 'sh
-c' from casper-bottom, and can chroot to /root if needed (LP: #144845).
* Make sure we don't accidentally continue to boot if casper-md5check
fails (LP: #82856).
* Clear out debconf database backup files after preseeding to save memory
(LP: #43706).
* Mount everything as noatime to avoid unnecessary metadata writes.

-- Colin Watson <cjwatson@ubuntu.com> Fri, 28 Sep 2007 15:27:52 +0100

casper (1.105) gutsy; urgency=low

* scripts/casper-bottom/36disable_trackerd: Disable trackerd in the live
Expand Down
12 changes: 6 additions & 6 deletions scripts/live
Expand Up @@ -727,7 +727,7 @@ do_snap_copy ()
if [ -n "${fstype}" ]
then
# Copying stuff...
mount -t "${fstype}" -o ro "${fromdev}" "${tomount}"
mount -t "${fstype}" -o ro,noatime "${fromdev}" "${tomount}"
cp -a "${tomount}"/* ${todir}
umount "${tomount}"
else
Expand Down Expand Up @@ -903,7 +903,7 @@ setup_unionfs ()

mkdir -p "${croot}/${imagename}"
echo "debug: Can not mount backdev ${backdev} (image = ${image}) on croot/imagename ${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}"
mount -t "${fstype}" -o ro,noatime "${backdev}" "${croot}/${imagename}" || panic "Can not mount ${backdev} (${image}) on ${croot}/${imagename}" && rofsstring="${croot}/${imagename}=${roopt}:${rofsstring}" && rofslist="${croot}/${imagename} ${rofslist}"
fi
done

Expand All @@ -927,9 +927,9 @@ setup_unionfs ()
fi
fi

mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount ${cowdevice} on /cow"
mount ${cowdevice} -t ${cow_fstype} -o rw,noatime /cow || panic "Can not mount ${cowdevice} on /cow"

mount -t ${UNIONTYPE} -o dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"
mount -t ${UNIONTYPE} -o noatime,dirs=/cow=rw:${rofsstring} ${UNIONTYPE} "${rootmnt}" || panic "${UNIONTYPE} mount failed"

# Adding other custom mounts
if [ -n "${PERSISTENT}" ]
Expand All @@ -940,7 +940,7 @@ setup_unionfs ()

if [ -b "${homecow}" ]
then
mount -t $(get_fstype "${homecow}") -o rw "${homecow}" "${rootmnt}/home"
mount -t $(get_fstype "${homecow}") -o rw,noatime "${homecow}" "${rootmnt}/home"
export HOMEMOUNTED=1 # used to proper calculate free space in do_snap_copy()
else
[ "${quiet}" != "y" ] && log_warning_msg "Unable to find the persistent home medium"
Expand Down Expand Up @@ -994,7 +994,7 @@ check_dev ()

if is_supported_fs ${fstype}
then
mount -t ${fstype} -o ro "${devname}" ${mountpoint} || continue
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue

if is_live_path ${mountpoint}
then
Expand Down
11 changes: 7 additions & 4 deletions scripts/live-bottom/01integrity_check
Expand Up @@ -20,7 +20,10 @@ esac

# live-initramfs script

grep -qs integrity-check /proc/cmdline || exit 0

cd /live/image
md5sum -c md5sum.txt < /dev/tty8
if grep -qs integrity-check /proc/cmdline
then
cd /live/image
md5sum -c md5sum.txt < /dev/tty8 > /dev/tty8
reboot
while :; do sleep 60; done
fi
9 changes: 9 additions & 0 deletions scripts/live-bottom/24preseed
Expand Up @@ -52,6 +52,15 @@ then
done
fi

reply="$(echo "GET preseed/early_command" | chroot /root debconf-communicate -fnoninteractive casper)"
if [ "${reply#0 }" != "$reply" ]; then
reply="${reply#0 }"
sh -c "$reply"
fi

# Clear out debconf database backup files to save memory.
rm -f /root/var/cache/debconf/*.dat-old

log_end_msg

exit 0

0 comments on commit 1cf746f

Please sign in to comment.