[Debian-live-changes] r1322 - in releases/live-initramfs: . 1.87.2-1 1.87.2-1/bin 1.87.2-1/conf 1.87.2-1/debian 1.87.2-1/doc 1.87.2-1/hooks 1.87.2-1/scripts

Daniel Baumann daniel at alioth.debian.org
Sun May 6 14:32:32 UTC 2007


Author: daniel
Date: 2007-05-06 14:32:31 +0000 (Sun, 06 May 2007)
New Revision: 1322

Added:
   releases/live-initramfs/1.87.2-1/
   releases/live-initramfs/1.87.2-1/bin/live-md5check/
   releases/live-initramfs/1.87.2-1/bin/live-snapshot
   releases/live-initramfs/1.87.2-1/conf/live.conf
   releases/live-initramfs/1.87.2-1/debian/changelog
   releases/live-initramfs/1.87.2-1/debian/dirs
   releases/live-initramfs/1.87.2-1/debian/install
   releases/live-initramfs/1.87.2-1/debian/manpages
   releases/live-initramfs/1.87.2-1/debian/rules
   releases/live-initramfs/1.87.2-1/doc/ChangeLog
   releases/live-initramfs/1.87.2-1/hooks/live
   releases/live-initramfs/1.87.2-1/manpages/
   releases/live-initramfs/1.87.2-1/scripts/live
Removed:
   releases/live-initramfs/1.87.2-1/bin/live-snapshot
   releases/live-initramfs/1.87.2-1/conf/live.conf
   releases/live-initramfs/1.87.2-1/debian/changelog
   releases/live-initramfs/1.87.2-1/debian/dirs
   releases/live-initramfs/1.87.2-1/debian/install
   releases/live-initramfs/1.87.2-1/debian/manpage/
   releases/live-initramfs/1.87.2-1/debian/manpages
   releases/live-initramfs/1.87.2-1/debian/rules
   releases/live-initramfs/1.87.2-1/doc/ChangeLog
   releases/live-initramfs/1.87.2-1/hooks/live
   releases/live-initramfs/1.87.2-1/live-md5check/
   releases/live-initramfs/1.87.2-1/scripts/live
Log:


Copied: releases/live-initramfs/1.87.2-1 (from rev 1312, dists/trunk/live-initramfs)

Copied: releases/live-initramfs/1.87.2-1/bin/live-md5check (from rev 1320, dists/trunk/live-initramfs/bin/live-md5check)

