From 0d94f4b451321b54cd8f22253c28a5bc64715f1c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 23 Sep 2007 14:46:38 +0200 Subject: [PATCH] Adding live-initramfs 1.87.6-1. --- Makefile | 10 ++++---- debian/changelog | 6 +++++ debian/control | 4 ++++ debian/rules | 39 ++++++++++++++++++++----------- docs/ChangeLog | 9 +++++++ manpages/live-initramfs.en.7 | 14 +++++++---- manpages/live-snapshot.en.1 | 2 +- scripts/live-bottom/42apt_upgrade | 49 --------------------------------------- 8 files changed, 59 insertions(+), 74 deletions(-) delete mode 100755 scripts/live-bottom/42apt_upgrade diff --git a/Makefile b/Makefile index eb6910e..6f0c333 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ all: build test: set -e; for SCRIPT in hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \ do \ - sh -n $$SCRIPT || exit 1; \ + sh -n $$SCRIPT; \ done build: @@ -76,11 +76,11 @@ uninstall: rm -f $(DESTDIR)/etc/live.conf # Uninstalling live-md5check - rm -f $(DESTDIR)/usr/lib/live-initramfs + rm -rf $(DESTDIR)/usr/lib/live-initramfs # Uninstalling executables rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot - rm -f $(DESTDIR)/usr/share/live-initramfs + rm -rf $(DESTDIR)/usr/share/live-initramfs rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live* @@ -117,8 +117,8 @@ uninstall: update: set -e; for MANPAGE in manpages/*.en.*; \ do \ - sed -i -e 's/2007\\-05\\-21/2007\\-05\\-28/' \ - -e 's/1.87.4/1.87.5/' \ + sed -i -e 's/2007\\-06\\-04/2007\\-06\\-11/' \ + -e 's/1.87.6/1.87.7/' \ $$MANPAGE; \ done diff --git a/debian/changelog b/debian/changelog index a3b3592..52a4957 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +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. diff --git a/debian/control b/debian/control index 5511d40..46c92b8 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,7 @@ XS-VCS-Browse: http://svn.debian.org/wsvn/debian-live/dists/trunk/live-initramfs Package: live-initramfs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, eject, file, initramfs-tools, sudo, user-setup +Recommends: live-sysvinit Suggests: genext2fs, squashfs-tools Conflicts: casper (<< 1.87) Replaces: casper @@ -24,6 +25,9 @@ Description: Debian Live initramfs hook 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/rules b/debian/rules index cde5630..0e8bbc7 100755 --- a/debian/rules +++ b/debian/rules @@ -50,22 +50,33 @@ install: build 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 - dh_testroot - dh_installchangelogs docs/ChangeLog - dh_installdocs - dh_install - dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 . - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + 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 53f568f..0009d9f 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,12 @@ +2007-06-04 Daniel Baumann + + * Uploaded 1.87.6-1. + +2007-05-28 Daniel Baumann + + * scripts/live-bottom/42apt_upgrade: + - Moved to dedicated live-sysvinit package. + 2007-05-24 Daniel Baumann * debian/control: diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7 index 8017eca..c65bf09 100644 --- a/manpages/live-initramfs.en.7 +++ b/manpages/live-initramfs.en.7 @@ -1,4 +1,4 @@ -.TH LIVE\-INITRAMFS 7 "2007\-05\-28" "1.87.5" "live\-initramfs" +.TH LIVE\-INITRAMFS 7 "2007\-06\-04" "1.87.6" "live\-initramfs" .SH NAME live\-initramfs \- Debian Live initramfs hook @@ -12,6 +12,8 @@ live\-initramfs is a hook for the initramfs\-tools, used to generate a initramfs .PP 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. .PP +You probably do not want to install this package onto a non-live system, although it will do no harm. +.PP live\-initramfs is a fork of casper <\fIhttp://packages.ubuntu.com/casper/\fR>. casper was originally written by Tollef Fog Heen <\fItfheen@canonical.com\fR> and Matt Zimmerman <\fImdz@canonical.com\fR>. .SH BOOT OPTIONS @@ -40,7 +42,7 @@ live\-initramfs will mount the encrypted rootfs TYPE, asking the passphrase, use This way you could tell live\-initramfs that your image starts at offset BYTES in the above specified or autodiscovered device, this could be useful to hide the Debian Live iso or image inside another iso or image, to create "clean" images. .IP "\fBlive\-media\-timeout=\fR\fISECONDS\fR" 4 Set the timeout in seconds for the device specified by "live\-media=" to become ready before giving up. -.IP "\fBlocale=\fR\fILOCALE\fR | \fBdebian\-installer/locale=\fR\fILOCALE\fR" 4 +.IP "\fB{locale|debian\-installer/locale}=\fR\fILOCALE\fR" 4 Configure the running locale as specified, if not present the live\-media rootfs configured locale will be used and if also this one misses live\-initramfs behave as "locale=en_US.UTF\-8" was specified. If only 2 lowercase letter are specified (like "it"), the "maybe wanted" locale is generated (like ien:EN.UTF\-8), in this case if also "keyb=" is unspecified is set with those 2 lowercase letters (keyb=us). Beside that facility, only UTF8 locales are supported by live\-initramfs. .IP "\fBmodule=\fR\fINAME\fR" 4 Instead of using the default optional file "order.lst" (see below) another file could be specified without the extension ".lst"; it should be placed on "/live" directory of the live medium. @@ -70,8 +72,6 @@ Adding this parameter, live\-initramfs will try to copy the whole read\-only med A path to a file present on the rootfs could be used to preseed debconf database. .IP "\fBpackage/question=\fR\fIVALUE\fR" 4 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. -.IP "\fBupgrade\fR" 4 -performes a apt-get update/apt-get upgrace cycle while booting (experimental). .IP "\fBxdebconf\fR" 4 uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental). .IP "\fBxvideomode=\fR\fIRESOLUTION\fR" 4 @@ -87,9 +87,13 @@ This optional file (inside the live media) contains a list of white\-space or ca .SH SEE ALSO \fIlive\-snapshot\fR(1) .PP +\fIinitramfs\-tools\fR(8) +.PP \fIlive\-helper\fR(7) .PP -\fIinitramfs\-tools\fR(8) +\fIlive\-sysvinit\fR(7) +.PP +\fIlive\-webhelper\fR(7) .SH BUGS Report bugs against live\-initramfs <\fIhttp://packages.qa.debian.org/live\-initramfs/\fR>. diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1 index 5f24d97..7b82da9 100644 --- a/manpages/live-snapshot.en.1 +++ b/manpages/live-snapshot.en.1 @@ -1,4 +1,4 @@ -.TH LIVE\-SNAPSHOT 1 "2007\-05\-28" "1.87.5" "live\-initramfs" +.TH LIVE\-SNAPSHOT 1 "2007\-06\-04" "1.87.6" "live\-initramfs" .SH NAME live\-snapshot \- a simple script to ease persistence usage diff --git a/scripts/live-bottom/42apt_upgrade b/scripts/live-bottom/42apt_upgrade deleted file mode 100755 index 96ec814..0000000 --- a/scripts/live-bottom/42apt_upgrade +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-initramfs header - -if [ -z "${UPGRADE}" ] -then - exit 0 -fi - -. /scripts/live-functions - -log_begin_msg "Enabling apt upgrade..." - -# live-initramfs script - -cat > /root/etc/init.d/apt-upgrade << EOF -#!/bin/sh - -NOTTY="-q -y -o DPkg::Options::=--force-confdef" -UPGRADEOPTS="dist-upgrade" -DEBIAN_FRONTEND="noninteractive" -export DEBIAN_FRONTEND - -apt-get -q=2 update && apt-get \${NOTTY} -u \${UPGRADEOPTS} -EOF - -chmod 0755 /root/etc/init.d/apt-upgrade - -chroot /root update-rc.d apt-upgrade defaults 99 - -log_end_msg -- 2.1.4