[Debian-live-changes] r1295 - in dists/trunk/live-initramfs: debian
debian/manpage hooks scripts/casper-bottom
Daniel Baumann
daniel at alioth.debian.org
Sun May 6 09:21:41 UTC 2007
Author: daniel
Date: 2007-05-06 09:21:41 +0000 (Sun, 06 May 2007)
New Revision: 1295
Added:
dists/trunk/live-initramfs/debian/manpage/live-snapshot.1
Removed:
dists/trunk/live-initramfs/debian/manpage/casper-snapshot.1
Modified:
dists/trunk/live-initramfs/debian/install
dists/trunk/live-initramfs/debian/links
dists/trunk/live-initramfs/debian/manpage/casper.7
dists/trunk/live-initramfs/hooks/casper
dists/trunk/live-initramfs/scripts/casper-bottom/10adduser
dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard
dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig
dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data
dists/trunk/live-initramfs/scripts/casper-bottom/24preseed
dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation
Log:
Modified: dists/trunk/live-initramfs/debian/install
===================================================================
--- dists/trunk/live-initramfs/debian/install 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/debian/install 2007-05-06 09:21:41 UTC (rev 1295)
@@ -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/casper
+bin/live-reconfigure usr/share/casper
+bin/live-snapshot sbin
hooks usr/share/initramfs-tools
scripts usr/share/initramfs-tools
Modified: dists/trunk/live-initramfs/debian/links
===================================================================
--- dists/trunk/live-initramfs/debian/links 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/debian/links 2007-05-06 09:21:41 UTC (rev 1295)
@@ -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
Deleted: dists/trunk/live-initramfs/debian/manpage/casper-snapshot.1
===================================================================
--- dists/trunk/live-initramfs/debian/manpage/casper-snapshot.1 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/debian/manpage/casper-snapshot.1 2007-05-06 09:21:41 UTC (rev 1295)
@@ -1,70 +0,0 @@
-.TH "CASPER-SNAPSHOT" 1 "Thu, 28 Sep 2006" "0.0.1" "User commands"
-
-.SH NAME
-casper-snapshot \- a simple script to ease persistence usage.
-
-.SH SYNOPSIS
-.B casper-snapshot
-.RB [\| \-c \||\| \-\-cow
-.IR DIRECTORY \|]
-.RB [\| \-d \||\| \-\-device
-.IR DEVICE \|]
-.RB [\| \-e \||\| \-\-exclude\-list
-.IR FILE \|]
-.RB [\| \-o \||\| \-\-output
-.IR FILE \|]
-.RB [\| \-t \||\| \-\-type
-.IR TYPE \|]
-.PP
-.B casper-snapshot
-.RB \-r \||\| \-\-resync\-string
-.IR STRING
-.br
-.B casper-snapshot
-.RB \-h \||\| \-\-help
-.br
-.B casper-snapshot
-.RB \-u \||\| \-\-usage
-.br
-.B casper-snapshot
-.RB \-v \||\| \-\-version
-
-.SH DESCRIPTION
-Casper-snapshot is a script which can be used to build the right types of persistent image files supported by casper. It is also used on exit by the casper init script to resync the boot-found snapshots devices.
-
-.SH OPTIONS
-.TP
-.BI "\-c, \-\-cow" DIRECTORY
-specifies the input directory to be cloned in the image file.
-Its default value "/cow" should be right for most uses. However it could be handy to specify "/home" and type ext2 for the type to prepare an image file suited to be directly mounted by casper as home.
-.TP
-.BI "\-d, \-\-device" DEVICE
-sets the device where the media which the snapshot/persistence file/partition will be put. If it is not specified, a tmpfs will be used and linked to the user's desktop to move it where it is needed. If the device has no filesystem, an ext2 fs will be automatically created and labelled according to the values specified after the "--output" value or with a sane default.
-.TP
-.BI "\-e, \-\-exclude\-list" FILE
-a file containing a list of filenames/paths that should not be saved. This exclude list will be remebered on the target snapshot media for reuse.
-.TP
-.BI "\-o, \-\-output" FILE
-the filename/label used for the output file/partition. If left blank, casper-snapshot will search for a proper file on the device or use the whole partition.
-.TP
-.BI "\-r, \-\-resync\-string" STRING
-internally used on resyncs.
-.TP
-.BI "\-t, \-\-type" TYPE
-Type could be one of "cpio", "squashfs" or "ext2".
-
-.SH BUGS
-.B casper-snapshot
-Time (and BTS) will tell.
-
-.SH HOMEPAGE
-Debian Live project <http://live.debian.net/>
-
-.SH SEE ALSO
-.BR casper(7)
-
-.SH AUTHOR
-casper-snapshot was written Marco Amadori <marco.amadori at gmail.com>.
-.TP
-This manual page was written by Marco Amadori <marco.amadori at gmail.com>,
-for the Debian project (but may be used by others).
Modified: dists/trunk/live-initramfs/debian/manpage/casper.7
===================================================================
--- dists/trunk/live-initramfs/debian/manpage/casper.7 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/debian/manpage/casper.7 2007-05-06 09:21:41 UTC (rev 1295)
@@ -12,7 +12,7 @@
.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 @@
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.
@@ -75,7 +75,7 @@
Debian Live project <http://live.debian.net/>
.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 <tfheen at canonical.com>, Matt Zimmerman <mdz at canonical.com>, and Marco Amadori <marco.amadori at gmail.com>.
Copied: dists/trunk/live-initramfs/debian/manpage/live-snapshot.1 (from rev 1293, dists/trunk/live-initramfs/debian/manpage/casper-snapshot.1)
Modified: dists/trunk/live-initramfs/hooks/casper
===================================================================
--- dists/trunk/live-initramfs/hooks/casper 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/hooks/casper 2007-05-06 09:21:41 UTC (rev 1295)
@@ -25,8 +25,8 @@
# Casper hooks
mkdir -p ${DESTDIR}/lib/casper
-copy_exec /usr/share/casper/casper-reconfigure /bin
-copy_exec /usr/share/casper/casper-preseed /bin
+copy_exec /usr/share/casper/live-reconfigure /bin
+copy_exec /usr/share/casper/live-preseed /bin
mkdir -p ${DESTDIR}/lib/udev
copy_exec /lib/udev/cdrom_id /lib/udev
Modified: dists/trunk/live-initramfs/scripts/casper-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/10adduser 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/10adduser 2007-05-06 09:21:41 UTC (rev 1295)
@@ -21,7 +21,7 @@
log_begin_msg "$DESCRIPTION"
# U6aMy0wojraho is just a blank password
-chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
set passwd/root-password-crypted *
set passwd/user-password-crypted U6aMy0wojraho
set passwd/user-fullname $USERFULLNAME
@@ -32,7 +32,7 @@
chroot /root /usr/lib/user-setup/user-setup-apply > /dev/null
# Clear out debconf database again to avoid confusing ubiquity later.
-chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
set passwd/root-password-crypted
set passwd/user-password-crypted
set passwd/user-fullname
Modified: dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard 2007-05-06 09:21:41 UTC (rev 1295)
@@ -50,21 +50,21 @@
chroot /root sed -i "s/^XKBVARIANT=.*/XKBVARIANT=\"$csvariant\"/" \
/etc/default/console-setup
else
- casper-preseed /root console-setup/variantcode '' false
+ live-preseed /root console-setup/variantcode '' false
fi
if [ "$csmodel" ]; then
chroot /root sed -i "s/^XKBMODEL=.*/XKBMODEL=\"$csmodel\"/" \
/etc/default/console-setup
else
- casper-preseed /root console-setup/modelcode '' false
+ live-preseed /root console-setup/modelcode '' false
fi
else
- casper-preseed /root console-setup/layoutcode '' false
- casper-preseed /root console-setup/variantcode '' false
- casper-preseed /root console-setup/modelcode '' false
+ live-preseed /root console-setup/layoutcode '' false
+ live-preseed /root console-setup/variantcode '' false
+ live-preseed /root console-setup/modelcode '' false
fi
else
chroot /root /usr/sbin/install-keymap $kbd
- casper-preseed /root debian-installer/keymap "$kbd"
+ live-preseed /root debian-installer/keymap "$kbd"
fi
log_end_msg
Modified: dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig 2007-05-06 09:21:41 UTC (rev 1295)
@@ -48,12 +48,12 @@
chroot /root /usr/sbin/xdebconfigurator
fi
-chroot /root debconf-communicate -fnoninteractive casper > /dev/null <<EOF
+chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null <<EOF
set xserver-xorg/autodetect_keyboard true
fset xserver-xorg/autodetect_keyboard seen true
EOF
-DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) casper-reconfigure /root xserver-xorg
+DEBUG_XORG_PACKAGE=1 DEBUG_XORG_DEBCONF=1 LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q) live-reconfigure /root xserver-xorg
umount /root/sys
umount /root/proc
umount /root/dev
Modified: dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data 2007-05-06 09:21:41 UTC (rev 1295)
@@ -22,7 +22,7 @@
if [ -x /root/usr/sbin/laptop-detect ]; then
if chroot /root laptop-detect; then
- casper-reconfigure /root gnome-panel-data
+ live-reconfigure /root gnome-panel-data
fi
fi
Modified: dists/trunk/live-initramfs/scripts/casper-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/24preseed 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/24preseed 2007-05-06 09:21:41 UTC (rev 1295)
@@ -32,11 +32,11 @@
*/*=*)
question="${x%%=*}"
value="${x#*=}"
- casper-preseed /root "$question" "$value"
+ live-preseed /root "$question" "$value"
;;
locale=*)
value="${x#*=}"
- casper-preseed /root debian-installer/locale "$value"
+ live-preseed /root debian-installer/locale "$value"
;;
esac
done
Modified: dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation 2007-05-06 09:08:34 UTC (rev 1294)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation 2007-05-06 09:21:41 UTC (rev 1295)
@@ -23,7 +23,7 @@
gpm_version=$(chroot /root /usr/bin/dpkg-query -W --showformat='${Version}' gnome-power-manager 2>/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
More information about the Debian-live-changes
mailing list