From 49c4c42b43b83bbc2c67761e0040c1e397568f9f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 18 Apr 2010 20:39:23 +0200 Subject: [PATCH] Adding upstream version 1.91.5. --- Makefile | 10 ++-- debian/changelog | 66 ------------------------ debian/compat | 1 - debian/control | 33 ------------ debian/copyright | 64 ----------------------- debian/init | 117 ------------------------------------------- debian/postinst | 8 --- debian/postrm | 8 --- debian/rules | 82 ------------------------------ docs/ChangeLog | 9 ++++ docs/parameters.txt | 67 +++++++++++++++++++++++++ manpages/live-initramfs.en.7 | 2 +- manpages/live-snapshot.en.1 | 2 +- manpages/live-snapshot.it.1 | 4 +- scripts/live | 8 +++ 15 files changed, 93 insertions(+), 388 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/init delete mode 100755 debian/postinst delete mode 100755 debian/postrm delete mode 100755 debian/rules create mode 100644 docs/parameters.txt diff --git a/Makefile b/Makefile index a9b9991..c481eef 100644 --- a/Makefile +++ b/Makefile @@ -116,12 +116,12 @@ uninstall: rm -f $(DESTDIR)/usr/share/man/man7/live-login.7.gz update: - set -e; for MANPAGE in manpages/*.en.*; \ + set -e; for FILE in docs/parameters.txt manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-07\\-02/2007\\-07\\-09/' \ - -e 's/02.07.2007/09.07.2007/' \ - -e 's/1.91.3/1.91.4/' \ - $$MANPAGE; \ + sed -i -e 's/2007\\-07\\-16/2007\\-07\\-23/' \ + -e 's/16.07.2007/23.07.2007/' \ + -e 's/1.91.5/1.91.6/' \ + $$FILE; \ done clean: diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 5971009..0000000 --- a/debian/changelog +++ /dev/null @@ -1,66 +0,0 @@ -live-initramfs (1.91.4-1) unstable; urgency=medium - - * New upstream release: - - Dropping transitional package, not needed anymore. - - -- Daniel Baumann Mon, 9 Jul 2007 00:00:00 +0200 - -live-initramfs (1.91.3-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 2 Jul 2007 00:00:00 +0200 - -live-initramfs (1.91.2-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 25 Jun 2007 00:00:00 +0200 - -live-initramfs (1.91.1-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 18 Jun 2007 00:00:00 +0200 - -live-initramfs (1.90.1-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 11 Jun 2007 00:00:00 +0200 - -live-initramfs (1.87.6-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 4 Jun 2007 00:00:00 +0200 - -live-initramfs (1.87.5-1) unstable; urgency=medium - - * New upstream release, replacing casper. - - -- Daniel Baumann Mon, 28 May 2007 00:00:00 +0200 - -live-initramfs (1.87.4-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 21 May 2007 00:00:00 +0200 - -live-initramfs (1.87.3-1) unstable; urgency=medium - - * New upstream release. - - -- Daniel Baumann Mon, 14 May 2007 00:00:00 +0200 - -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. - - -- Daniel Baumann Mon, 30 Apr 2007 00:00:00 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7ed6ff8..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/debian/control b/debian/control deleted file mode 100644 index 1d3d3cd..0000000 --- a/debian/control +++ /dev/null @@ -1,33 +0,0 @@ -Source: live-initramfs -Section: misc -Priority: optional -Maintainer: Debian Live -Uploaders: Daniel Baumann , Marco Amadori -Build-Depends: debhelper (>= 5), lsb-release -Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/debian-live/dists/trunk/live-initramfs/ -XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-initramfs/ - -Package: live-initramfs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, file, initramfs-tools, sudo, user-setup -Recommends: eject, live-initscripts -Suggests: genext2fs, squashfs-tools -Conflicts: casper -Replaces: casper -Description: Debian Live initramfs hook - live-initramfs is a hook for the initramfs-tools, used to generate a initramfs - capable to boot live systems, such as those created by live-helper. This - includes the Debian Live isos, netboot tarballs, and usb stick images. - . - At boot time it will look for a (read-only) media containing a "/live" - directory where a root filesystems (often a compressed filesystem image like - squashfs) is stored. If found, it will create a writable environment, using - unionfs, for Debian like systems to boot from. - . - You probably do not want to install this package onto a non-live system, - although it will do no harm. - . - Homepage: - . - live-initramfs is a fork of casper . diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 792ac76..0000000 --- a/debian/copyright +++ /dev/null @@ -1,64 +0,0 @@ -This package was debianized by Daniel Baumann on -Mon, 30 Apr 2007 00:00:00 +0200. - -It was downloaded from: - - - -Upstream contact: - - Debian Live - -License: - - live-initramfs is a fork of casper . - casper was originally written by Tollef Fog Heen - and Matt Zimmerman . - - Copyright (C) 2005-2007 Canonical Ltd. - Copyright (C) 2006-2007 Marco Amadori - Copyright (C) 2007 Daniel Baumann - - 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-2 file. - -License (live-md5check/md5.c, live-md5check/md5,h): - - Copyright (C) 1999-2002 Aladdin Enterprises - All rights reserved. - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software in - a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not - be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. - -The Debian packaging is (C) 2007, Daniel Baumann and -is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. diff --git a/debian/init b/debian/init deleted file mode 100755 index d515c39..0000000 --- a/debian/init +++ /dev/null @@ -1,117 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: live-initramfs -# Required-Start: $syslog -# Required-Stop: $syslog -# Should-Start: $local_fs -# Should-Stop: $local_fs -# Default-Start: 1 2 3 4 5 -# Default-Stop: 0 6 -# Short-Description: live-initramfs init script -# Description: Resyncs snapshots, evantually caches files in order to -# let remove the media. -### END INIT INFO - -# Authors: Tollef Fog Heen -# Marco Amadori - -PATH=/usr/sbin:/usr/bin:/sbin:/bin -NAME=live-initramfs -SCRIPTNAME=/etc/init.d/${NAME} -DO_SNAPSHOT=/sbin/live-snapshot - -# 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/live.conf ] && . /etc/live.conf - -# Load the VERBOSE setting and other rcS variables -[ -f /etc/default/rcS ] && . /etc/default/rcS - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# Try to cache everything we're likely to need after ejecting. This -# is fragile and simple-minded, but our options are limited. -cache_path() { - path="$1" - - if [ -d "$path" ]; then - find "$path" -type f | xargs cat > /dev/null 2>&1 - elif [ -f "$path" ]; then - if [ -x "$path" ]; then - if file "$path" | grep -q 'dynamically linked'; then - for lib in $(ldd "$path" | awk '{ print $3 }'); do - cache_path "$lib" - done - fi - fi - cat "$path" >/dev/null 2>&1 - fi -} - -do_stop () -{ - if [ ! -z "${ROOTSNAP}" ]; then - $DO_SNAPSHOT --resync-string="${ROOTSNAP}" - fi - - if [ ! -z "${HOMESNAP}" ]; then - $DO_SNAPSHOT --resync-string="${HOMESNAP}" - fi - - # check for netboot - if [ ! -z "${NETBOOT}" ] || grep -qs netboot /proc/cmdline || grep -qsi root=/dev/nfs /proc/cmdline || grep -qsi root=/dev/cifs /proc/cmdline ; then - return 0 - fi - - for path in $(which halt) $(which reboot) /etc/rc?.d /etc/default; do - cache_path "$path" - done - - for x in $(cat /proc/cmdline); do - case $x in - quickreboot) - QUICKREBOOT="Yes" - ;; - esac - done - - if [ -z ${QUICKREBOOT} ]; then - if [ -x /usr/bin/eject ] - then - eject -p -m /live/image >/dev/null 2>&1 - fi - - # XXX - i18n - echo "Please remove the disc and close the tray (if any) then press ENTER: " - if [ -x /sbin/usplash_write ]; then - /sbin/usplash_write "TIMEOUT 86400" - /sbin/usplash_write "TEXT-URGENT Please remove the disc, close the tray (if any)" - /sbin/usplash_write "TEXT-URGENT and press ENTER to continue" - fi - - read x < /dev/console - fi -} - -case "$1" in - start|restart|reload|force-reload|status) - [ "$VERBOSE" != no ] && log_end_msg 0 - ;; - stop) - log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..." - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - *) - log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index 752b161..0000000 --- a/debian/postinst +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ -x /usr/sbin/update-initramfs ] -then - update-initramfs -k all -u -fi - -#DEBHELPER# diff --git a/debian/postrm b/debian/postrm deleted file mode 100755 index 752b161..0000000 --- a/debian/postrm +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ -x /usr/sbin/update-initramfs ] -then - update-initramfs -k all -u -fi - -#DEBHELPER# diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 0e8bbc7..0000000 --- a/debian/rules +++ /dev/null @@ -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 - -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 - - # Building package - CFLAGS="$(CFLAGS)" $(MAKE) - - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - - # Cleaning package - $(MAKE) clean - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - # Installing package - $(MAKE) install DESTDIR=$(CURDIR)/debian/live-initramfs - - # Removing double files - rm -f debian/live-initramfs/usr/share/doc/live-initramfs/COPYING - rm -f debian/live-initramfs/usr/share/doc/live-initramfs/ChangeLog - mv debian/live-initramfs/usr/share/doc/live-initramfs/ChangeLog.casper debian/live-initramfs/usr/share/doc/live-initramfs/changelog.casper - -binary-indep: build install - dh_testdir -i - dh_testroot -i - dh_installchangelogs -i docs/ChangeLog - dh_installdocs -i - dh_install -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i - -binary-arch: build install - dh_testdir -a - dh_testroot -a - dh_installchangelogs -a docs/ChangeLog - dh_installdocs -a - dh_install -a - dh_installinit -a --no-restart-on-upgrade --no-start -- start 89 0 6 . - dh_strip -a - dh_compress -a - dh_fixperms -a - dh_installdeb -a - dh_shlibdeps -a - dh_gencontrol -a - dh_md5sums -a - dh_builddeb -a - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/docs/ChangeLog b/docs/ChangeLog index 6f8d95c..933ad53 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,12 @@ +2007-07-18 Daniel Baumann + + * docs/parameters.txt: + - Added values for vga parameter. + * scripts/live: + - Added patch from Thomas Lange to + respect rootserver name from dhcp. + * Uploaded 1.91.5-1. + 2007-07-12 Daniel Baumann * bin/live-snapshot, scripts/live: diff --git a/docs/parameters.txt b/docs/parameters.txt new file mode 100644 index 0000000..2399772 --- /dev/null +++ b/docs/parameters.txt @@ -0,0 +1,67 @@ +Boot Parameters for Debian Live +------------------------------- + +Updated for live-initramfs 1.91.5-1 on 2007-07-23. + +These options (can be combined) work from the syslinux bootprompt: + +live access=ACCESS +live console=TTY,SPEED +live debug +live hostname=HOSTNAME +live username=USER +live userfullname=USERFULLNAME +live integrity-check +live ip=[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF] [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]* +live ip[=frommedia] +live {keyb|kbd-chooser/method}=KEYBOARD +live {klayout|console-setup/layoutcode}=LAYOUT +live {kvariant|console-setup/variantcode}=VARIANT +live {kmodel|console-setup/modelcode}=CODE +live koptions=OPTIONS +live live-getty +live {live-media|bootfrom}=DEVICE +live {live-media-encryption|encryption}=TYPE +live live-media-offset=BYTES +live live-media-timeout=SECONDS +live {locale|debian-installer/locale}=LOCALE +live module=NAME +live netboot[=nfs|cifs] +live nfsopts= +live noautologin +live noxautologin +live nofastboot +live nopersistent +live nosudo +live noswap +live persistent +live {preseed/file|file}=FILE +live package/question=VALUE +live quickreboot +live showmounts +live timezone=TIMEZONE +live todisk=DEVICE +live toram +live union=unionfs|aufs +live xdebconf +live xvideomode=RESOLUTION + +Values for the vga kernel parameter: + +Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200 +--------+-------------------------------------------------------------- + 4 bits | ? ? 0x302 ? ? ? ? + 8 bits | 0x300 0x301 0x303 0x305 0x161 0x307 0x31C +15 bits | ? 0x310 0x313 0x316 0x162 0x319 0x31D +16 bits | ? 0x311 0x314 0x317 0x163 0x31A 0x31E +24 bits | ? 0x312 0x315 0x318 ? 0x31B 0x31F +32 bits | ? ? ? ? 0x164 ? + +Colours 640x400 640x480 800x600 1024x768 1152x864 1280x1024 1600x1200 +--------+-------------------------------------------------------------- + 4 bits | ? ? 770 ? ? ? ? + 8 bits | 768 769 771 773 353 775 796 +15 bits | ? 784 787 790 354 793 797 +16 bits | ? 758 788 791 355 794 798 +24 bits | ? 786 789 792 ? 795 799 +32 bits | ? ? ? ? 356 ? diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7 index b44467e..ddcaccb 100644 --- a/manpages/live-initramfs.en.7 +++ b/manpages/live-initramfs.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-INITRAMFS 7 "2007\-07\-09" "1.91.4" "live\-initramfs" +.TH LIVE\-INITRAMFS 7 "2007\-07\-16" "1.91.5" "live\-initramfs" .SH NAME live\-initramfs \- Debian Live initramfs hook diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1 index 05c1221..f4d7078 100644 --- a/manpages/live-snapshot.en.1 +++ b/manpages/live-snapshot.en.1 @@ -1,4 +1,4 @@ -.TH LIVE\-SNAPSHOT 1 "2007\-07\-09" "1.91.4" "live\-initramfs" +.TH LIVE\-SNAPSHOT 1 "2007\-07\-16" "1.91.5" "live\-initramfs" .SH NAME live\-snapshot \- a simple script to ease persistence usage diff --git a/manpages/live-snapshot.it.1 b/manpages/live-snapshot.it.1 index 80fd34b..8866a40 100644 --- a/manpages/live-snapshot.it.1 +++ b/manpages/live-snapshot.it.1 @@ -59,7 +59,7 @@ da informazioni sulla versione ed esce Questo programma fa parte di live\-initramfs. .SH BUGS -Riportate i bug sul pacchetto live\-initramfs <\fIhttp://packages.qa.debian.org/live\-initramfs/\fR>. +Riportate i bug sul pacchetto live\-initramfs <\fIhttp://packages.qa.debian.org/live\-initramfs\fR>. .SH HOMEPAGE Ulteriori informazioni su progetto Debian Live possono essere trovate su <\fIhttp://debian\-live.alioth.debian.org/\fR> e <\fIhttp://wiki.debian.org/DebianLive/\fR>. @@ -67,4 +67,4 @@ Ulteriori informazioni su progetto Debian Live possono essere trovate su <\fIhtt .SH AUTHORS live\-initramfs \[`e] mantenuto da Daniel Baumann <\fIdaniel@debian.org\fR> e Marco Amadori <\fImarco.amadori@gmail.com\fR> per il progetto Debian. .PP -live\-initramfs \[`e] un fork di casper <\fIhttp://packages.ubuntu.com/casper/\fR>. casper \[`e] stato scritto originariamente da Tollef Fog Heen <\fItfheen@canonical.com\fR> e Matt Zimmerman <\fImdz@canonical.com\fR>. +live\-initramfs \[`e] un fork di casper <\fIhttp://packages.ubuntu.com/casper\fR>. casper \[`e] stato scritto originariamente da Tollef Fog Heen <\fItfheen@canonical.com\fR> e Matt Zimmerman <\fImdz@canonical.com\fR>. diff --git a/scripts/live b/scripts/live index 35ba702..5b70b6a 100755 --- a/scripts/live +++ b/scripts/live @@ -397,6 +397,14 @@ do_netmount() { NFSROOT=${ROOTSERVER}:${ROOTPATH} fi + # source relevant ipconfig output + . /tmp/net-${DEVICE}.conf + export HOSTNAME + + if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then + NFSROOT=${ROOTSERVER}:${NFSROOT} + fi + [ "$quiet" != "y" ] && log_begin_msg "Trying netboot from ${NFSROOT}" if [ "${NETBOOT}" != "nfs" ] && do_cifsmount ; then -- 2.1.4