[Debian-live-changes] r1303 - in dists/trunk/live-initramfs: doc hooks scripts scripts/casper-bottom scripts/casper-premount

Daniel Baumann daniel at alioth.debian.org
Sun May 6 10:30:28 UTC 2007


Author: daniel
Date: 2007-05-06 10:30:27 +0000 (Sun, 06 May 2007)
New Revision: 1303

Added:
   dists/trunk/live-initramfs/scripts/live-functions
Removed:
   dists/trunk/live-initramfs/scripts/casper-functions
Modified:
   dists/trunk/live-initramfs/doc/ChangeLog
   dists/trunk/live-initramfs/hooks/casper
   dists/trunk/live-initramfs/scripts/casper-bottom/02_timezone
   dists/trunk/live-initramfs/scripts/casper-bottom/05mountpoints
   dists/trunk/live-initramfs/scripts/casper-bottom/10adduser
   dists/trunk/live-initramfs/scripts/casper-bottom/12fstab
   dists/trunk/live-initramfs/scripts/casper-bottom/13swap
   dists/trunk/live-initramfs/scripts/casper-bottom/14locales
   dists/trunk/live-initramfs/scripts/casper-bottom/15autologin
   dists/trunk/live-initramfs/scripts/casper-bottom/18hostname
   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/22screensaver
   dists/trunk/live-initramfs/scripts/casper-bottom/23etc_modules
   dists/trunk/live-initramfs/scripts/casper-bottom/23networking
   dists/trunk/live-initramfs/scripts/casper-bottom/24preseed
   dists/trunk/live-initramfs/scripts/casper-bottom/25configure_init
   dists/trunk/live-initramfs/scripts/casper-bottom/30accessibility
   dists/trunk/live-initramfs/scripts/casper-bottom/31disable_update_notifier
   dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation
   dists/trunk/live-initramfs/scripts/casper-bottom/33enable_apport_crashes
   dists/trunk/live-initramfs/scripts/casper-bottom/34disable_kwallet
   dists/trunk/live-initramfs/scripts/casper-bottom/35fix_language_selector
   dists/trunk/live-initramfs/scripts/casper-bottom/40install_driver_updates
   dists/trunk/live-initramfs/scripts/casper-bottom/41apt_cdrom
   dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates
Log:


Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 10:30:27 UTC (rev 1303)
@@ -7,8 +7,15 @@
 	  - Renamed to live-md5check.
 	* casper.conf:
 	  - Renamed to live.conf.
+	* scripts/casper-functions:
+	  - Renamed to live-functions.
+
 	* bin/live-getty, live-login:
 	  - Reformated.
+	* 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  <daniel at debian.org>
 

Modified: dists/trunk/live-initramfs/hooks/casper
===================================================================
--- dists/trunk/live-initramfs/hooks/casper	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/hooks/casper	2007-05-06 10:30:27 UTC (rev 1303)
@@ -64,7 +64,7 @@
 # integrity check
 copy_exec /usr/lib/casper/live-md5check /bin
 
-cp /usr/share/initramfs-tools/scripts/casper-functions $DESTDIR/scripts
+cp /usr/share/initramfs-tools/scripts/live-functions $DESTDIR/scripts
 cp /usr/share/initramfs-tools/scripts/casper-helpers $DESTDIR/scripts
 
 auto_add_modules net

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/02_timezone
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/02_timezone	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/02_timezone	2007-05-06 10:30:27 UTC (rev 1303)
@@ -1,9 +1,9 @@
 #! /bin/sh
 
 PREREQ=""