Deleted: releases/live-initramfs/1.87.2-1/bin/live-snapshot
===================================================================
--- dists/trunk/live-initramfs/bin/live-snapshot	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/bin/live-snapshot	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,299 +0,0 @@
-#! /bin/bash
-
-# casper-snapshot - utility to manage Debian Live systems snapshots
-#
-#   This program mount a device (fallback to /tmpfs under /mnt/snapshot
-#   and save the /cow (or a different dir) filesystem in it for reusing
-#   in another casper session. Look at manpage for more info.
-#
-# Copyright (C) 2006 Marco Amadori <marco.amadori at gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
-
-PROGRAM="`basename $0`"
-VERSION=0.0.1
-
-
-# Source live conf
-if [ -e /etc/live.conf ]; then
-	. /etc/live.conf
-else
-	USERNAME=$(cat /etc/passwd | grep "999" | cut -f1 -d ':')
-	HOSTNAME=$(hostname)
-	BUILD_SYSTEM="Debian"
-fi
-
-export USERNAME USERFULLNAME HOSTNAME BUILD_SYSTEM
-
-# Source helper functions
-helpers="/usr/share/initramfs-tools/scripts/live-helpers"
-if [ -e "${helpers}" ]; then
-	. "${helpers}"
-else
-	echo "Error: I cannot found helper functions \"${helpers}\"."
-	exit 1
-fi
-
-# Define LSB log_* functions.
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-MOUNTP=""
-COW=""
-DEV=""
-DEST=""
-TYPE=""
-DESKTOP_LINK=""
-
-Header ()
-{
-	echo "${PROGRAM} - utility to do Debian Live snapshots"
-	echo
-	echo "Usage: ${PROGRAM} [-c|--cow DIRECTORY] [-d|--device DEVICE] [-o|--output FILE] [-t|--type TYPE]"
-	echo "Usage: ${PROGRAM} [-r|--resync-string STRING]"
-	echo "Usage: ${PROGRAM} [-h|--help]"
-	echo "Usage: ${PROGRAM} [-u|--usage]"
-	echo "Usage: ${PROGRAM} [-v|--version]"
-}
-
-Usage ()
-{
-	MESSAGE=${1}
-	Header
-	echo
-	echo "Try \"${PROGRAM} --help\" for more information."
-	if [ ! -z "${MESSAGE}" ]; then
-		echo -e "${MESSAGE}"
-		exit 1
-	else
-		exit 0
-	fi
-}
-
-Help ()
-{
-	Header
-	echo
-	echo "Options:"
-	echo "  -c, --cow: specifies the copy on write directory (default: /cow)."
-	echo "  -d, --device: specifies the output snapshot device (default: none)."
-	echo "  -o, --output: specifies the output image file (default: $type dependent)."
-    echo "  -r, --resync-string: internally used to resync previous made snapshots."
-	echo "  -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\" or \"cpio\".gz archive (default: cpio)"
-    echo -e "\nLook at casper-snapshot(1) man page for more information."
-	exit 0
-}
-
-Version ()
-{
-	echo "${PROGRAM}, version ${VERSION}"
-	echo
-	echo "Copyright (C) 2006 Marco Amadori <marco.amadori at gmail.com>"
-	echo
-	echo "This program is free software; you can redistribute it and/or modify"
-	echo "it under the terms of the GNU General Public License as published by"
-	echo "the Free Software Foundation; either version 2 of the License, or"
-	echo "(at your option) any later version."
-	echo
-	echo "This program is distributed in the hope that it will be useful,"
-	echo "but WITHOUT ANY WARRANTY; without even the implied warranty of"
-	echo "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the"
-	echo "GNU General Public License for more details."
-	echo
-	echo "You should have received a copy of the GNU General Public License"
-	echo "along with this program; if not, write to the Free Software"
-	echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
-	echo
-	echo "On Debian systems, the complete text of the GNU General Public License"
-	echo "can be found in /usr/share/common-licenses/GPL file."
-	echo
-	echo "Homepage: <http://live.debian.net/>"
-	exit 0
-}
-
-Do_snapshot ()
-{
-	case "${TYPE}" in
-		squashfs)
-			echo "./tmp/exclude_list" > /tmp/exclude_list
-			( cd "${COW}" && find . -name '*.wh.*' >> /tmp/exclude_list )
-			mksquashfs "${COW}" "${DEST}" -ef /tmp/exclude_list || exit 1
-			rm /tmp/exclude_list
-			;;
-		cpio)
-			( cd "${COW}" && find . -path '*.wh.*' -prune -o -print0 | cpio --quiet -o0 -H newc | gzip -9c > "${DEST}" ) || exit 1
-			;;
-		ext2)
-			DU_DIM="`du -ks ${COW} | cut -f1`"
-			REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
-			genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root="${COW}" "${DEST}" || exit 1
-			;;
-		*)
-			echo "Internal error."
-			exit 1
-			;;
-	esac
-}
-
-Is_same_mount ()
-{
-	dir1="`Base_path $1`"
-	dir2="`Base_path $2`"
-	if [ "${dir1}" == "${dir2}" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-Parse_args ()
-{
-	# Parse command line
-	ARGS="$1"
-	ARGUMENTS="`getopt --longoptions cow:,device:,output,resync-string:,type:,help,usage,version --name=${PROGRAM} --options c:d:o:t:r:,h,u,v --shell sh -- ${ARGS}`"
-
-	if [ "$?" != "0" ]; then
-		echo "Terminating." >&2
-		exit 1
-	fi
-
-	eval set -- "${ARGUMENTS}"
-
-	while true; do
-		case "$1" in
-			-c|--cow)
-				SNAP_COW="$2"; shift 2 ;;
-			-d|--device)
-				SNAP_DEV="$2"; shift 2 ;;
-			-o|--output)
-				SNAP_OUTPUT="$2"; shift 2 ;;
-			-t|--type)
-				SNAP_TYPE="$2"; shift 2 ;;
-			-r|--resync-string)
-				SNAP_RSTRING="$2"; break ;;
-			-h|--help)
-				Help; shift ;;
-			-u|--usage)
-				Usage ; shift ;;
-			-v|--version)
-				Version; shift ;;
-			--)
-				shift; break ;;
-			*)
-				echo "Internal error."; exit 1 ;;
-		esac
-	done
-}
-
-Mount_device ()
-{
-	dev="$1"
-
-	if [ ! -d "${MOUNTP}" ]; then
-		mkdir -p "${MOUNTP}"
-	fi
-
-	if [ -z "${dev}" ]; then
-		# create a temp
-		mount -t tmpfs -o rw tmpfs "${MOUNTP}"
-		if [ ! -L /home/$USERNAME/Desktop/casper-snapshot ]; then
-			ln -s "${MOUNTP}" /home/$USERNAME/Desktop/casper-snapshot
-		fi
-	else
-		if [ -b "${dev}" ] ; then
-			try_mount "${dev}" "${MOUNTP}" rw
-		fi
-	fi
-}
-
-Defaults ()
-{
-	MOUNTP="/mnt/casper-snapshot"
-	COW="/cow"
-	DEV=""
-	DEST="${MOUNTP}/casper-sn.cpio.gz"
-	TYPE="cpio"
-	DESKTOP_LINK=/home/$USERNAME/Desktop/casper-snapshot
-
-	if [ -n "${SNAP_RSTRING}" ]; then
-		COW=$(echo "${SNAP_RSTRING}" | cut -f1 -d ':')
-		DEV=$(echo "${SNAP_RSTRING}" | cut -f2 -d ':')
-		DEST=$(echo "${SNAP_RSTRING}" | cut -f3 -d ':')
-		
-		case "${DEST}" in
-			*.cpio.gz)
-				TYPE="cpio" ;;
-			*.squashfs)
-				TYPE="squashfs" ;;
-			"")
-				TYPE="ext2" ;;
-			*.ext2)
-				TYPE="ext2" ;;
-			*)
-				Usage "Unregognized String" ;;
-		esac
-	else
-		DEF_COW="/cow"
-		# Bad options handling
-		if [ -z "${SNAP_COW}" ]; then
-			COW="${DEF_COW}"
-		else
-			COW="${SNAP_COW}"
-		fi
-	
-		case "${SNAP_TYPE}" in
-			"cpio"|"squashfs"|"ext2")
-				TYPE="${SNAP_TYPE}"
-				;;
-			"")
-				TYPE="cpio" ;;
-			*)
-				Usage "Error: unrecognized snapshot type"
-				;;
-		esac
-		#if [ -d 
-		#if Is_same_mount 
-	fi
-
-	# check vars
-	if [ ! -d "${COW}" ]; then
-		Usage "Error: ${COW} is not a directory"
-	fi
-
-	Mount_device $DEV
-
-}
-
-Clean ()
-{
-	if [ -n "$DEV" ]; then
-		umount "${MOUNTP}"
-		rmdir "${MOUNTP}"
-		rm 
-	fi
-}
-
-Main ()
-{
-	Parse_args "$@"
-	Defaults
-	Do_snapshot
-	Clean
-}
-
-Main "$@"

