From 9fc9e2a1a11b0edada38cb501fefe4f58aa414ac Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 14:46:36 +0200 Subject: [PATCH] Adding live-initramfs 1.87.2-1. --- bin/casper-getty | 15 ----- bin/casper-login | 6 -- bin/live-getty | 20 ++++++ bin/live-login | 12 ++++ {casper-md5check => bin/live-md5check}/Makefile | 4 +- .../live-md5check/live-md5check.c | 0 {casper-md5check => bin/live-md5check}/md5.c | 0 {casper-md5check => bin/live-md5check}/md5.h | 0 bin/{casper-preseed => live-preseed} | 4 +- bin/{casper-reconfigure => live-reconfigure} | 0 bin/{casper-snapshot => live-snapshot} | 20 +++--- casper.conf | 8 --- caspermon/GNOME_PythonAppletCasper.server | 30 --------- caspermon/caspermon-applet | 75 ---------------------- caspermon/caspermond | 9 --- conf/live.conf | 9 +++ debian/changelog | 6 ++ debian/copyright | 2 +- debian/dirs | 2 +- debian/examples | 2 +- debian/init | 12 ++-- debian/install | 10 +-- debian/links | 4 +- debian/manpages | 2 +- debian/rules | 13 ++-- doc/ChangeLog | 28 ++++++++ hooks/{casper => live} | 16 ++--- .../manpage/casper.7 => manpages/live-initramfs.7 | 8 +-- .../casper-snapshot.1 => manpages/live-snapshot.1 | 0 scripts/{casper => live} | 52 +++++++-------- .../01integrity_check | 2 +- scripts/{casper-bottom => live-bottom}/02_timezone | 4 +- .../{casper-bottom => live-bottom}/05mountpoints | 2 +- scripts/{casper-bottom => live-bottom}/10adduser | 6 +- scripts/{casper-bottom => live-bottom}/12fstab | 2 +- scripts/{casper-bottom => live-bottom}/13swap | 2 +- scripts/{casper-bottom => live-bottom}/14locales | 2 +- scripts/{casper-bottom => live-bottom}/15autologin | 2 +- scripts/{casper-bottom => live-bottom}/18hostname | 2 +- scripts/{casper-bottom => live-bottom}/19keyboard | 14 ++-- scripts/{casper-bottom => live-bottom}/20xconfig | 6 +- .../22gnome_panel_data | 4 +- .../{casper-bottom => live-bottom}/22screensaver | 2 +- .../{casper-bottom => live-bottom}/23etc_modules | 2 +- .../{casper-bottom => live-bottom}/23networking | 2 +- scripts/{casper-bottom => live-bottom}/24preseed | 6 +- .../25configure_init | 2 +- .../{casper-bottom => live-bottom}/30accessibility | 2 +- .../31disable_update_notifier | 2 +- .../32disable_hibernation | 4 +- .../33enable_apport_crashes | 2 +- .../34disable_kwallet | 4 +- .../35fix_language_selector | 2 +- .../40install_driver_updates | 2 +- scripts/{casper-bottom => live-bottom}/41apt_cdrom | 2 +- scripts/{casper-functions => live-functions} | 0 scripts/{casper-helpers => live-helpers} | 0 .../10driver_updates | 4 +- 58 files changed, 194 insertions(+), 261 deletions(-) delete mode 100755 bin/casper-getty delete mode 100755 bin/casper-login create mode 100755 bin/live-getty create mode 100755 bin/live-login rename {casper-md5check => bin/live-md5check}/Makefile (50%) rename casper-md5check/casper-md5check.c => bin/live-md5check/live-md5check.c (100%) rename {casper-md5check => bin/live-md5check}/md5.c (100%) rename {casper-md5check => bin/live-md5check}/md5.h (100%) rename bin/{casper-preseed => live-preseed} (63%) rename bin/{casper-reconfigure => live-reconfigure} (100%) rename bin/{casper-snapshot => live-snapshot} (93%) delete mode 100644 casper.conf delete mode 100644 caspermon/GNOME_PythonAppletCasper.server delete mode 100755 caspermon/caspermon-applet delete mode 100644 caspermon/caspermond create mode 100644 conf/live.conf rename hooks/{casper => live} (73%) rename debian/manpage/casper.7 => manpages/live-initramfs.7 (96%) rename debian/manpage/casper-snapshot.1 => manpages/live-snapshot.1 (100%) rename scripts/{casper => live} (92%) rename scripts/{casper-bottom => live-bottom}/01integrity_check (61%) rename scripts/{casper-bottom => live-bottom}/02_timezone (74%) rename scripts/{casper-bottom => live-bottom}/05mountpoints (92%) rename scripts/{casper-bottom => live-bottom}/10adduser (89%) rename scripts/{casper-bottom => live-bottom}/12fstab (92%) rename scripts/{casper-bottom => live-bottom}/13swap (96%) rename scripts/{casper-bottom => live-bottom}/14locales (97%) rename scripts/{casper-bottom => live-bottom}/15autologin (98%) rename scripts/{casper-bottom => live-bottom}/18hostname (95%) rename scripts/{casper-bottom => live-bottom}/19keyboard (79%) rename scripts/{casper-bottom => live-bottom}/20xconfig (89%) rename scripts/{casper-bottom => live-bottom}/22gnome_panel_data (88%) rename scripts/{casper-bottom => live-bottom}/22screensaver (95%) rename scripts/{casper-bottom => live-bottom}/23etc_modules (92%) rename scripts/{casper-bottom => live-bottom}/23networking (98%) rename scripts/{casper-bottom => live-bottom}/24preseed (81%) rename scripts/{casper-bottom => live-bottom}/25configure_init (98%) rename scripts/{casper-bottom => live-bottom}/30accessibility (99%) rename scripts/{casper-bottom => live-bottom}/31disable_update_notifier (96%) rename scripts/{casper-bottom => live-bottom}/32disable_hibernation (92%) rename scripts/{casper-bottom => live-bottom}/33enable_apport_crashes (95%) rename scripts/{casper-bottom => live-bottom}/34disable_kwallet (87%) rename scripts/{casper-bottom => live-bottom}/35fix_language_selector (95%) rename scripts/{casper-bottom => live-bottom}/40install_driver_updates (95%) rename scripts/{casper-bottom => live-bottom}/41apt_cdrom (91%) rename scripts/{casper-functions => live-functions} (100%) rename scripts/{casper-helpers => live-helpers} (100%) rename scripts/{casper-premount => live-premount}/10driver_updates (98%) diff --git a/bin/casper-getty b/bin/casper-getty deleted file mode 100755 index f885fa9..0000000 --- a/bin/casper-getty +++ /dev/null @@ -1,15 +0,0 @@ -#! /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 deleted file mode 100755 index e6a4173..0000000 --- a/bin/casper-login +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/sh - -USERNAME=root -[ -f /etc/casper.conf ] && . /etc/casper.conf -exec /bin/login -f $USERNAME - diff --git a/bin/live-getty b/bin/live-getty new file mode 100755 index 0000000..6781ea5 --- /dev/null +++ b/bin/live-getty @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +AUTOLOGIN="1" + +for ARGUMENT in "${@}" +do + if [ "${ARGUMENT}" = "-l" ] || [ "${ARGUMENT}" = "-n" ] + then + AUTOLOGIN="0" + fi +done + +if [ "${AUTOLOGIN}" = "1" ] +then + exec /sbin/getty -n -l /sbin/live-login ${*} +else + exec /sbin/getty ${*} +fi diff --git a/bin/live-login b/bin/live-login new file mode 100755 index 0000000..c2cc5a1 --- /dev/null +++ b/bin/live-login @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +USERNAME="root" + +if [ -f /etc/live.conf ] +then + . /etc/live.conf +fi + +exec /bin/login -f "${USERNAME}" diff --git a/casper-md5check/Makefile b/bin/live-md5check/Makefile similarity index 50% rename from casper-md5check/Makefile rename to bin/live-md5check/Makefile index 4e5408f..51e42b9 100644 --- a/casper-md5check/Makefile +++ b/bin/live-md5check/Makefile @@ -3,7 +3,7 @@ CC=gcc LDFLAGS=-lm CFLAGS=$(getconf LFS_CFLAGS) -Wall -O2 -casper-md5check: casper-md5check.c md5.c +live-md5check: live-md5check.c md5.c clean: - rm -f *.o casper-md5check + rm -f *.o live-md5check diff --git a/casper-md5check/casper-md5check.c b/bin/live-md5check/live-md5check.c similarity index 100% rename from casper-md5check/casper-md5check.c rename to bin/live-md5check/live-md5check.c diff --git a/casper-md5check/md5.c b/bin/live-md5check/md5.c similarity index 100% rename from casper-md5check/md5.c rename to bin/live-md5check/md5.c diff --git a/casper-md5check/md5.h b/bin/live-md5check/md5.h similarity index 100% rename from casper-md5check/md5.h rename to bin/live-md5check/md5.h diff --git a/bin/casper-preseed b/bin/live-preseed similarity index 63% rename from bin/casper-preseed rename to bin/live-preseed index c0c76eb..c10315e 100755 --- a/bin/casper-preseed +++ b/bin/live-preseed @@ -8,8 +8,8 @@ value="$3" seen="$4" [ "$seen" ] || seen=true -if ! (echo "SET $question $value"; echo "FSET $question seen $seen") | chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null; then - chroot "$1" debconf-communicate -fnoninteractive casper >/dev/null </dev/null; then + chroot "$1" debconf-communicate -fnoninteractive live-initramfs >/dev/null < - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/caspermon/caspermon-applet b/caspermon/caspermon-applet deleted file mode 100755 index 773e0a4..0000000 --- a/caspermon/caspermon-applet +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/python - -import pygtk -pygtk.require('2.0') - -import gtk -import gnome.applet -import subprocess -import os - -# A simple applet to display the utilization of the snapshot device -# during a casper session -# -# Matt Zimmerman - -# TODO: -# - tooltip with details -# - flash at threshold - -class CasperApplet: - def __init__(self, applet, iid): - self.timeout_interval = 1000 - self.device = 'casper-snapshot' - self.capacity = [0,0] - self.datafile = '/var/lib/casper/snapshot-status' - - # initializate the gnome internals - gnome.init("casper", "0.1") - - self.applet = applet - - self.tooltips = gtk.Tooltips() - self.hbox = gtk.HBox() - applet.add(self.hbox) - - # add the second button event for the popup menu and the enter mouse event to change the tooltip value - self.ev_box = gtk.EventBox() - #self.ev_box.connect("button-press-event",self.button_press) - self.ev_box.connect("enter-notify-event", self.update_info) - self.hbox.add(self.ev_box) - - self.prog = gtk.ProgressBar() - self.ev_box.add(self.prog) - - self.update_info() - - gtk.timeout_add(self.timeout_interval,self.update_info, self) - - applet.connect("destroy",self.cleanup) - applet.show_all() - - def update_info(self, event=None): - self.capacity = self.read_info() - self.prog.set_fraction(float(self.capacity[0]) / self.capacity[1]) - self.prog.update() - - def read_info(self): - fields = open(self.datafile).readline().split() - if fields[2] != 'snapshot': - return None - - return map(int,fields[3].split('/', 1)) - - def cleanup(self): - # what goes here? - pass - -def casper_factory(applet, iid): - CasperApplet(applet, iid) - - return gtk.TRUE - -gnome.applet.bonobo_factory("OAFIID:GNOME_PythonAppletCasper_Factory", - gnome.applet.Applet.__gtype__, - "casper", "0", casper_factory) diff --git a/caspermon/caspermond b/caspermon/caspermond deleted file mode 100644 index e126447..0000000 --- a/caspermon/caspermond +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -STATEFILE=/var/run/caspermond/status.casper-snapshot - -while true; do - dmsetup status /dev/mapper/casper-snapshot > $STATEFILE.new - mv $STATEFILE.new $STATEFILE - sleep 60 -done diff --git a/conf/live.conf b/conf/live.conf new file mode 100644 index 0000000..0b44894 --- /dev/null +++ b/conf/live.conf @@ -0,0 +1,9 @@ +# /etc/live.conf: configuration file for live-initramfs + +BUILD_SYSTEM="Debian" + +USERNAME="user" +USERFULLNAME="Live session user" +HOST="debian" + +export BUILD_SYSTEM USERNAME USERFULLNAME HOST diff --git a/debian/changelog b/debian/changelog index 2016c6f..1125793 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-initramfs (1.87.2-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 7 May 2007 00:00:00 +0200 + live-initramfs (1.87.1-1) unstable; urgency=low * Initial release, forking casper. diff --git a/debian/copyright b/debian/copyright index d1c73c0..0174d36 100644 --- a/debian/copyright +++ b/debian/copyright @@ -36,7 +36,7 @@ License: On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL file. -License (casper-md5check/md5.c, casper-md5check/md5,h): +License (live-md5check/md5.c, live-md5check/md5,h): Copyright (C) 1999-2002 Aladdin Enterprises All rights reserved. diff --git a/debian/dirs b/debian/dirs index bb225f1..f929f0c 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1,4 @@ /etc -/usr/lib/casper +/usr/lib/live-initramfs /usr/share/initramfs-tools/hooks /usr/share/initramfs-tools/scripts diff --git a/debian/examples b/debian/examples index 195687c..63403a0 100644 --- a/debian/examples +++ b/debian/examples @@ -1 +1 @@ -casper.conf +conf/live.conf diff --git a/debian/init b/debian/init index 4e53eff..7c0dbe9 100644 --- a/debian/init +++ b/debian/init @@ -1,6 +1,6 @@ #! /bin/sh ### BEGIN INIT INFO -# Provides: casper +# Provides: live-initramfs # Required-Start: $syslog # Required-Stop: $syslog # Should-Start: $local_fs @@ -16,15 +16,15 @@ # Marco Amadori # PATH=/usr/sbin:/usr/bin:/sbin:/bin -NAME=casper +NAME=live-initramfs SCRIPTNAME=/etc/init.d/${NAME} -DO_SNAPSHOT=/sbin/${NAME}-snapshot +DO_SNAPSHOT=/sbin/live-snapshot -# Exit if system was not booted by casper -grep -qs boot=casper /proc/cmdline || exit 0 +# Exit if system was not booted by live-initramfs +grep -qs boot=live /proc/cmdline || exit 0 # Read configuration variable file if it is present -[ -r /etc/$NAME.conf ] && . /etc/$NAME.conf +[ -r /etc/live.conf ] && . /etc/live.conf # Load the VERBOSE setting and other rcS variables [ -f /etc/default/rcS ] && . /etc/default/rcS diff --git a/debian/install b/debian/install index 9e87fd8..fb597d4 100644 --- a/debian/install +++ b/debian/install @@ -1,7 +1,7 @@ -bin/casper-getty sbin -bin/casper-login sbin -bin/casper-preseed usr/share/casper -bin/casper-reconfigure usr/share/casper -bin/casper-snapshot sbin +bin/live-getty sbin +bin/live-login sbin +bin/live-preseed usr/share/live-initramfs +bin/live-reconfigure usr/share/live-initramfs +bin/live-snapshot sbin hooks usr/share/initramfs-tools scripts usr/share/initramfs-tools diff --git a/debian/links b/debian/links index 0d1d1df..fa3fb68 100644 --- a/debian/links +++ b/debian/links @@ -1,2 +1,2 @@ -/usr/share/man/man7/casper.7.gz /usr/share/man/man7/casper-getty.7.gz -/usr/share/man/man7/casper.7.gz /usr/share/man/man7/casper-login.7.gz +/usr/share/man/man7/casper.7.gz /usr/share/man/man7/live-getty.7.gz +/usr/share/man/man7/casper.7.gz /usr/share/man/man7/live-login.7.gz diff --git a/debian/manpages b/debian/manpages index 31eb23e..96c4bf7 100644 --- a/debian/manpages +++ b/debian/manpages @@ -1 +1 @@ -debian/manpage/* +manpages/* diff --git a/debian/rules b/debian/rules index 34e0fae..79117a9 100755 --- a/debian/rules +++ b/debian/rules @@ -24,16 +24,16 @@ build-stamp: dh_testdir # Checking scripts - for SCRIPT in bin/* scripts/casper scripts/casper-bottom/*; \ + for SCRIPT in scripts/live scripts/live-bottom/*; \ do \ sh -n $$SCRIPT || exit 1; \ done # Setting BUILD_SYSTEM in the binary package - sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' casper.conf + sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf # Building package - CFLAGS="$(CFLAGS)" $(MAKE) -C casper-md5check + CFLAGS="$(CFLAGS)" $(MAKE) -C bin/live-md5check touch build-stamp @@ -43,7 +43,8 @@ clean: rm -f build-stamp # Cleaning package - $(MAKE) -C casper-md5check clean + $(MAKE) -C bin/live-md5check clean + rm -f live.conf dh_clean @@ -54,8 +55,8 @@ install: build dh_installdirs # Installing package - install -m 0755 casper-md5check/casper-md5check debian/live-initramfs/usr/lib/casper - install -m 0644 casper.conf debian/live-initramfs/etc/casper.conf + install -m 0755 bin/live-md5check/live-md5check debian/live-initramfs/usr/lib/live-initramfs + install -m 0644 live.conf debian/live-initramfs/etc/live.conf binary-indep: build install diff --git a/doc/ChangeLog b/doc/ChangeLog index af2cf53..087aa82 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,31 @@ +2007-05-06 Daniel Baumann + + * bin/casper-getty, casper-login, casper-preseed, casper-reconfigure, + casper-snapshot: + - Renamed to live-*. + * casper-md5check: + - Moved to bin. + - Renamed to live-md5check. + * casper.conf: + - Moved to conf/live.conf. + * caspermon: + - Removed. + * scripts/casper, casper-bottom, casper-functions, casper-helpers, + casper-premount: + - Renamed to live-*. + * bin/live-getty, live-login, conf/live.conf: + - Reformated. + * bin/live-snapshot, debian/dirs, debian/install, debian/rules, + hooks/live, scripts/live: + - Replaces casper path names with live. + * debian/manpage: + - Moved to manpages. + - Renamed casper.7 to live-initramfs.7. + * debian/init: + - Changed activation parameter from boot=casper to boot=live. + * scripts/casper-bottom/02_timezone: + - Fixed wrong script description. + 2007-04-30 Daniel Baumann * Forked casper 1.87. diff --git a/hooks/casper b/hooks/live similarity index 73% rename from hooks/casper rename to hooks/live index 78a3cfb..94383ca 100755 --- a/hooks/casper +++ b/hooks/live @@ -24,9 +24,9 @@ manual_add_modules unionfs copy_exec /sbin/losetup /sbin # Casper hooks -mkdir -p ${DESTDIR}/lib/casper -copy_exec /usr/share/casper/casper-reconfigure /bin -copy_exec /usr/share/casper/casper-preseed /bin +mkdir -p ${DESTDIR}/lib/live-initramfs +copy_exec /usr/share/live-initramfs/live-reconfigure /bin +copy_exec /usr/share/live-initramfs/live-preseed /bin mkdir -p ${DESTDIR}/lib/udev copy_exec /lib/udev/cdrom_id /lib/udev @@ -62,14 +62,14 @@ manual_add_modules sbp2 manual_add_modules ohci1394 # integrity check -copy_exec /usr/lib/casper/casper-md5check /bin +copy_exec /usr/lib/live-initramfs/live-md5check /bin -cp /usr/share/initramfs-tools/scripts/casper-functions $DESTDIR/scripts -cp /usr/share/initramfs-tools/scripts/casper-helpers $DESTDIR/scripts +cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts +cp /usr/share/initramfs-tools/scripts/live-helpers $DESTDIR/scripts auto_add_modules net -if [ -e /etc/casper.conf ]; then +if [ -e /etc/live.conf ]; then mkdir -p ${DESTDIR}/etc - cp /etc/casper.conf ${DESTDIR}/etc + cp /etc/live.conf ${DESTDIR}/etc fi diff --git a/debian/manpage/casper.7 b/manpages/live-initramfs.7 similarity index 96% rename from debian/manpage/casper.7 rename to manpages/live-initramfs.7 index 20805b9..d35e018 100644 --- a/debian/manpage/casper.7 +++ b/manpages/live-initramfs.7 @@ -12,7 +12,7 @@ Casper is a hook for initramfs-tools used to generate an initramfs capable to bo .SH RECOGNIZED BOOT OPTIONS .TP -.B casper-getty +.B live-getty This enables a special "serial" login shell (experimental). .TP .B xdebconf @@ -43,7 +43,7 @@ Configure the running locale as specified, if not present the live-media rootfs This tells casper to perform a network mount. The parameter "nfsroot=" (with optional "nfsopts="), should specify where is the location of the root filesystem. 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", 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 latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at casper-snapshot(1) for more informations. +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 latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at live-snapshot(1) for more informations. .TP .B nopersistent disables the above mentioned "persistent" feature, useful if the bootloader (like syslinux) has been installed with persistent enabled. @@ -64,7 +64,7 @@ A path to a file present on the rootfs could be used to preseed debconf database All debian installed packages could be preseeded from command-line that way, beware of blanks spaces, they will interfere with parsing, use a preseed file in this case. .SH FILES -.B /etc/casper.conf +.B /etc/live.conf some variables can be configured via this config file. .SH BUGS @@ -75,7 +75,7 @@ works fully on amd64, i386 and ppc, it should also run on other archs. Debian Live project .SH SEE ALSO -.BR casper-snapshot(1), initramfs-tools(8), make-live(8), make-live.conf(5) +.BR live-snapshot(1), initramfs-tools(8), make-live(8), make-live.conf(5) .SH AUTHOR casper was written by Tollen Fog Heen , Matt Zimmerman , and Marco Amadori . diff --git a/debian/manpage/casper-snapshot.1 b/manpages/live-snapshot.1 similarity index 100% rename from debian/manpage/casper-snapshot.1 rename to manpages/live-snapshot.1 diff --git a/scripts/casper b/scripts/live similarity index 92% rename from scripts/casper rename to scripts/live index a4c78b3..9ab1ac5 100755 --- a/scripts/casper +++ b/scripts/live @@ -9,28 +9,28 @@ echo "/root/usr/lib" >> /etc/ld.so.conf mountpoint=/cdrom -USERNAME=casper +USERNAME=user USERFULLNAME="Live session user" HOST=live BUILD_SYSTEM=Custom mkdir -p $mountpoint -[ -f /etc/casper.conf ] && . /etc/casper.conf +[ -f /etc/live.conf ] && . /etc/live.conf export USERNAME USERFULLNAME HOST BUILD_SYSTEM -. /scripts/casper-helpers +. /scripts/live-helpers -if [ ! -f /casper.vars ]; then - touch /casper.vars +if [ ! -f /live.vars ]; then + touch /live.vars fi is_casper_path() { path=$1 - if [ -d "$path/casper" ]; then - if [ "$(echo $path/casper/*.squashfs)" != "$path/casper/*.squashfs" ] || - [ "$(echo $path/casper/*.ext2)" != "$path/casper/*.ext2" ] || - [ "$(echo $path/casper/*.dir)" != "$path/casper/*.dir" ]; then + if [ -d "$path/live" ]; then + if [ "$(echo $path/live/*.squashfs)" != "$path/live/*.squashfs" ] || + [ "$(echo $path/live/*.ext2)" != "$path/live/*.ext2" ] || + [ "$(echo $path/live/*.dir)" != "$path/live/*.dir" ]; then return 0 fi fi @@ -46,7 +46,7 @@ get_backing_device() { echo "directory" ;; *) - panic "Unrecognized casper filesystem: $1" + panic "Unrecognized live filesystem: $1" ;; esac } @@ -64,10 +64,10 @@ match_files_in_dir() { mount_images_in_directory() { directory="$1" rootmnt="$2" - if 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" + if match_files_in_dir "$directory/live/*.squashfs" || + match_files_in_dir "$directory/live/*.ext2" || + match_files_in_dir "$directory/live/*.dir"; then + setup_unionfs "$directory/live" "$rootmnt" else : fi @@ -294,7 +294,7 @@ try_snap () return 1 fi fi - echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/casper.conf # for resync on reboot/halt + echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt return 0 } @@ -378,15 +378,15 @@ setup_unionfs() { if [ -n "${SHOWMOUNTS}" ]; then for d in ${rofslist}; do - mkdir -p "${rootmnt}/casper/${d##*/}" + mkdir -p "${rootmnt}/live/${d##*/}" case d in - *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/casper/${d##*/}" + *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/live/${d##*/}" ;; - *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}" + *) mount -o move "${d}" "${rootmnt}/live/${d##*/}" ;; esac done - # shows cow fs on /cow for use by casper-snapshot + # shows cow fs on /cow for use by live-snapshot mkdir -p "${rootmnt}/cow" mount -o bind /cow "${rootmnt}/cow" fi @@ -486,13 +486,13 @@ set_usplash_timeout() { mountroot() { exec 6>&1 exec 7>&2 - exec > casper.log + exec > live.log exec 2>&1 set_usplash_timeout - [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-premount" + [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-premount" pulsate - run_scripts /scripts/casper-premount + run_scripts /scripts/live-premount [ "$quiet" != "y" ] && log_end_msg # Needed here too because some things (*cough* udev *cough*) @@ -536,14 +536,14 @@ mountroot() { log_end_msg - maybe_break casper-bottom - [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/casper-bottom" + maybe_break live-bottom + [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-bottom" pulsate - run_scripts /scripts/casper-bottom + run_scripts /scripts/live-bottom [ "$quiet" != "y" ] && log_end_msg exec 1>&6 6>&- exec 2>&7 7>&- - cp casper.log "${rootmnt}/var/log/" + cp live.log "${rootmnt}/var/log/" } diff --git a/scripts/casper-bottom/01integrity_check b/scripts/live-bottom/01integrity_check similarity index 61% rename from scripts/casper-bottom/01integrity_check rename to scripts/live-bottom/01integrity_check index 637a1ff..d5bc5fe 100755 --- a/scripts/casper-bottom/01integrity_check +++ b/scripts/live-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 && live-md5check /cdrom /cdrom/md5sum.txt < /dev/tty8 diff --git a/scripts/casper-bottom/02_timezone b/scripts/live-bottom/02_timezone similarity index 74% rename from scripts/casper-bottom/02_timezone rename to scripts/live-bottom/02_timezone index 1cb6402..873c1da 100755 --- a/scripts/casper-bottom/02_timezone +++ b/scripts/live-bottom/02_timezone @@ -1,9 +1,9 @@ #! /bin/sh PREREQ="" -DESCRIPTION="Adding APT-CDROM source..." +DESCRIPTION="Setting timezone..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/05mountpoints b/scripts/live-bottom/05mountpoints similarity index 92% rename from scripts/casper-bottom/05mountpoints rename to scripts/live-bottom/05mountpoints index 7c61de3..411660d 100755 --- a/scripts/casper-bottom/05mountpoints +++ b/scripts/live-bottom/05mountpoints @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Moving mount points..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/10adduser b/scripts/live-bottom/10adduser similarity index 89% rename from scripts/casper-bottom/10adduser rename to scripts/live-bottom/10adduser index 4fe9378..9179f1b 100755 --- a/scripts/casper-bottom/10adduser +++ b/scripts/live-bottom/10adduser @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Adding live session user..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -21,7 +21,7 @@ esac log_begin_msg "$DESCRIPTION" # U6aMy0wojraho is just a blank password -chroot /root debconf-communicate -fnoninteractive casper > /dev/null < /dev/null < /dev/null # Clear out debconf database again to avoid confusing ubiquity later. -chroot /root debconf-communicate -fnoninteractive casper > /dev/null < /dev/null < /dev/null < /dev/null </dev/null) || panel_version="" if [ -n "$gpm_version" ]; then -# casper-reconfigure /root gnome-power-manager +# live-reconfigure /root gnome-power-manager chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_hibernate false chroot /root sudo -u "$USERNAME" gconftool-2 -s -t bool /apps/gnome-power-manager/can_suspend false fi diff --git a/scripts/casper-bottom/33enable_apport_crashes b/scripts/live-bottom/33enable_apport_crashes similarity index 95% rename from scripts/casper-bottom/33enable_apport_crashes rename to scripts/live-bottom/33enable_apport_crashes index d1c8829..1fb1145 100755 --- a/scripts/casper-bottom/33enable_apport_crashes +++ b/scripts/live-bottom/33enable_apport_crashes @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Enabling notifications about program crashes..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/34disable_kwallet b/scripts/live-bottom/34disable_kwallet similarity index 87% rename from scripts/casper-bottom/34disable_kwallet rename to scripts/live-bottom/34disable_kwallet index add7cca..9fd0c26 100755 --- a/scripts/casper-bottom/34disable_kwallet +++ b/scripts/live-bottom/34disable_kwallet @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Disabling kwallet..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { @@ -22,4 +22,4 @@ log_begin_msg "$DESCRIPTION" rm -f /root/usr/share/services/kded/kwalletd.desktop -log_end_msg \ No newline at end of file +log_end_msg diff --git a/scripts/casper-bottom/35fix_language_selector b/scripts/live-bottom/35fix_language_selector similarity index 95% rename from scripts/casper-bottom/35fix_language_selector rename to scripts/live-bottom/35fix_language_selector index 3a22602..1fb78e5 100755 --- a/scripts/casper-bottom/35fix_language_selector +++ b/scripts/live-bottom/35fix_language_selector @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Fixing language selector..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/40install_driver_updates b/scripts/live-bottom/40install_driver_updates similarity index 95% rename from scripts/casper-bottom/40install_driver_updates rename to scripts/live-bottom/40install_driver_updates index 272a0ed..5822f8f 100755 --- a/scripts/casper-bottom/40install_driver_updates +++ b/scripts/live-bottom/40install_driver_updates @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Installing driver updates..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-bottom/41apt_cdrom b/scripts/live-bottom/41apt_cdrom similarity index 91% rename from scripts/casper-bottom/41apt_cdrom rename to scripts/live-bottom/41apt_cdrom index b4ab643..97b2cdc 100755 --- a/scripts/casper-bottom/41apt_cdrom +++ b/scripts/live-bottom/41apt_cdrom @@ -3,7 +3,7 @@ PREREQ="" DESCRIPTION="Adding APT-CDROM source..." -. /scripts/casper-functions +. /scripts/live-functions prereqs() { diff --git a/scripts/casper-functions b/scripts/live-functions similarity index 100% rename from scripts/casper-functions rename to scripts/live-functions diff --git a/scripts/casper-helpers b/scripts/live-helpers similarity index 100% rename from scripts/casper-helpers rename to scripts/live-helpers diff --git a/scripts/casper-premount/10driver_updates b/scripts/live-premount/10driver_updates similarity index 98% rename from scripts/casper-premount/10driver_updates rename to scripts/live-premount/10driver_updates index 8009849..55aece5 100755 --- a/scripts/casper-premount/10driver_updates +++ b/scripts/live-premount/10driver_updates @@ -1,8 +1,8 @@ #!/bin/sh PREREQ="" -. /scripts/casper-functions -. /scripts/casper-helpers +. /scripts/live-functions +. /scripts/live-helpers prereqs() { -- 2.1.4