-DESCRIPTION="Adding APT-CDROM source..."
+DESCRIPTION="Setting timezone..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/05mountpoints
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/05mountpoints	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/05mountpoints	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Moving mount points..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/10adduser
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/10adduser	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/10adduser	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Adding live session user..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/12fstab
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/12fstab	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/12fstab	2007-05-06 10:30:27 UTC (rev 1303)
@@ -4,7 +4,7 @@
 DESCRIPTION="Configuring fstab..."
 FSTAB=/root/etc/fstab
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/13swap	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/13swap	2007-05-06 10:30:27 UTC (rev 1303)
@@ -4,7 +4,7 @@
 DESCRIPTION="Setting up swap..."
 FSTAB=/root/etc/fstab
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/14locales
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/14locales	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/14locales	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up locales..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/15autologin
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/15autologin	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/15autologin	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up automatic login..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/18hostname
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/18hostname	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/18hostname	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting hostname..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/19keyboard	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up console keyboard..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/20xconfig	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring X..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/22gnome_panel_data	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring gnome-panel-data..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/22screensaver
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/22screensaver	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/22screensaver	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring screensaver..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/23etc_modules
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/23etc_modules	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/23etc_modules	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Preconfiguring /etc/modules..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/23networking
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/23networking	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/23networking	2007-05-06 10:30:27 UTC (rev 1303)
@@ -4,7 +4,7 @@
 DESCRIPTION="Preconfiguring networking..."
 IFFILE="/root/etc/network/interfaces"
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/24preseed
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/24preseed	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/24preseed	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Loading preseed file..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs ()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/25configure_init
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/25configure_init	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/25configure_init	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Setting up init..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/30accessibility
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/30accessibility	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/30accessibility	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring accessibility options..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/31disable_update_notifier
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/31disable_update_notifier	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/31disable_update_notifier	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Disabling update-notifier..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/32disable_hibernation	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Configuring power management..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/33enable_apport_crashes
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/33enable_apport_crashes	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/33enable_apport_crashes	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Enabling notifications about program crashes..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/34disable_kwallet
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/34disable_kwallet	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/34disable_kwallet	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Disabling kwallet..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {
@@ -22,4 +22,4 @@
 
 rm -f /root/usr/share/services/kded/kwalletd.desktop
 
-log_end_msg
\ No newline at end of file
+log_end_msg

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/35fix_language_selector
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/35fix_language_selector	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/35fix_language_selector	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Fixing language selector..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/40install_driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/40install_driver_updates	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/40install_driver_updates	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Installing driver updates..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Modified: dists/trunk/live-initramfs/scripts/casper-bottom/41apt_cdrom
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-bottom/41apt_cdrom	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-bottom/41apt_cdrom	2007-05-06 10:30:27 UTC (rev 1303)
@@ -3,7 +3,7 @@
 PREREQ=""
 DESCRIPTION="Adding APT-CDROM source..."
 
-. /scripts/casper-functions
+. /scripts/live-functions
 
 prereqs()
 {

Deleted: dists/trunk/live-initramfs/scripts/casper-functions
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-functions	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-functions	2007-05-06 10:30:27 UTC (rev 1303)
@@ -1,21 +0,0 @@
-
-. /scripts/functions
-
-# Override this so we don't call PROGRESS
-log_end_msg()
-{
-	if [ -x /sbin/usplash_write ]; then
-		/sbin/usplash_write "SUCCESS ok"
-	fi
-	_log_msg "Done."
-}
-
-# Print a message and wait for enter
-log_wait_msg()
-{
-	if [ -x /sbin/usplash_write ]; then
-		/sbin/usplash_write "INPUTENTER $@"
-		read nunya < /dev/.initramfs/usplash_outfifo
-	fi
-	_log_msg "Waiting: $@ ..."
-}

Modified: dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates
===================================================================
--- dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates	2007-05-06 10:12:44 UTC (rev 1302)
+++ dists/trunk/live-initramfs/scripts/casper-premount/10driver_updates	2007-05-06 10:30:27 UTC (rev 1303)
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PREREQ=""
-. /scripts/casper-functions
+. /scripts/live-functions
 . /scripts/casper-helpers
 
 prereqs()

Copied: dists/trunk/live-initramfs/scripts/live-functions (from rev 1302, dists/trunk/live-initramfs/scripts/casper-functions)




More information about the Debian-live-changes mailing list