diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/casper.init | 93 | ||||
| -rw-r--r-- | debian/casper.postinst | 2 | ||||
| -rw-r--r-- | debian/changelog | 23 | ||||
| -rw-r--r-- | debian/changelog.upstream | 63 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/control.debian | 4 | ||||
| -rw-r--r-- | debian/manpage/casper.7 | 21 |
7 files changed, 165 insertions, 45 deletions
diff --git a/debian/casper.init b/debian/casper.init index ae1a1a4..d6ec097 100644 --- a/debian/casper.init +++ b/debian/casper.init @@ -50,45 +50,68 @@ cache_path() { fi } +do_sync () +{ + # copy the tmp media on the snapshot media + fromdir="${1}" + todev="${2}" + tmnt="/mnt/temp_snap" + + mkdir "${tmnt}" && \ + mount "${todev}" "${tmnt}" -o rw && \ + cd "${fromdir}" && \ + find . -print0 | cpio -pumd0 "${tmnt}" && \ + umount "${tmnt}" && \ + rmdir "${tmnt}" +} + do_stop () { - # check for netboot - if [ ! -z "${NETBOOT}" ] || grep -qs netboot /proc/cmdline || grep -qsi root=/dev/nfs /proc/cmdline || grep -qsi root=/dev/cifs /proc/cmdline ; then - return 0 - fi - - for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do - cache_path "$path" - done - - eject -p -m /live_media >/dev/null 2>&1 - - # XXX - i18n - echo "Please remove the disc and close the tray (if any) then press ENTER: " - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "TIMEOUT 86400" - /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)" - /sbin/usplash_write "TEXT-URGENT and press ENTER to continue" - fi - - read x < /dev/console + # check for netboot + if [ ! -z "${NETBOOT}" ] || grep -qs netboot /proc/cmdline || grep -qsi root=/dev/nfs /proc/cmdline || grep -qsi root=/dev/cifs /proc/cmdline ; then + return 0 + fi + + if [ ! -z "${ROOTSNAP}" ]; then + do_sync "/cow" "${ROOTSNAP}" + fi + + if [ ! -z "${HOMESNAP}" ]; then + do_sync "/home" "${HOMESNAP}" + fi + + for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do + cache_path "$path" + done + + eject -p -m /live_media >/dev/null 2>&1 + + # XXX - i18n + echo "Please remove the disc and close the tray (if any) then press ENTER: " + if [ -x /sbin/usplash_write ]; then + /sbin/usplash_write "TIMEOUT 86400" + /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)" + /sbin/usplash_write "TEXT-URGENT and press ENTER to continue" + fi + + read x < /dev/console } case "$1" in - start|restart|reload|force-reload|status) - [ "$VERBOSE" != no ] && log_end_msg 0 - ;; - stop) - log_begin_msg "Caching reboot files..." - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - *) - log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; + start|restart|reload|force-reload|status) + [ "$VERBOSE" != no ] && log_end_msg 0 + ;; + stop) + log_begin_msg "Caching reboot files..." + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 3 + ;; esac diff --git a/debian/casper.postinst b/debian/casper.postinst index d7bc14d..532679b 100644 --- a/debian/casper.postinst +++ b/debian/casper.postinst @@ -1,5 +1,5 @@ #!/bin/sh -update-initramfs -u +update-initramfs -ut -kall #DEBHELPER# diff --git a/debian/changelog b/debian/changelog index 888457b..6887ad3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +casper (1.77+debian-1) unstable; urgency=low + + * New upstream release. + * Added snapshot persistence feature (copy on boot, sync on reboot) via + different ways: squashfs, cpio.gz, and block device filesystems. + * Added boot parameter "live-media=<device>" to force trying to boot from + a specified device. + * Added support for "todisk=<device>" to copy the live media to a + device filesystem, subsequent boots could use "live-media=<device>". + * Slightly polished locales and keyboards handling. + * Extendend manpages. + * Readded a missing "sleep 1", reworked how live_media is detected, + thanks to Bas Wijnen <wijnen@debian.org> for the reports. + (Closes: #394308, #394554). + * Reworked casper-getty system, thanks to Alex Owen (Closes: #394686). + * Postint now rebuild all initramfs. + * Casper now Recommends also squashfs-tools and genext2fs, maybe + needed by casper-snapshot. + * Lowered usplash requirements, since usplash 0.4 is not in debian + yet. + + -- Marco Amadori <marco.amadori@gmail.com> Sun, 22 Oct 2006 20:25:38 +0200 + casper (1.71+debian-1) unstable; urgency=low * New upstream release. diff --git a/debian/changelog.upstream b/debian/changelog.upstream index e9288e9..32e573d 100644 --- a/debian/changelog.upstream +++ b/debian/changelog.upstream @@ -1,3 +1,66 @@ +casper (1.77) edgy; urgency=low + + * Honour console-setup/modelcode preseeding. Needed for Malone #66719, + #66774. + + -- Colin Watson <cjwatson@ubuntu.com> Fri, 20 Oct 2006 19:59:39 +0100 + +casper (1.76) edgy; urgency=low + + [ Colin Watson ] + * Copy access=m2 accessibility changes into the corresponding ubiquity + hook. + * Remove spurious quoting from accessibility script. + * Clear console-setup/layoutcode and console-setup/variantcode if they + aren't supplied on the command line. + + [ Michael Vogt ] + * scripts/casper-bottom/35fix_language_selector: + - run fontconfig-voodoo if available to make sure that we have + optimal fontconfig settings for the CJK languages (lp: #49334) + + [ Henrik Nilsen Omma ] + * Fix a few accessibility items that were out of date, changing + gnopernicus -> orca and gok -> onboard (the gok entry was missing some + brackets as well; patch from Malone #58836, closes: Malone #65861). + + -- Colin Watson <cjwatson@ubuntu.com> Mon, 16 Oct 2006 20:20:15 +0100 + +casper (1.75) edgy; urgency=low + + * Turn on accessibility in "Motor Difficulties - pointing devices" which + makes onboard start properly. closes: Malone: #65861. + + -- Tollef Fog Heen <tfheen@ubuntu.com> Fri, 13 Oct 2006 14:12:10 +0200 + +casper (1.74) edgy; urgency=low + + [ Tollef Fog Heen ] + * Sync up ubiquity-hooks/30accessibility with + scripts/casper-bottom/30accessibility fixing spelling errors and + enabling accessibility in KDE. + + [ Colin Watson ] + * Fix check for presence of gconf2 (closes: Malone #58836). + + -- Colin Watson <cjwatson@ubuntu.com> Wed, 11 Oct 2006 11:18:00 +0100 + +casper (1.73) edgy; urgency=low + + * Never run install-keymap or preseed debian-installer/keymap if + console-setup is detected, even if console-setup wasn't explicitly + preseeded. Contributes to Malone #60067. + + -- Colin Watson <cjwatson@ubuntu.com> Sat, 7 Oct 2006 01:56:20 +0100 + +casper (1.72) edgy; urgency=low + + * Force suspend and hibernate both off, since reconfiguring + gnome-power-manager kills usplash here. Fixes Malone: #61535 + completely. + + -- Tollef Fog Heen <tfheen@ubuntu.com> Fri, 6 Oct 2006 14:22:23 +0200 + casper (1.71) edgy; urgency=low * Use TEXT-URGENT in shutdown script to make sure we display the "please diff --git a/debian/control b/debian/control index 1999790..95a6edd 100644 --- a/debian/control +++ b/debian/control @@ -9,9 +9,9 @@ Standards-Version: 3.7.2 Package: casper Architecture: any Depends: initramfs-tools (>= 0.40), user-setup, sudo -Conflicts: usplash (<< 0.4-27) +Conflicts: usplash (<< 0.4-0) Recommends: live-package -Suggests: dmsetup +Suggests: dmsetup, squashft-tools, genext2fs Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660 Description: Debian Live initramfs generator Casper provides an initramfs generator suited for booting a Debian Live systems diff --git a/debian/control.debian b/debian/control.debian index 1999790..95a6edd 100644 --- a/debian/control.debian +++ b/debian/control.debian @@ -9,9 +9,9 @@ Standards-Version: 3.7.2 Package: casper Architecture: any Depends: initramfs-tools (>= 0.40), user-setup, sudo -Conflicts: usplash (<< 0.4-27) +Conflicts: usplash (<< 0.4-0) Recommends: live-package -Suggests: dmsetup +Suggests: dmsetup, squashft-tools, genext2fs Tag: admin::boot, admin::filesystem, implemented-in::shell, protocol::smb, role::plugin, scope::utility, special::completely-tagged, works-with-format::iso9660 Description: Debian Live initramfs generator Casper provides an initramfs generator suited for booting a Debian Live systems diff --git a/debian/manpage/casper.7 b/debian/manpage/casper.7 index 1bc0b22..89f1cf2 100644 --- a/debian/manpage/casper.7 +++ b/debian/manpage/casper.7 @@ -18,24 +18,35 @@ This enable a special serial login shell (experimental). .BI "host=" HOSTNAME " , userfullname=" USERFULLNAME " , username=" USERNAME Those parameters lets you override values read from the config file. .TP -.B "showmounts" -Specifying this will make casper to show on "/" the ro filesystems (mostly compressed) on /casper. This is not enabled by default because could lead to problems by application like "mono" which store binary paths on installation. +.BI "keyb=" KEYBOARD " | kbd-chooser/method=" KEYBOARD "; console-setup/layoutcode=" LAYOUT ", console-setup/variantcode=" VARIANT +Configure the running keyboard as specified, if this one misses casper behave as "keyb=us" was specified. (It will be interfered from "locale=" somewhere in the future). You could also specify layout and variant (no defaults). .TP .BI ip= IFACE,ADDRESS,NETMASK,GATEWAY [ :IFACE,ADDRESS,NETMASK,GATEWAY "]*" Let you specify the name(s) and the options of the interface(s) that should be configured at boot time. Do not specify it if you want to use dhcp (default). .TP .BR ip[= frommedia ] This way dhcp and static configuration is just skipped and the system will use the (must be) media-preconfigured /etc/network/interfaces instead. - +.TP +.BI "locale=" LOCALE " | debian-installer/locale=" LOCALE +Configure the running locale as specified, if not present the live-media rootfs configured locale will be used and if also this one misses casper behave as "locale=en_US.UTF-8" was specified. +.TP +.BI live-media= DEVICE " | bootfrom=" DEVICE +If you specify one of this two equivalent forms, casper will try first to look on this device for the "/casper" directory where it should lie the read-only root filesystem, if it did not find it, the normal scan for block devices will be performed. .TP .BR "netboot[=" nfs "|" cifs ] This tells casper to look for a network mount, to be specified by parameter "nfsroot=" (with optional "nfsopts="), for the "/casper" dirs where root filesystem lies. With no args, will try cifs first, and if it fails nfs. .TP .B persistent -Casper will look for persistent and snapshot partitions or files labeled "casper-rw", "home-rw", "casper-snap*", "home-snap*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latters in appropriate locations. +Casper will look for persistent and snapshot partitions or files labeled "casper-rw", "home-rw", and files called "casper-sn*", "home-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latters in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at casper-snapshot(1) for more informations. +.TP +.B "showmounts" +Specifying this will make casper to show on "/" the ro filesystems (mostly compressed) on /casper. This is not enabled by default because could lead to problems by application like "mono" which store binary paths on installation. +.TP +.BI "todisk=" DEVICE +Adding this parameter, casper will try to copy to the specified device the whole read-only media before mounting the root filesystem, it could need a lot of free space, according to one used by the read-only media. Subsequent boots should then skip this step and just specify the "live-media=DEVICE" boot parameter with the same DEVICE used this time. .TP .B toram -Adding this parameter, casper will try to copy to ram the whole read-only media before mounting the root filesystem(s), it could need a lot of ram, according to the space used by the read-only media. +Adding this parameter, casper will try to copy to ram the whole read-only media before mounting the root filesystem, it could need a lot of ram, according to the space used by the read-only media. .SH FILES .B /etc/casper.conf |