diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/dirs | 4 | ||||
| -rw-r--r-- | debian/examples | 1 | ||||
| -rw-r--r-- | debian/init | 57 | ||||
| -rw-r--r-- | debian/install | 7 | ||||
| -rw-r--r-- | debian/links | 2 | ||||
| -rw-r--r-- | debian/manpages | 1 | ||||
| -rwxr-xr-x | debian/rules | 32 |
9 files changed, 63 insertions, 65 deletions
diff --git a/debian/changelog b/debian/changelog index 1125793..55305fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +live-initramfs (1.87.3-1) unstable; urgency=medium + + * New upstream release. + + -- Daniel Baumann <daniel@debian.org> Mon, 14 May 2007 00:00:00 +0200 + live-initramfs (1.87.2-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 4ddaa45..00b4e24 100644 --- a/debian/control +++ b/debian/control @@ -6,16 +6,24 @@ Uploaders: Daniel Baumann <daniel@debian.org> 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}, dmsetup, eject, file, initramfs-tools, sudo, user-setup +Depends: ${shlibs:Depends}, ${misc:Depends}, eject, file, initramfs-tools, sudo, user-setup +Suggests: genext2fs, squashfs-tools Conflicts: casper, usplash (<< 0.4-43) Replaces: casper -Description: Debian Live (alternative) initramfs generator - live-initramfs provides an initramfs generator suited for booting Debian Live - systems from read-only media. +Description: Debian Live initramfs generator + 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. . Homepage: <http://debian-live.alioth.debian.org/> . - live-initramfs is a fork of casper. + live-initramfs is a fork of casper <http://packages.ubuntu.com/casper/>. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index f929f0c..0000000 --- a/debian/dirs +++ /dev/null @@ -1,4 +0,0 @@ -/etc -/usr/lib/live-initramfs -/usr/share/initramfs-tools/hooks -/usr/share/initramfs-tools/scripts diff --git a/debian/examples b/debian/examples deleted file mode 100644 index 63403a0..0000000 --- a/debian/examples +++ /dev/null @@ -1 +0,0 @@ -conf/live.conf diff --git a/debian/init b/debian/init index 7c0dbe9..a7274bd 100644 --- a/debian/init +++ b/debian/init @@ -1,20 +1,21 @@ -#! /bin/sh +#!/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: Casper init script -# Description: Resyncs snapshots, evantually caches files in order -# to let remove the media. +# 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 -# Author: Tollef Fog Heen <tfheen@canonical.com> -# Marco Amadori <marco.amadori@gmail.com> -# +# Authors: Tollef Fog Heen <tfheen@canonical.com> +# Marco Amadori <marco.amadori@gmail.com> + PATH=/usr/sbin:/usr/bin:/sbin:/bin NAME=live-initramfs SCRIPTNAME=/etc/init.d/${NAME} @@ -71,17 +72,27 @@ do_stop () cache_path "$path" done - eject -p -m /cdrom >/dev/null 2>&1 + for x in $(cat /proc/cmdline); do + case $x in + quickreboot) + QUICKREBOOT="Yes" + ;; + esac + done + + if [ -z ${QUICKREBOOT} ]; then + eject -p -m /live_media >/dev/null 2>&1 - # 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 + # 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 + read x < /dev/console + fi } case "$1" in diff --git a/debian/install b/debian/install deleted file mode 100644 index fb597d4..0000000 --- a/debian/install +++ /dev/null @@ -1,7 +0,0 @@ -bin/live-getty sbin -bin/live-login sbin -bin/live-preseed usr/share/live-initramfs -bin/live-reconfigure usr/share/live-initramfs -bin/live-snapshot sbin -hooks usr/share/initramfs-tools -scripts usr/share/initramfs-tools diff --git a/debian/links b/debian/links deleted file mode 100644 index fa3fb68..0000000 --- a/debian/links +++ /dev/null @@ -1,2 +0,0 @@ -/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 diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index 96c4bf7..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -manpages/* diff --git a/debian/rules b/debian/rules index 79117a9..b827a8f 100755 --- a/debian/rules +++ b/debian/rules @@ -11,9 +11,6 @@ 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 @@ -23,17 +20,8 @@ build: build-stamp build-stamp: dh_testdir - # Checking scripts - for SCRIPT in scripts/live 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 bin/live-md5check + CFLAGS="$(CFLAGS)" $(MAKE) touch build-stamp @@ -43,8 +31,7 @@ clean: rm -f build-stamp # Cleaning package - $(MAKE) -C bin/live-md5check clean - rm -f live.conf + $(MAKE) clean dh_clean @@ -55,21 +42,22 @@ install: build dh_installdirs # Installing package - install -m 0755 bin/live-md5check/live-md5check debian/live-initramfs/usr/lib/live-initramfs - install -m 0644 live.conf debian/live-initramfs/etc/live.conf + $(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 binary-arch: build install dh_testdir dh_testroot - dh_installchangelogs doc/ChangeLog - dh_installdocs doc/ChangeLog.casper - dh_installexamples + dh_installchangelogs docs/ChangeLog + dh_installdocs dh_install dh_installinit --no-restart-on-upgrade --no-start -- start 89 0 6 . - dh_installman - dh_link dh_strip dh_compress dh_fixperms |