Copied: releases/live-initramfs/1.87.2-1/bin/live-snapshot (from rev 1317, dists/trunk/live-initramfs/bin/live-snapshot)

Deleted: releases/live-initramfs/1.87.2-1/conf/live.conf
===================================================================
--- dists/trunk/live-initramfs/conf/live.conf	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/conf/live.conf	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,8 +0,0 @@
-# This file should go in /etc/live.conf
-# Supported variables are:
-# USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM
-
-export USERNAME="ubuntu"
-export USERFULLNAME="Live session user"
-export HOST="ubuntu"
-export BUILD_SYSTEM="Ubuntu"

Copied: releases/live-initramfs/1.87.2-1/conf/live.conf (from rev 1315, dists/trunk/live-initramfs/conf/live.conf)

Deleted: releases/live-initramfs/1.87.2-1/debian/changelog
===================================================================
--- dists/trunk/live-initramfs/debian/changelog	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/debian/changelog	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,11 +0,0 @@
-live-initramfs (1.87.2-1) UNRELEASED; urgency=low
-
-  * New upstream release.
-
- -- Daniel Baumann <daniel at debian.org>  Mon,  7 May 2007 00:00:00 +0200
-
-live-initramfs (1.87.1-1) unstable; urgency=low
-
-  * Initial release, forking casper.
-
- -- Daniel Baumann <daniel at debian.org>  Mon, 30 Apr 2007 00:00:00 +0200

Copied: releases/live-initramfs/1.87.2-1/debian/changelog (from rev 1321, dists/trunk/live-initramfs/debian/changelog)

Deleted: releases/live-initramfs/1.87.2-1/debian/dirs
===================================================================
--- dists/trunk/live-initramfs/debian/dirs	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/debian/dirs	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,4 +0,0 @@
-/etc
-/usr/lib/casper
-/usr/share/initramfs-tools/hooks
-/usr/share/initramfs-tools/scripts

Copied: releases/live-initramfs/1.87.2-1/debian/dirs (from rev 1317, dists/trunk/live-initramfs/debian/dirs)

Deleted: releases/live-initramfs/1.87.2-1/debian/install
===================================================================
--- dists/trunk/live-initramfs/debian/install	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/debian/install	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,7 +0,0 @@
-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

Copied: releases/live-initramfs/1.87.2-1/debian/install (from rev 1317, dists/trunk/live-initramfs/debian/install)

Deleted: releases/live-initramfs/1.87.2-1/debian/manpages
===================================================================
--- dists/trunk/live-initramfs/debian/manpages	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/debian/manpages	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1 +0,0 @@
-debian/manpage/*

Copied: releases/live-initramfs/1.87.2-1/debian/manpages (from rev 1319, dists/trunk/live-initramfs/debian/manpages)

Deleted: releases/live-initramfs/1.87.2-1/debian/rules
===================================================================
--- dists/trunk/live-initramfs/debian/rules	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/debian/rules	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,82 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-# Looking in which build system we are
-BUILD_SYSTEM := $(shell lsb_release --short --id)
-
-upstream:
-	# Needs: subversion
-	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-initramfs || true
-	find . -type d -name .svn | xargs rm -rf
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	# Checking scripts
-	for SCRIPT in bin/* scripts/casper scripts/live-bottom/*; \
-	do \
-		sh -n $$SCRIPT || exit 1; \
-	done
-
-	# Setting BUILD_SYSTEM in the binary package
-	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
-
-	# Building package
-	CFLAGS="$(CFLAGS)" $(MAKE) -C live-md5check
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Cleaning package
-	$(MAKE) -C live-md5check clean
-	rm -f live.conf
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Installing package
-	install -m 0755 live-md5check/live-md5check debian/live-initramfs/usr/lib/casper
-	install -m 0644 live.conf debian/live-initramfs/etc/live.conf
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs doc/ChangeLog
-	dh_installdocs doc/ChangeLog.casper
-	dh_installexamples
-	dh_install
-	dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 .
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

Copied: releases/live-initramfs/1.87.2-1/debian/rules (from rev 1321, dists/trunk/live-initramfs/debian/rules)

Deleted: releases/live-initramfs/1.87.2-1/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/doc/ChangeLog	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,53 +0,0 @@
-2007-05-06  Daniel Baumann  <daniel at debian.org>
-
-	* bin/casper-getty, casper-login, casper-preseed, casper-reconfigure,
-	  casper-snapshot:
-	  - Renamed to live-*.
-	* casper-md5check:
-	  - Renamed to live-md5check.
-	* casper.conf:
-	  - Renamed to live.conf.
-	* caspermon:
-	  - Removed.
-	* scripts/casper, casper-bottom, casper-functions, casper-helpers,
-	  casper-premount:
-	  - Renamed to live-*.
-
-	* Reorganised sources:
-	  - live.conf to conf/live.conf.
-
-	* 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>
-
-	* Forked casper 1.87.
-	* COPYING:
-	  - Added.
-	* debian/control, debian/ubiquity-casper.install, ubiquity-hooks:
-	  - Removed ubiquity support.
-	* debian/changelog:
-	  - Moved old changelog to doc/ChangeLog.casper.
-	  - Added new changelog for live-initramfs.
-	* debian/casper.dirs, casper.init, casper.install, casper.manpages,
-	  casper.postinst:
-	  - Renamed, removed packagename prefix from filename.
-	* debian/compat, copyright, dirs, manpages:
-	  - Updated.
-	* debian/examples, links:
-	  - Added.
-	* debian/rules:
-	  - Updated.
-	  - Added upstream target.
-	* debian/control:
-	  - Updated.
-	  - Added depends to file.
-	  - Added conflicts/replaces to casper.
-	* debian/postinst:
-	  - Running 'update-initramfs' for all kernel versions instead of
-	    latest only.
-	* Uploaded 1.87.1-1.

Copied: releases/live-initramfs/1.87.2-1/doc/ChangeLog (from rev 1320, dists/trunk/live-initramfs/doc/ChangeLog)

Deleted: releases/live-initramfs/1.87.2-1/hooks/live
===================================================================
--- dists/trunk/live-initramfs/hooks/live	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/hooks/live	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,75 +0,0 @@
-#!/bin/sh -e
-# initramfs hook for casper
-
-PREREQS=""
-
-# Output pre-requisites
-prereqs()
-{
-       echo "$PREREQ"
-}
-
-case "$1" in
-    prereqs)
-       prereqs
-       exit 0
-       ;;
-esac
-
-. /usr/share/initramfs-tools/hook-functions
-
-manual_add_modules unionfs
-
-# We need losetup
-copy_exec /sbin/losetup /sbin
-
-# Casper hooks
-mkdir -p ${DESTDIR}/lib/casper
-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
-copy_exec /lib/udev/vol_id /lib/udev
-copy_exec /lib/udev/path_id /lib/udev
-copy_exec /usr/bin/udevinfo /bin
-copy_exec /usr/bin/eject /bin
-
-# cifs boot
-if [ -x /sbin/mount.cifs ]; then
-    copy_exec /sbin/mount.cifs /sbin
-    for x in cifs; do
-        manual_add_modules ${x}
-    done
-fi
-
-# squashfs
-manual_add_modules squashfs
-manual_add_modules loop
-
-# random file system modules
-manual_add_modules vfat
-manual_add_modules ext3
-# needed for vfat. :-/
-manual_add_modules nls_cp437
-manual_add_modules nls_utf8
-manual_add_modules nls_iso8859-1
-
-# cdrom modules
-manual_add_modules sr_mod
-manual_add_modules ide-cd
-manual_add_modules sbp2
-manual_add_modules ohci1394
-
-# integrity check
-copy_exec /usr/lib/casper/live-md5check /bin
-
-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/live.conf ]; then
-    mkdir -p ${DESTDIR}/etc
-    cp /etc/live.conf ${DESTDIR}/etc
-fi

Copied: releases/live-initramfs/1.87.2-1/hooks/live (from rev 1317, dists/trunk/live-initramfs/hooks/live)

Copied: releases/live-initramfs/1.87.2-1/manpages (from rev 1319, dists/trunk/live-initramfs/manpages)

Deleted: releases/live-initramfs/1.87.2-1/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-05-06 12:19:01 UTC (rev 1312)
+++ releases/live-initramfs/1.87.2-1/scripts/live	2007-05-06 14:32:31 UTC (rev 1322)
@@ -1,549 +0,0 @@
-#!/bin/sh
-
-# set -e
-
-export PATH=/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin
-
-echo "/root/lib" >> /etc/ld.so.conf
-echo "/root/usr/lib" >> /etc/ld.so.conf
-
-mountpoint=/cdrom
-
-USERNAME=casper
-USERFULLNAME="Live session user"
-HOST=live
-BUILD_SYSTEM=Custom
-
-mkdir -p $mountpoint
-
-[ -f /etc/live.conf ] && . /etc/live.conf
-export USERNAME USERFULLNAME HOST BUILD_SYSTEM
-
-. /scripts/live-helpers
-
-if [ ! -f /casper.vars ]; then
-    touch /casper.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
-            return 0
-        fi
-    fi
-    return 1
-}
-
-get_backing_device() {
-    case "$1" in
-        *.squashfs|*.ext2)
-            echo $(setup_loop "$1" "loop" "/sys/block/loop*")
-            ;;
-        *.dir)
-            echo "directory"
-            ;;
-        *)
-            panic "Unrecognized casper filesystem: $1"
-            ;;
-    esac
-}
-
-match_files_in_dir() {
-    # Does any files match pattern $1 ?
-
-    local pattern="$1"
-    if [ "$(echo $pattern)" != "$pattern" ]; then
-        return 0
-    fi
-    return 1
-}
-
-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"
-    else
-        :
-    fi
-}
-
-is_nice_device() {
-    sysfs_path="${1#/sys}"
-    if /lib/udev/path_id "${sysfs_path}" | grep -E -q "ID_PATH=(usb|pci-[^-]*-[ide|scsi|usb])"; then
-        return 0
-    fi
-    return 1
-}
-
-is_supported_fs () {
-    # FIXME: do something better like the scan of supported filesystems
-    fstype="${1}"
-    case ${fstype} in
-        vfat|iso9660|udf|ext2|ext3|ntfs)
-            return 0
-            ;;
-    esac
-    return 1
-}
-
-copy_live_to() {
-    copyfrom="${1}"
-    copytodev="${2}"
-    copyto="${copyfrom}_swap"
-
-    size=$(fs_size "" ${copyfrom} "used")
-
-    if [ "${copytodev}" = "ram" ]; then
-        # copying to ram:
-        freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ) )
-        mount_options="-o size=${size}k"
-        free_string="memory"
-        fstype="tmpfs"
-        dev="/dev/shm"
-    else
-        # it should be a writable block device
-        if [ -b "${copytodev}" ]; then
-            dev="${copytodev}"
-            free_string="space"
-            fstype=$(get_fstype "${dev}")
-            freespace=$(fs_size "${dev}")
-        else
-            [ "$quiet" != "y" ] && log_warning_msg "${copytodev} is not a block device."
-            return 1
-        fi
-    fi
-    if [ "${freespace}" -lt "${size}" ] ; then
-        [ "$quiet" != "y" ] && log_warning_msg "Not enough free ${free_string} (${freespace}k > ${size}k) to copy live media in ${copytodev}."
-        return 1
-    fi
-
-    # begin copying..
-    mkdir "${copyto}"
-    echo "mount -t ${fstype} ${mount_options} ${dev} ${copyto}"
-    mount -t "${fstype}" ${mount_options} "${dev}" "${copyto}"
-    cp -a ${copyfrom}/* ${copyto} # "cp -a" from busybox also copies hidden files
-    umount ${copyfrom}
-    mount -r -o move ${copyto} ${copyfrom}
-    rmdir ${copyto}
-    return 0
-}
-
-do_netmount() {
-    rc=1
-
-    modprobe "${MP_QUIET}" af_packet # For DHCP
-
-    udevtrigger
-    udevsettle
-
-    ipconfig ${DEVICE} /tmp/net-${DEVICE}.conf | tee /netboot.config
-
-    if [ "${NFSROOT}" = "auto" ]; then
-        NFSROOT=${ROOTSERVER}:${ROOTPATH}
-    fi
-
-    [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}"
-
-    if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then
-        rc=0
-    elif do_nfsmount ; then
-        NETBOOT="nfs"
-        export NETBOOT
-        rc=0
-    fi
-
-    [ "$quiet" != "y" ] && log_end_msg
-    return ${rc}
-}
-
-do_nfsmount() {
-    rc=1
-    modprobe "${MP_QUIET}" nfs
-    if [ -z "${NFSOPTS}" ]; then
-        NFSOPTS=""
-    fi
-
-    [ "$quiet" != "y" ] && log_begin_msg "Trying nfsmount -o nolock -o ro ${NFSOPTS} ${NFSROOT} ${mountpoint}"
-    # FIXME: This for loop is an ugly HACK round an nfs bug
-    for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
-        nfsmount -o nolock -o ro ${NFSOPTS} "${NFSROOT}" "${mountpoint}" && rc=0 && break
-        sleep 1
-    done
-    return ${rc}
-}
-
-do_cifsmount() {
-    rc=1
-    if [ -x "/sbin/mount.cifs" ]; then
-        if [ -z "${NFSOPTS}" ]; then
-            CIFSOPTS="-ouser=root,password="
-        else
-            CIFSOPTS="${NFSOPTS}"
-        fi
-
-        [ "$quiet" != "y" ] && log_begin_msg "Trying mount.cifs ${NFSROOT} ${mountpoint} ${CIFSOPTS}"
-        modprobe "${MP_QUIET}" cifs
-
-        if mount.cifs "${NFSROOT}" "${mountpoint}" "${CIFSOPTS}" ; then
-            rc=0
-        fi
-    fi
-    return ${rc}
-}
-
-do_snap_copy ()
-{
-    fromdev="${1}"
-    todir="${2}"
-    snap_type="${3}"
-
-    size=$(fs_size "${fromdev}" "" "used")
-
-    if [ -b "${fromdev}" ]; then
-        # look for free mem
-        if [ -n "${HOMEMOUNTED}" -a "${snap_type}" = "HOME" ]; then
-            todev=$(cat /proc/mounts | grep -s " $(base_path ${todir}) " | awk '{print $1}' )
-            freespace=$(df -k  | grep -s ${todev} | awk '{print $4}')
-        else
-            freespace=$( expr $(awk '/MemFree/{print $2}' /proc/meminfo) + $( cat /proc/meminfo | grep Cached | head -n 1 | awk '/Cached/{print $2}' - ))
-        fi
-
-        tomount="/mnt/tmpsnap"
-        if [ ! -d "${tomount}" ] ; then
-            mkdir -p "${tomount}"
-        fi
-
-        fstype=$(get_fstype "${fromdev}")
-        if [ -n "${fstype}" ]; then
-            # Copying stuff...
-            mount -t "${fstype}" -o ro "${fromdev}" "${tomount}"
-            cp -a "${tomount}"/* ${todir}
-            umount "${tomount}"
-        else
-            log_warning_msg "Unrecognized fstype: ${fstype} on ${fromdev}:${snap_type}"
-        fi
-
-        rmdir "${tomount}"
-        if echo ${fromdev} | grep -qs loop; then
-           losetup -d "${fromdev}"
-        fi
-        return 0
-    else
-        return 1
-        [ "$quiet" != "y" ] && log_warning_msg "Unable to find the snapshot ${snap_type} medium"
-    fi
-}
-
-try_snap ()
-{
-    # Look for $snap_label.* in block devices and copy the contents to $snap_mount
-    #   and remember the device and filename for resync on exit in casper.init
-
-    snap_label="${1}"
-    snap_mount="${2}"
-    snap_type="${3}"
-
-    snapdata=$(find_files "${snap_label}.squashfs ${snap_label}.cpio.gz ${snap_label}.ext2")
-    if [ ! -z "${snapdata}" ]; then
-        snapdev="$(echo ${snapdata} | cut -f1 -d ' ')"
-        snapback="$(echo ${snapdata} | cut -f2 -d ' ')"
-        snapfile="$(echo ${snapdata} | cut -f3 -d ' ')"
-        if echo "${snapfile}" | grep -qs '\(squashfs\|ext2\)'; then
-            # squashfs or ext2 snapshot
-            dev=$(get_backing_device "${snapback}/${snapfile}")
-            if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}"; then
-                 log_warning_msg "Impossible to include the ${snapfile} Snapshot"
-                 return 1
-            fi
-        else
-            # cpio.gz snapshot
-            if ! (cd "${snap_mount}" && zcat "${snapback}/${snapfile}" | cpio -i -u -d 2>/dev/null) ; then
-                log_warning_msg "Impossible to include the ${snapfile} Snapshot"
-                return 1
-            fi
-        fi
-        umount "${snapback}"
-    else
-        dev=$(find_cow_device "${snap_label}")
-        if [ -b ${dev} ]; then
-            if echo "${dev}" | grep -qs loop; then
-                # strange things happens, user confused?
-                snaploop=$( losetup ${dev} | awk '{print $3}' | tr -d '()' )
-                snapfile=$(basename ${snaploop})
-                snapdev=$(cat /proc/mounts | awk '{print $2,$1}' | grep -es "^$( dirname ${snaploop} )" | cut -f2 -d ' ')
-            else
-                snapdev="${dev}"
-            fi
-            if ! do_snap_copy "${dev}" "${snap_mount}" "${snap_type}" ; then
-                log_warning_msg "Impossible to include the ${snap_label} Snapshot"
-                return 1
-            else
-                if [ -n "${snapfile}" ]; then
-                     # it was a loop device, user confused
-                     umount ${snapdev}
-                fi
-            fi
-        else
-            log_warning_msg "Impossible to include the ${snap_label} Snapshot"
-            return 1
-        fi
-    fi
-    echo "export ${snap_type}SNAP="${snap_mount}":${snapdev}:${snapfile}" >> /etc/live.conf # for resync on reboot/halt
-    return 0
-}
-
-setup_unionfs() {
-    image_directory="$1"
-    rootmnt="$2"
-
-    modprobe "${MP_QUIET}" -b unionfs
-
-    # run-init can't deal with images in a subdir, but we're going to
-    # move all of these away before it runs anyway.  No, we're not,
-    # put them in / since move-mounting them into / breaks mono and
-    # some other apps.
-
-    croot="/"
-
-    # Let's just mount the read-only file systems first
-    rofsstring=""
-    rofslist=""
-    if [ "${NETBOOT}" = "nfs" ] ; then
-        roopt="nfsro" # go aroung a bug in nfs-unionfs locking
-    else
-        roopt="ro"
-    fi
-
-    mkdir -p "${croot}"
-    for image_type in "ext2" "squashfs" "dir" ; do
-        for image in "${image_directory}"/*."${image_type}"; do
-            imagename=$(basename "${image}")
-            if [ -d "${image}" ]; then
-                # it is a plain directory: do nothing
-                rofsstring="${image}=${roopt}:${rofsstring}"
-                rofslist="${image} ${rofslist}"
-            elif [ -f "${image}" ]; then
-                backdev=$(get_backing_device "$image")
-                fstype=$(get_fstype "${backdev}")
-                if [ "${fstype}" = "unknown" ]; then
-                    panic "Unknown file system type on ${backdev} (${image})"
-                fi
-                mkdir -p "${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}"
-            fi
-        done
-    done
-    rofsstring=${rofsstring%:}
-
-    mkdir -p /cow
-    cowdevice="tmpfs"
-    cow_fstype="tmpfs"
-
-    # Looking for "${root_persistence}" device or file
-    if [ -n "${PERSISTENT}" ]; then
-        cowprobe=$(find_cow_device "${root_persistence}")
-        if [ -b "${cowprobe}" ]; then
-            cowdevice=${cowprobe}
-            cow_fstype=$(get_fstype "${cowprobe}")
-        else
-            [ "$quiet" != "y" ] && log_warning_msg "Unable to find the persistent medium"
-        fi
-    fi
-
-    mount ${cowdevice} -t ${cow_fstype} -o rw /cow || panic "Can not mount $cowdevice on /cow"
-
-    mount -t unionfs -o dirs=/cow=rw:$rofsstring unionfs "$rootmnt" || panic "Unionfs mount failed"
-
-    # Adding other custom mounts
-    if [ -n "${PERSISTENT}" ]; then
-        # directly mount /home
-        # FIXME: add a custom mounts configurable system
-        homecow=$(find_cow_device "${home_persistence}" )
-        if [ -b "${homecow}" ]; then
-            mount -t $(get_fstype "${homecow}") -o rw "${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"
-        fi
-        # Look for other snapshots to copy in
-        try_snap "${root_snapshot_label}" "${rootmnt}" "ROOT"
-        try_snap "${home_snapshot_label}" "${rootmnt}/home" "HOME"
-    fi
-
-    if [ -n "${SHOWMOUNTS}" ]; then
-        for d in ${rofslist}; do
-            mkdir -p "${rootmnt}/casper/${d##*/}"
-            case d in
-                *.dir) # do nothing # mount -o bind "${d}" "${rootmnt}/casper/${d##*/}"
-                    ;;
-                *) mount -o move "${d}" "${rootmnt}/casper/${d##*/}"
-                    ;;
-            esac
-        done
-        # shows cow fs on /cow for use by casper-snapshot
-        mkdir -p "${rootmnt}/cow"
-        mount -o bind /cow "${rootmnt}/cow"
-    fi
-
-    # move the first mount; no head in busybox-initramfs
-    for d in $(mount -t squashfs | cut -d\  -f 3); do
-        mkdir -p "${rootmnt}/rofs"
-        mount -o move "${d}" "${rootmnt}/rofs"
-        break
-    done
-}
-
-check_dev ()
-{
-    sysdev="${1}"
-    devname="${2}"
-    if [ -z "${devname}" ]; then
-        devname=$(sys2dev "${sysdev}")
-    fi
-
-    if [ -n "${LIVEMEDIA_OFFSET}" ]; then
-        loopdevname=$(setup_loop "${devname}" "loop" "/sys/block/loop*" "${LIVEMEDIA_OFFSET}")
-        devname="${loopdevname}" 
-    fi
-
-    fstype=$(get_fstype "${devname}")
-    if is_supported_fs ${fstype}; then
-        mount -t ${fstype} -o ro "${devname}" $mountpoint || continue
-        if is_casper_path $mountpoint; then
-            echo $mountpoint
-            return 0
-        else
-            umount $mountpoint
-        fi
-    fi
-
-    if [ -n "${LIVEMEDIA_OFFSET}" ]; then
-        losetup -d "${loopdevname}"
-    fi
-    return 1
-}
-
-find_livefs() {
-    timeout="${1}"
-    # first look at the one specified in the command line
-    if [ ! -z "${LIVEMEDIA}" ]; then
-        if check_dev "null" "${LIVEMEDIA}"; then
-            return 0
-        fi
-    fi
-    # don't start autodetection before timeout has expired
-    if [ -n "${LIVEMEDIA_TIMEOUT}" ]; then
-        if [ "${timeout}" -lt "${LIVEMEDIA_TIMEOUT}" ]; then
-            return 1
-        fi
-    fi
-    # or do the scan of block devices
-    for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram); do
-        devname=$(sys2dev "${sysblock}")
-        fstype=$(get_fstype "${devname}")
-        if /lib/udev/cdrom_id ${devname} > /dev/null; then
-            if check_dev "null" "${devname}" ; then
-                return 0
-            fi
-        elif is_nice_device "${sysblock}" ; then
-            for dev in $(subdevices "${sysblock}"); do
-                if check_dev "${dev}" ; then
-                    return 0
-                fi
-            done
-        elif [ "${fstype}" = "squashfs" -o \
-                "${fstype}" = "ext3" -o \
-                "${fstype}" = "ext2" ]; then
-            # This is an ugly hack situation, the block device has
-            # an image directly on it.  It's hopefully
-            # casper, so take it and run with it.
-            ln -s "${devname}" "${devname}.${fstype}"
-            echo "${devname}.${fstype}"
-            return 0
-        fi
-    done
-    return 1
-}
-
-pulsate() {
-    if [ -x /sbin/usplash_write ]; then
-        /sbin/usplash_write "PULSATE"
-    fi
-}
-
-set_usplash_timeout() {
-    if [ -x /sbin/usplash_write ]; then
-        /sbin/usplash_write "TIMEOUT 120"
-    fi
-}
-
-mountroot() {
-    exec 6>&1
-    exec 7>&2
-    exec > casper.log
-    exec 2>&1
-
-    set_usplash_timeout
-    [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-premount"
-    pulsate
-    run_scripts /scripts/live-premount
-    [ "$quiet" != "y" ] && log_end_msg
-
-    # Needed here too because some things (*cough* udev *cough*)
-    # changes the timeout
-
-    set_usplash_timeout
-
-    if [ ! -z "${NETBOOT}" ]; then
-        if do_netmount ; then
-            livefs_root="${mountpoint}"
-        else
-            panic "Unable to find a live file system on the network"
-        fi
-    else
-        # Scan local devices for the image
-        for i in 0 1 2 3 4 5 6 7 8 9 a b c d e f 10 11 12 13; do
-            livefs_root=$(find_livefs $i)
-            if [ "${livefs_root}" ]; then
-                break
-            fi
-            sleep 1
-        done
-    fi
-
-    if [ -z "${livefs_root}" ]; then
-        panic "Unable to find a medium containing a live file system"
-    fi
-
-    if [ "${TORAM}" ]; then
-        live_dest="ram"
-    elif [ "${TODISK}" ]; then
-        live_dest="${TODISK}"
-    fi
-    if [ "${live_dest}" ]; then
-        log_begin_msg "Copying live_media to ${live_dest}"
-        copy_live_to "${livefs_root}" "${live_dest}"
-        log_end_msg
-    fi
-
-    mount_images_in_directory "${livefs_root}" "${rootmnt}"
-
-    log_end_msg
-
-    maybe_break live-bottom
-    [ "$quiet" != "y" ] && log_begin_msg "Running /scripts/live-bottom"
-
-    pulsate
-    run_scripts /scripts/live-bottom
-    [ "$quiet" != "y" ] && log_end_msg
-
-    exec 1>&6 6>&-
-    exec 2>&7 7>&-
-    cp casper.log "${rootmnt}/var/log/"
-}

Copied: releases/live-initramfs/1.87.2-1/scripts/live (from rev 1317, dists/trunk/live-initramfs/scripts/live)




More information about the Debian-live-changes mailing list