Bug#685752: unblock: live-tools/3.0.9-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package live-tools
Primarily to fix diversion conflicts. Also includes doc updates and
other fixes needed for the release.
unblock live-tools/3.0.9-1
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (800, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru live-tools-3.0.3/bin/live-system live-tools-3.0.9/bin/live-system
--- live-tools-3.0.3/bin/live-system 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/bin/live-system 2012-08-14 07:43:40.000000000 -0300
@@ -0,0 +1,71 @@
+#!/bin/sh
+
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## 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 3 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, see <http://www.gnu.org/licenses/>.
+##
+## The complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
+
+
+# Redirect stdout to stderr
+exec 1>&2
+
+case "${1}" in
+ -h|--help|-u|--usage)
+ echo "live-system - determine if running system is a debian-live based system"
+ echo
+ echo "Usage: ${0} [-v|--verbose]"
+
+ exit 2
+ ;;
+
+ -v|--verbose)
+ _VERBOSE="true"
+ ;;
+esac
+
+[ "${_VERBOSE}" ] && echo -n "Checking for debian-live based system..."
+
+if [ ! -e /proc/cmdline ]
+then
+ [ "${_VERBOSE}" ] && echo
+ echo "E: /proc/cmdline - No such file."
+
+ exit 2
+fi
+
+if grep -qs "boot=live" /proc/cmdline
+then
+ [ "${_VERBOSE}" ] && echo -n " yes, this is a debian-live based system"
+
+ if [ -d /live/image/install ]
+ then
+ if ls /live/image/install/pool/main/l/live-installer/live-installer_*.udeb > /dev/null 2>&1
+ then
+ [ "${_VERBOSE}" ] && echo " with debian-installer (live) support."
+ else
+ [ "${_VERBOSE}" ] && echo " with debian-installer (normal) support."
+ fi
+ else
+ [ "${_VERBOSE}" ] && echo "without debian-installer support."
+ fi
+
+ exit 0
+else
+ [ "${_VERBOSE}" ] && echo " no, this is not a debian-live based system."
+
+ exit 1
+fi
diff -Nru live-tools-3.0.3/bin/live-toram live-tools-3.0.9/bin/live-toram
--- live-tools-3.0.3/bin/live-toram 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/bin/live-toram 2012-08-14 07:43:40.000000000 -0300
@@ -0,0 +1,128 @@
+#!/bin/sh
+
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+# Read cmdline
+for _PARAMETER in $(cat /proc/cmdline)
+do
+ case "${_PARAMETER}" in
+ module=*)
+ _MODULE="${_PARAMETER#module=}"
+ ;;
+ esac
+done
+
+# Assemble filesystems
+if [ -z "${_MODULE}" ]
+then
+ _FILESYSTEMS="/live/image/live/filesystem.squashfs"
+else
+ for _FILESYSTEM in _MODULE
+ do
+ _FILESYSTEMS="${_FILESYSTEMS} /live/image/live/${_FILESYSTEM}"
+ done
+fi
+
+# Exit if system is not debian-live based system
+if [ ! -d /live/image ]
+then
+ echo "E: live-toram only works on Debian Live based systems."
+
+ exit 1
+fi
+
+# Exit if filesystem not accessible
+for _FILESYSTEM in ${_FILESYSTEMS}
+do
+ if [ ! -r ${_FILESYSTEM} ]
+ then
+ echo "E: ${_FILESYSTEM}: No such file"
+ echo "I: live-toram already run?"
+
+ exit 1
+ fi
+done
+
+# Exit if user is unprivileged
+if [ "$(id -u)" -ne 0 ]
+then
+ echo "E: need root privileges"
+
+ exit 1
+fi
+
+# Exit if not enough free memory
+_SIZE=0
+
+for _FILESYSTEM in ${_FILESYSTEMS}
+do
+ _SIZE="$((${_SIZE} + $(du ${_FILESYSTEM} | awk '{ print $1 }')))"
+ _MEMORY="$(awk '/MemFree/ { print $2 }' /proc/meminfo)"
+done
+
+case ${@} in
+ -f|--force)
+ echo "I: Ignoring memory constrains as requested"
+ ;;
+
+ *)
+ if [ $_MEMORY -lt $_SIZE ]
+ then
+ echo "E: not enough free memory available."
+ echo "I: images need ${_SIZE}kB, free memory is ${_MEMORY}kB."
+
+ exit 1
+ fi
+ ;;
+esac
+
+# Copying image to memory
+echo "P: Copying images to memory."
+echo "I: This may take a while..."
+
+# FIXME: doesn't work with multiple filesystems
+for _FILESYSTEM in ${_FILESYSTEMS}
+do
+ if [ ! -x "$(which rsync 2> /dev/null)" ]
+ then
+ rsync -a --progress ${_FILESYSTEM} /tmp/live
+ else
+ cp -av ${_FILESYSTEM} /tmp/live
+ fi
+
+LANGUAGE=C LANG=C LC_ALL=C perl << EOF
+open LOOP, '</dev/loop0' or die $!;
+open DEST, '</tmp/live' or die $!;
+ioctl(LOOP, 0x4C06, fileno(DEST)) or die $!
+close LOOP;
+close DEST;
+EOF
+
+done
+
+# Unmounting live media
+_DEVICE="$(awk '/\/live\/image / { print $1 }' /proc/mounts)"
+
+if [ -d /live/image ]
+then
+ umount /live/image
+ rmdir --ignore-fail-on-non-empty /live/image || true
+fi
+
+# Ejecting live media if it is not an optical device
+if [ "$(expr substr ${_DEVICE} 1 2)" != "sd" ] && \
+ ! readlink /sys/block/$(expr substr ${_DEVICE} 6 3) | grep -q usb
+then
+ if [ ! -x "$(which eject 2> /dev/null)" ]
+ then
+ eject -p -m ${_DEVICE} > /dev/null 2>&1
+ fi
+fi
diff -Nru live-tools-3.0.3/bin/live-update-initramfs live-tools-3.0.9/bin/live-update-initramfs
--- live-tools-3.0.3/bin/live-update-initramfs 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/bin/live-update-initramfs 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+if [ ! -e /usr/sbin/update-initramfs.orig.initramfs-tools ]
+then
+ echo "E: /usr/sbin/update-initramfs.orig.initramfs-tools - command not found"
+ echo "E: On Debian based systems, update-initramfs from initramfs-tools"
+ echo "E: can be installed with:"
+ echo "E: apt-get install initramfs-tools"
+
+ exit 1
+fi
+
+if grep -qs "boot=live" /proc/cmdline
+then
+ if grep -qs "\/live\/image" /proc/mounts
+ then
+ # live system with live media mounted as /live/image
+ _DEVICE="$(awk '/\/live\/image/ { print $1 }' /proc/mounts)"
+
+ mount -o remount,rw ${_DEVICE} > /dev/null 2>&1 || true
+
+ if touch /live/image/.test > /dev/null 2>&1
+ then
+ _READ_WRITE="true"
+
+ rm -f /live/image/.test
+ else
+ _READ_WRITE="false"
+ fi
+ else
+ # live system without live media mounted as /live/image
+ echo "I: update-initramfs is disabled (live system is running without media mounted on /live/image)."
+
+ exit 0
+ fi
+else
+ # non-live system
+ /usr/sbin/update-initramfs.orig.initramfs-tools "${@}"
+
+ exit "${?}"
+fi
+
+case "${_READ_WRITE}" in
+ true)
+ # Updating initramfs
+ /usr/sbin/update-initramfs.orig.initramfs-tools "${@}"
+
+ # FIXME: needs to exclude initrd backup files
+ if [ "$(ls initrd.img-* | wc -l)" -gt 1 ]
+ then
+ _NUMBER="1"
+
+ for _INITRD in /boot/initrd.img-*
+ do
+ _VERSION="$(echo ${_INITRD} | sed -e 's|initrd.img-||')"
+
+ cp /boot/vmlinuz-${_VERSION} /live/image/live/vmlinuz${_NUMBER}.new
+ cp /boot/initrd.img-${_VERSION} /live/image/live/initrd${_NUMBER}.img.new
+
+ mv /live/image/live/vmlinuz${_NUMBER}.new /live/image/live/vmlinuz${_NUMBER}
+ mv /live/image/live/initrd${_NUMBER}.img.new /live/image/live/initrd${_NUMBER}.img
+
+ _NUMBER="$((${_NUMBER} + 1))"
+ done
+ else
+ cp /boot/vmlinuz-* /live/image/live/vmlinuz.new
+ cp /boot/initrd.img-* /live/image/live/initrd.img.new
+
+ mv /live/image/live/vmlinuz.new /live/image/live/vmlinuz
+ mv /live/image/live/initrd.img.new /live/image/live/initrd.img
+ fi
+ ;;
+
+ false)
+ echo "I: update-initramfs is disabled (live system is running on read-only media)."
+ exit 0
+ ;;
+esac
diff -Nru live-tools-3.0.3/bin/live-uptime live-tools-3.0.9/bin/live-uptime
--- live-tools-3.0.3/bin/live-uptime 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/bin/live-uptime 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+set -e
+
+if [ ! -e /usr/bin/uptime.orig.procps ]
+then
+ echo "E: /usr/bin/uptime.orig.procps - command not found"
+ echo "E: On Debian based systems, uptime from procps"
+ echo "E: can be installed with:"
+ echo "E: apt-get install procps"
+
+ exit 1
+fi
+
+_UPTIME="$(/usr/bin/uptime.orig.procps)"
+
+_DATE_HOST="$(date +%s)"
+
+_DATE_LXC="$(stat /dev/pts | awk '/^Change: / { print $2, $3 }')"
+_DATE_LXC="$(date +%s -d"${_DATE_LXC}")"
+
+_UPTIME_LXC="$((${_DATE_HOST} - ${_DATE_LXC}))"
+
+if [ "${_UPTIME_LXC}" -gt 172800 ]
+then
+ # LXC uptime >= 2 days
+ _DAYS="$((${_UPTIME_LXC} / 86400))"
+
+ _UPTIME="$(echo ${_UPTIME} | sed -e "s|up .* days,|up ${_DAYS} days,|")"
+else
+ # LXC uptime < 2 days
+ _HOURS="$((${_UPTIME_LXC} / 3600))"
+ _MINUTES="$((${_UPTIME_LXC} - ${_HOURS}))"
+ _MINUTES="$((${_MINUTES} / 60))"
+
+ _UPTIME="$(echo ${_UPTIME} | sed -e "s|up .*, |up ${_HOURS}:${_MINUTES}, |")"
+fi
+
+echo " ${_UPTIME}"
diff -Nru live-tools-3.0.3/debian/changelog live-tools-3.0.9/debian/changelog
--- live-tools-3.0.3/debian/changelog 2012-07-05 12:08:19.000000000 -0300
+++ live-tools-3.0.9/debian/changelog 2012-08-16 07:11:51.000000000 -0300
@@ -1,3 +1,75 @@
+live-tools (3.0.9-1) unstable; urgency=low
+
+ * Also correcting uptime symlink to refer to live-uptime /bin instead
+ of /usr/bin.
+ * Adding warning messages if the necessary tools are not installed.
+ * Dropping old conflicts against linux-container, not needed anymore.
+ * Renaming divertion of uptime from procps to
+ /usr/bin/uptime.orig.procps to workaround the nasty auto-alternative
+ in procps.
+ * Renaming divertion for update-initramfs too in order to be
+ consistent with the uptime divertion, eventhouhg it is not required
+ for the the update-initramfs divertion.
+ * Dropping pre-depends on initramfs-tools and procps, they are not
+ required anymore as the conditional alternatives usage on procps has
+ been workarounded.
+
+ -- Daniel Baumann <daniel@debian.org> Thu, 16 Aug 2012 12:08:24 +0200
+
+live-tools (3.0.8-1) unstable; urgency=low
+
+ * Moving symlink from /usr/bin to /bin where live-update-initramfs
+ actually resides now (Closes: #684423).
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 10 Aug 2012 22:27:08 +0200
+
+live-tools (3.0.7-1) unstable; urgency=low
+
+ * Handling non-live usages of live-update-initramfs by falling back to
+ update-initramfs.
+ * Return in cases of non-live systems with return value from update-
+ initramfs.
+ * Covering cases of live systems where live media is not mounted on
+ /live/image in live-update-initramfs.
+
+ -- Daniel Baumann <daniel@debian.org> Sun, 05 Aug 2012 13:19:15 +0200
+
+live-tools (3.0.6-1) unstable; urgency=low
+
+ * Adding pre-depends to procps and initramfs-tools (Closes: #682574).
+
+ -- Daniel Baumann <daniel@debian.org> Sat, 04 Aug 2012 15:46:46 +0200
+
+live-tools (3.0.5-1) unstable; urgency=low
+
+ [ Daniel Baumann ]
+ * Adding live-update-initramfs script.
+
+ [ chals ]
+ * Adding initial Spanish translation of the man page.
+ * Adding initial French translation of the man page.
+ * Adding initial Catalan translation of the man page.
+ * Fixing several typos in the French translation of the man page.
+
+ [ Daniel Baumann ]
+ * Removing references to jessie-only live-debconfig in manpages.
+
+ -- Daniel Baumann <daniel@debian.org> Fri, 03 Aug 2012 12:37:28 +0200
+
+live-tools (3.0.4-1) unstable; urgency=low
+
+ * Using common source tree layout for all live packages.
+ * Completing uninstall target in toplevel Makefile.
+ * Unifying copyright headers to use same GPL blurbs.
+ * Adding reference to live-debconfig in live-config manpage.
+ * Using dynamic year in automatic manpage date translation rather than
+ a hardcoded one.
+ * Moving executables from /usr/bin to /bin as they potentially need to
+ be arround before /usr is available.
+ * Also diverting uptime manpage from procps (Closes: #682574).
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 24 Jul 2012 21:43:48 +0200
+
live-tools (3.0.3-1) unstable; urgency=low
[ Evgeni Golov ]
diff -Nru live-tools-3.0.3/debian/control live-tools-3.0.9/debian/control
--- live-tools-3.0.3/debian/control 2012-07-05 12:08:19.000000000 -0300
+++ live-tools-3.0.9/debian/control 2012-08-16 07:11:51.000000000 -0300
@@ -12,7 +12,6 @@
Package: live-tools
Architecture: all
Depends: ${misc:Depends}
-Conflicts: linux-container (<< 2)
Suggests: debian-installer-launcher, perl, rsync
Description: Debian Live - System Support Scripts
live-tools contains additional support scripts for Debian Live systems.
diff -Nru live-tools-3.0.3/debian/live-tools.links live-tools-3.0.9/debian/live-tools.links
--- live-tools-3.0.3/debian/live-tools.links 2012-07-05 12:08:19.000000000 -0300
+++ live-tools-3.0.9/debian/live-tools.links 2012-08-16 07:11:51.000000000 -0300
@@ -6,4 +6,10 @@
/usr/share/man/de/man7/live-tools.7.gz /usr/share/man/de/man1/live-toram.1.gz
/usr/share/man/de/man7/live-tools.7.gz /usr/share/man/de/man1/live-uptime.1.gz
-/usr/bin/live-uptime /usr/bin/uptime
+# initramfs-tools: update-initramfs
+/bin/live-update-initramfs /usr/sbin/update-initramfs
+/usr/share/man/man7/live-tools.7.gz /usr/share/man/man8/update-initramfs.8.gz
+
+# procps: uptime
+/bin/live-uptime /usr/bin/uptime
+/usr/share/man/man7/live-tools.7.gz /usr/share/man/man1/uptime.1.gz
diff -Nru live-tools-3.0.3/debian/live-tools.postrm live-tools-3.0.9/debian/live-tools.postrm
--- live-tools-3.0.3/debian/live-tools.postrm 2012-07-05 12:08:19.000000000 -0300
+++ live-tools-3.0.9/debian/live-tools.postrm 2012-08-16 07:11:51.000000000 -0300
@@ -4,7 +4,13 @@
case "${1}" in
remove)
- dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.procps /usr/bin/uptime
+ # initramfs-tools: update-initramfs
+ dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/sbin/update-initramfs.orig.initramfs-tools /usr/sbin/update-initramfs
+ dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man8/update-initramfs.orig.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
+
+ # procps: uptime
+ dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/bin/uptime.orig.procps /usr/bin/uptime
+ dpkg-divert --package live-tools --quiet --remove --rename --divert /usr/share/man/man1/uptime.orig.procps.1.gz /usr/share/man/man1/uptime.1.gz
;;
purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff -Nru live-tools-3.0.3/debian/live-tools.preinst live-tools-3.0.9/debian/live-tools.preinst
--- live-tools-3.0.3/debian/live-tools.preinst 2012-07-05 12:08:19.000000000 -0300
+++ live-tools-3.0.9/debian/live-tools.preinst 2012-08-16 07:11:51.000000000 -0300
@@ -4,7 +4,13 @@
case "${1}" in
install|upgrade)
- dpkg-divert --package live-tools --quiet --add --rename --divert /usr/bin/uptime.procps /usr/bin/uptime
+ # initramfs-tools: update-initramfs
+ dpkg-divert --package live-tools --quiet --add --rename --divert /usr/sbin/update-initramfs.orig.initramfs-tools /usr/sbin/update-initramfs
+ dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man8/update-initramfs.orig.initramfs-tools.8.gz /usr/share/man/man8/update-initramfs.8.gz
+
+ # procps: uptime
+ dpkg-divert --package live-tools --quiet --add --rename --divert /usr/bin/uptime.orig.procps /usr/bin/uptime
+ dpkg-divert --package live-tools --quiet --add --rename --divert /usr/share/man/man1/uptime.orig.procps.1.gz /usr/share/man/man1/uptime.1.gz
;;
abort-upgrade)
diff -Nru live-tools-3.0.3/Makefile live-tools-3.0.9/Makefile
--- live-tools-3.0.3/Makefile 2012-06-28 15:17:50.000000000 -0300
+++ live-tools-3.0.9/Makefile 2012-08-14 07:43:40.000000000 -0300
@@ -3,7 +3,7 @@
## live-tools(7) - System Support Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
##
-## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -12,7 +12,7 @@
LANGUAGES = $(shell cd manpages/po && ls)
-SCRIPTS = scripts/*
+SCRIPTS = bin/*
all: build
@@ -49,8 +49,8 @@
install:
# Installing scripts
- mkdir -p $(DESTDIR)/usr
- cp -r scripts $(DESTDIR)/usr/bin
+ mkdir -p $(DESTDIR)/bin
+ cp -r bin/* $(DESTDIR)/bin
# Installing docs
mkdir -p $(DESTDIR)/usr/share/doc/live-tools
@@ -74,23 +74,32 @@
uninstall:
# Uninstalling scripts
- for SCRIPT in scripts/*; \
+ for SCRIPT in bin/*; \
do \
- rm -f $(DESTDIR)/usr/$$(basename $${SCRIPT}); \
+ rm -f $(DESTDIR)/bin/$$(basename $${SCRIPT}); \
done
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/bin > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true
# Uninstalling docs
rm -rf $(DESTDIR)/usr/share/doc/live-tools
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true
+
# Uninstalling manpages
for MANPAGE in manpages/en/*; \
do \
SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE} .en.$${SECTION}).$${SECTION}; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true; \
done
for LANGUAGE in $(LANGUAGES); \
@@ -99,11 +108,17 @@
do \
SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
rm -f $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/$${LANGUAGE} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true; \
done; \
done
clean:
-distclean:
+distclean: clean
reinstall: uninstall install
diff -Nru live-tools-3.0.3/manpages/bin/update-version.sh live-tools-3.0.9/manpages/bin/update-version.sh
--- live-tools-3.0.3/manpages/bin/update-version.sh 2012-06-28 15:17:50.000000000 -0300
+++ live-tools-3.0.9/manpages/bin/update-version.sh 2012-08-14 07:43:40.000000000 -0300
@@ -3,7 +3,7 @@
## live-tools(7) - System Support Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
##
-## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
@@ -35,7 +35,7 @@
then
for _FILE in po/${_LANGUAGE}/*.po
do
- sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+ sed -i -e "s|^msgstr .*.${YEAR}\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
done
fi
done
@@ -45,6 +45,6 @@
then
for _FILE in po/pt_BR/*.po
do
- sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+ sed -i -e "s|^msgstr .*-${YEAR}\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
done
fi
diff -Nru live-tools-3.0.3/manpages/ca/live-tools.ca.7 live-tools-3.0.9/manpages/ca/live-tools.ca.7
--- live-tools-3.0.3/manpages/ca/live-tools.ca.7 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/manpages/ca/live-tools.ca.7 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,55 @@
+.\" live-tools(7) - System Support Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.9\-1 "Debian Live Project"
+
+.SH NOM
+\fBlive\-tools\fP \- Scripts de Suport del Sistema
+
+.SH DESCRIPCIÓ
+\fBlive\-tools\fP conté scripts addicionals de suport per als sistemes Debian
+Live.
+
+.SH EINES
+\fBlive\-tools\fP actualment conté les següents eines.
+
+.IP \fBlive\-update\-initramfs\fP 4
+escriu imatges initramfs actualitzades als medis.
+.IP \fBlive\-toram\fP 4
+copia el sistema en execució a la memòria RAM per tal d'expulsar els medis.
+.IP \fBlive\-system\fP 4
+determina si el sistema que s'està executant és un sistema basat en
+debian\-live.
+.IP \fBlive\-uptime\fP 4
+diu quant de temps el sistema ha estat funcionant (funciona amb LXC).
+
+.SH "VEURE TAMBÉ"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+
+.SH "PÀGINA WEB"
+Es pot trobar més informació sobre live\-tools i el projecte Debian Live a la
+pàgina web <\fIhttp://live.debian.net/\fP> i al manual a
+<\fIhttp://live.debian.net/manual/\fP>.
+
+.SH ERRORS
+Es pot informar sobre els errors mitjançant la presentació d'un informe
+d'errors sobre al paquet live\-tools al Debian Bug Tracking System a
+<\fIhttp://bugs.debian.org/\fP> o escrivint un correu a la llista de
+correu de Debian Live a <\fIdebian\-live@lists.debian.org\fP>.
+
+.SH AUTOR
+live\-tools va ser escrit per Daniel Baumann <\fIdaniel@debian.org\fP>.
diff -Nru live-tools-3.0.3/manpages/de/live-tools.de.7 live-tools-3.0.9/manpages/de/live-tools.de.7
--- live-tools-3.0.3/manpages/de/live-tools.de.7 2012-07-05 12:07:04.000000000 -0300
+++ live-tools-3.0.9/manpages/de/live-tools.de.7 2012-08-16 07:08:58.000000000 -0300
@@ -1,7 +1,7 @@
.\" live-tools(7) - System Support Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
.\"
-.\" live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 05.07.2012 3.0.3\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 16.08.2012 3.0.9\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-tools\fP \- System Support Skripte
@@ -22,6 +22,8 @@
.SH TOOLS
\fBlive\-tools\fP enthält derzeit folgende Tools.
+.IP \fBlive\-update\-initramfs\fP 4
+schreibt aktualisierte initramfs Images auf das Live Medium.
.IP \fBlive\-toram\fP 4
kopiert das laufende System in RAM um das Live Medium auszuwerfen.
.IP \fBlive\-system\fP 4
diff -Nru live-tools-3.0.3/manpages/en/live-tools.7 live-tools-3.0.9/manpages/en/live-tools.7
--- live-tools-3.0.3/manpages/en/live-tools.7 2012-07-05 12:07:04.000000000 -0300
+++ live-tools-3.0.9/manpages/en/live-tools.7 2012-08-16 07:08:58.000000000 -0300
@@ -1,12 +1,12 @@
.\" live-tools(7) - System Support Scripts
.\" Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
.\"
-.\" live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
.\" This is free software, and you are welcome to redistribute it
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-TOOLS 7 2012\-07\-05 3.0.3-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-08\-16 3.0.9-1 "Debian Live Project"
.SH NAME
\fBlive\-tools\fR \- System Support Scripts
@@ -17,6 +17,8 @@
.SH TOOLS
\fBlive\-tools\fR currently contains the following tools.
+.IP "\fBlive\-update\-initramfs\fR" 4
+writes out updated initramfs images to the live media.
.IP "\fBlive\-toram\fR" 4
copies running system to RAM in order to eject the live media.
.IP "\fBlive\-system\fR" 4
diff -Nru live-tools-3.0.3/manpages/es/live-tools.es.7 live-tools-3.0.9/manpages/es/live-tools.es.7
--- live-tools-3.0.3/manpages/es/live-tools.es.7 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/manpages/es/live-tools.es.7 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,57 @@
+.\" live-tools(7) - System Support Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.9\-1 "Debian Live Project"
+
+.SH NOMBRE
+\fBlive\-tools\fP \- Scripts de Apoyo del Sistema
+
+.SH DESCRIPCIÓN
+\fBlive\-tools\fP contiene scripts de apoyo adicional para los sistemas Debian
+Live.
+
+.SH HERRAMIENTAS
+\fBlive\-tools\fP incluye las siguientes herramientas.
+
+.IP \fBlive\-update\-initramfs\fP 4
+escribe imágenes initramfs actualizadas en los medios en vivo.
+.IP \fBlive\-toram\fP 4
+copia el sistema en ejecución en la RAM para poder expulsar los
+dispositivos.
+.IP \fBlive\-system\fP 4
+determina si el sistema en ejecución es un sistema basado en Debian Live.
+.IP \fBlive\-uptime\fP 4
+especifica durante cuánto tiempo el sistema ha estado en ejecución (funciona
+con LXC).
+
+.SH "VER TAMBIÉN"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+
+.SH "PÁGINA PRINCIPAL"
+Se puede encontrar más información acerca de live\-tools y el proyecto Debian
+Live en su página principal en <\fIhttp://live.debian.net/\fP> y en el
+manual en <\fIhttp://live.debian.net/manual/\fP>.
+
+.SH ERRORES
+Se puede notificar los fallos enviando un informe de errores sobre el
+paquete live\-tools en el Debian Bug Tracking System en
+<\fIhttp://bugs.debian.org/\fP> o escribiendo un mensaje a la lista de
+correo de Debian Live a la dirección
+<\fIdebian\-live@lists.debian.org\fP>.
+
+.SH AUTOR
+live\-tools fue escrito por Daniel Baumann <\fIdaniel@debian.org\fP>.
diff -Nru live-tools-3.0.3/manpages/fr/live-tools.fr.7 live-tools-3.0.9/manpages/fr/live-tools.fr.7
--- live-tools-3.0.3/manpages/fr/live-tools.fr.7 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/manpages/fr/live-tools.fr.7 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,55 @@
+.\" live-tools(7) - System Support Scripts
+.\" Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+.\"
+.\" This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+.\" This is free software, and you are welcome to redistribute it
+.\" under certain conditions; see COPYING for details.
+.\"
+.\"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH LIVE\-TOOLS 7 2012\-07\-31 3.0.9\-1 "Projet Debian Live"
+
+.SH NOM
+\fBlive\-tools\fP \- Scripts de Support du Système
+
+.SH DESCRIPTION
+\fBlive\-tools\fP contient des scripts de support supplémentaires pour les
+systèmes Debian Live.
+
+.SH OUTILS
+\fBlive\-tools\fP contient les outils suivants.
+
+.IP \fBlive\-update\-initramfs\fP 4
+écrit des images initramfs mises à jour aux dispositifs.
+.IP \fBlive\-toram\fP 4
+copie le système en exécution à la RAM afin d'éjecter le support.
+.IP \fBlive\-system\fP 4
+détermine si le système en exécution est un système basé sur debian\-live.
+.IP \fBlive\-uptime\fP 4
+indique combien de temps le système a été en cours d'exécution (fonctionne
+avec LXC).
+
+.SH "VOIR AUSSI"
+\fIlive\-boot\fP(7)
+.PP
+\fIlive\-build\fP(7)
+.PP
+\fIlive\-config\fP(7)
+
+.SH "PAGE D'ACCUEIL"
+Plus d'informations sur live\-tools et le projet Debian Live peuvent être
+trouvées sur la page <\fIhttp://live.debian.net/\fP> et dans le manuel
+sur <\fIhttp://live.debian.net/manual/\fP>.
+
+.SH BOGUES
+Les bogues peuvent être signalés en soumettant un rapport de bogue à propos
+du paquet live\-tools via le Debian Bug Tracking System sur
+<\fIhttp://bugs.debian.org/\fP> ou en envoyant un mail à la liste de
+diffusion Debian Live sur <\fIdebian\-live@lists.debian.org\fP>
+
+.SH AUTEUR
+live\-tools a été conçu par Daniel Baumann <\fIdaniel@debian.org\fP>.
diff -Nru live-tools-3.0.3/manpages/Makefile live-tools-3.0.9/manpages/Makefile
--- live-tools-3.0.3/manpages/Makefile 2012-06-28 15:17:50.000000000 -0300
+++ live-tools-3.0.9/manpages/Makefile 2012-08-14 07:43:40.000000000 -0300
@@ -3,7 +3,7 @@
## live-tools(7) - System Support Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
##
-## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
diff -Nru live-tools-3.0.3/manpages/po/ca/live-tools.7.po live-tools-3.0.9/manpages/po/ca/live-tools.7.po
--- live-tools-3.0.3/manpages/po/ca/live-tools.7.po 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/manpages/po/ca/live-tools.7.po 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,192 @@
+# Spanish translations for live-tools
+# This file is distributed under the same license as the live-tools package.
+# Carlos Zuferri <chals@altorricon.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
+"PO-Revision-Date: 2012-07-29 23:39+0100\n"
+"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
+"Language-Team: Debian Live <debian-live@lists.debian.org>\n"
+"Language: Catalan\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "LIVE-TOOLS"
+msgstr "LIVE-TOOLS"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "2012-08-16"
+msgstr "2012-07-31"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "Debian Live Project"
+msgstr "Debian Live Project"
+
+#. type: SH
+#: en/live-tools.7:11
+#, no-wrap
+msgid "NAME"
+msgstr "NOM"
+
+#. type: Plain text
+#: en/live-tools.7:13
+msgid "B<live-tools> - System Support Scripts"
+msgstr "B<live-tools> - Scripts de Suport del Sistema"
+
+#. type: SH
+#: en/live-tools.7:14
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPCIÓ"
+
+#. type: Plain text
+#: en/live-tools.7:16
+msgid ""
+"B<live-tools> contains additional support scripts for Debian Live systems."
+msgstr ""
+"B<live-tools> conté scripts addicionals de suport per als sistemes Debian "
+"Live."
+
+#. type: SH
+#: en/live-tools.7:17
+#, no-wrap
+msgid "TOOLS"
+msgstr "EINES"
+
+#. type: Plain text
+#: en/live-tools.7:19
+msgid "B<live-tools> currently contains the following tools."
+msgstr "B<live-tools> actualment conté les següents eines."
+
+#. type: IP
+#: en/live-tools.7:20
+#, no-wrap
+msgid "B<live-update-initramfs>"
+msgstr "B<live-update-initramfs>"
+
+#. type: Plain text
+#: en/live-tools.7:22
+msgid "writes out updated initramfs images to the live media."
+msgstr "escriu imatges initramfs actualitzades als medis."
+
+#. type: IP
+#: en/live-tools.7:22
+#, no-wrap
+msgid "B<live-toram>"
+msgstr "B<live-toram>"
+
+#. type: Plain text
+#: en/live-tools.7:24
+msgid "copies running system to RAM in order to eject the live media."
+msgstr ""
+"copia el sistema en execució a la memòria RAM per tal d'expulsar els medis. "
+
+#. type: IP
+#: en/live-tools.7:24
+#, no-wrap
+msgid "B<live-system>"
+msgstr "B<live-system>"
+
+#. type: Plain text
+#: en/live-tools.7:26
+msgid "determines if running system is a debian-live based system."
+msgstr ""
+"determina si el sistema que s'està executant és un sistema basat en debian-"
+"live."
+
+#. type: IP
+#: en/live-tools.7:26
+#, no-wrap
+msgid "B<live-uptime>"
+msgstr "B<live-uptime>"
+
+#. type: Plain text
+#: en/live-tools.7:28
+msgid "tells how long the system has been running (works with LXC)."
+msgstr "diu quant de temps el sistema ha estat funcionant (funciona amb LXC)."
+
+#. type: SH
+#: en/live-tools.7:29
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VEURE TAMBÉ"
+
+#. type: Plain text
+#: en/live-tools.7:31
+msgid "I<live-boot>(7)"
+msgstr "I<live-boot>(7)"
+
+#. type: Plain text
+#: en/live-tools.7:33
+msgid "I<live-build>(7)"
+msgstr "I<live-build>(7)"
+
+#. type: Plain text
+#: en/live-tools.7:35
+msgid "I<live-config>(7)"
+msgstr "I<live-config>(7)"
+
+#. type: SH
+#: en/live-tools.7:36
+#, no-wrap
+msgid "HOMEPAGE"
+msgstr "PÀGINA WEB"
+
+#. type: Plain text
+#: en/live-tools.7:38
+msgid ""
+"More information about live-tools and the Debian Live project can be found "
+"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
+msgstr ""
+"Es pot trobar més informació sobre live-tools i el projecte Debian Live a la "
+"pàgina web E<lt>I<http://live.debian.net/>E<gt> i al manual a E<lt>I<http://";
+"live.debian.net/manual/>E<gt>."
+
+#. type: SH
+#: en/live-tools.7:39
+#, no-wrap
+msgid "BUGS"
+msgstr "ERRORS"
+
+#. type: Plain text
+#: en/live-tools.7:41
+msgid ""
+"Bugs can be reported by submitting a bugreport for the live-tools package in "
+"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"debian.org>E<gt>."
+msgstr ""
+"Es pot informar sobre els errors mitjançant la presentació d'un informe "
+"d'errors sobre al paquet live-tools al Debian Bug Tracking System a "
+"E<lt>I<http://bugs.debian.org/>E<gt> o escrivint un correu a la llista de "
+"correu de Debian Live a E<lt>I<debian-live@lists.debian.org>E<gt>."
+
+#. type: SH
+#: en/live-tools.7:42
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTOR"
+
+#. type: Plain text
+#: en/live-tools.7:43
+msgid ""
+"live-tools was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
+msgstr ""
+"live-tools va ser escrit per Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
diff -Nru live-tools-3.0.3/manpages/po/de/live-tools.7.po live-tools-3.0.9/manpages/po/de/live-tools.7.po
--- live-tools-3.0.3/manpages/po/de/live-tools.7.po 2012-07-05 12:07:04.000000000 -0300
+++ live-tools-3.0.9/manpages/po/de/live-tools.7.po 2012-08-16 07:08:58.000000000 -0300
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-tools 3.0.3-1\n"
-"POT-Creation-Date: 2012-07-05 17:06+0300\n"
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-07-05"
-msgstr "05.07.2012"
+msgid "2012-08-16"
+msgstr "16.08.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.3-1"
-msgstr "3.0.3-1"
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
#. type: TH
#: en/live-tools.7:9
@@ -76,67 +76,78 @@
#. type: IP
#: en/live-tools.7:20
#, no-wrap
+msgid "B<live-update-initramfs>"
+msgstr "B<live-update-initramfs>"
+
+#. type: Plain text
+#: en/live-tools.7:22
+msgid "writes out updated initramfs images to the live media."
+msgstr "schreibt aktualisierte initramfs Images auf das Live Medium."
+
+#. type: IP
+#: en/live-tools.7:22
+#, no-wrap
msgid "B<live-toram>"
msgstr "B<live-toram>"
#. type: Plain text
-#: en/live-tools.7:22
+#: en/live-tools.7:24
msgid "copies running system to RAM in order to eject the live media."
msgstr "kopiert das laufende System in RAM um das Live Medium auszuwerfen."
#. type: IP
-#: en/live-tools.7:22
+#: en/live-tools.7:24
#, no-wrap
msgid "B<live-system>"
msgstr "B<live-system>"
#. type: Plain text
-#: en/live-tools.7:24
+#: en/live-tools.7:26
msgid "determines if running system is a debian-live based system."
msgstr "bestimmt ob das laufende System ein Debian Live basiertes System ist."
#. type: IP
-#: en/live-tools.7:24
+#: en/live-tools.7:26
#, no-wrap
msgid "B<live-uptime>"
msgstr "B<live-uptime>"
#. type: Plain text
-#: en/live-tools.7:26
+#: en/live-tools.7:28
msgid "tells how long the system has been running (works with LXC)."
msgstr ""
"gibt die aktuelle Dauer wie lange das System läuft aus (funktioniert mit "
"LXC)."
#. type: SH
-#: en/live-tools.7:27
+#: en/live-tools.7:29
#, no-wrap
msgid "SEE ALSO"
msgstr "SIEHE AUCH"
#. type: Plain text
-#: en/live-tools.7:29
+#: en/live-tools.7:31
msgid "I<live-boot>(7)"
msgstr "I<live-boot>(7)"
#. type: Plain text
-#: en/live-tools.7:31
+#: en/live-tools.7:33
msgid "I<live-build>(7)"
msgstr "I<live-build>(7)"
#. type: Plain text
-#: en/live-tools.7:33
+#: en/live-tools.7:35
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
#. type: SH
-#: en/live-tools.7:34
+#: en/live-tools.7:36
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-tools.7:36
+#: en/live-tools.7:38
msgid ""
"More information about live-tools and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -147,13 +158,13 @@
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-tools.7:37
+#: en/live-tools.7:39
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-tools.7:39
+#: en/live-tools.7:41
msgid ""
"Bugs can be reported by submitting a bugreport for the live-tools package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -167,13 +178,13 @@
"werden."
#. type: SH
-#: en/live-tools.7:40
+#: en/live-tools.7:42
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-tools.7:41
+#: en/live-tools.7:43
msgid ""
"live-tools was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
msgstr ""
diff -Nru live-tools-3.0.3/manpages/po/es/live-tools.7.po live-tools-3.0.9/manpages/po/es/live-tools.7.po
--- live-tools-3.0.3/manpages/po/es/live-tools.7.po 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/manpages/po/es/live-tools.7.po 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,193 @@
+# Spanish translations for live-tools
+# This file is distributed under the same license as the live-tools package.
+# Carlos Zuferri <chals@altorricon.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
+"PO-Revision-Date: 2012-07-28 22:44+0100\n"
+"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
+"Language-Team: Debian Live <debian-live@lists.debian.org>\n"
+"Language: Spanish\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "LIVE-TOOLS"
+msgstr "LIVE-TOOLS"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "2012-08-16"
+msgstr "2012-07-31"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "Debian Live Project"
+msgstr "Debian Live Project"
+
+#. type: SH
+#: en/live-tools.7:11
+#, no-wrap
+msgid "NAME"
+msgstr "NOMBRE"
+
+#. type: Plain text
+#: en/live-tools.7:13
+msgid "B<live-tools> - System Support Scripts"
+msgstr "B<live-tools> - Scripts de Apoyo del Sistema"
+
+#. type: SH
+#: en/live-tools.7:14
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPCIÓN"
+
+#. type: Plain text
+#: en/live-tools.7:16
+msgid ""
+"B<live-tools> contains additional support scripts for Debian Live systems."
+msgstr ""
+"B<live-tools> contiene scripts de apoyo adicional para los sistemas Debian "
+"Live."
+
+#. type: SH
+#: en/live-tools.7:17
+#, no-wrap
+msgid "TOOLS"
+msgstr "HERRAMIENTAS"
+
+#. type: Plain text
+#: en/live-tools.7:19
+msgid "B<live-tools> currently contains the following tools."
+msgstr "B<live-tools> incluye las siguientes herramientas."
+
+#. type: IP
+#: en/live-tools.7:20
+#, no-wrap
+msgid "B<live-update-initramfs>"
+msgstr "B<live-update-initramfs>"
+
+#. type: Plain text
+#: en/live-tools.7:22
+msgid "writes out updated initramfs images to the live media."
+msgstr "escribe imágenes initramfs actualizadas en los medios en vivo."
+
+#. type: IP
+#: en/live-tools.7:22
+#, no-wrap
+msgid "B<live-toram>"
+msgstr "B<live-toram>"
+
+#. type: Plain text
+#: en/live-tools.7:24
+msgid "copies running system to RAM in order to eject the live media."
+msgstr ""
+"copia el sistema en ejecución en la RAM para poder expulsar los dispositivos."
+
+#. type: IP
+#: en/live-tools.7:24
+#, no-wrap
+msgid "B<live-system>"
+msgstr "B<live-system>"
+
+#. type: Plain text
+#: en/live-tools.7:26
+msgid "determines if running system is a debian-live based system."
+msgstr ""
+"determina si el sistema en ejecución es un sistema basado en Debian Live."
+
+#. type: IP
+#: en/live-tools.7:26
+#, no-wrap
+msgid "B<live-uptime>"
+msgstr "B<live-uptime>"
+
+#. type: Plain text
+#: en/live-tools.7:28
+msgid "tells how long the system has been running (works with LXC)."
+msgstr ""
+"especifica durante cuánto tiempo el sistema ha estado en ejecución (funciona "
+"con LXC)."
+
+#. type: SH
+#: en/live-tools.7:29
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VER TAMBIÉN"
+
+#. type: Plain text
+#: en/live-tools.7:31
+msgid "I<live-boot>(7)"
+msgstr "I<live-boot>(7)"
+
+#. type: Plain text
+#: en/live-tools.7:33
+msgid "I<live-build>(7)"
+msgstr "I<live-build>(7)"
+
+#. type: Plain text
+#: en/live-tools.7:35
+msgid "I<live-config>(7)"
+msgstr "I<live-config>(7)"
+
+#. type: SH
+#: en/live-tools.7:36
+#, no-wrap
+msgid "HOMEPAGE"
+msgstr "PÁGINA PRINCIPAL"
+
+#. type: Plain text
+#: en/live-tools.7:38
+msgid ""
+"More information about live-tools and the Debian Live project can be found "
+"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
+msgstr ""
+"Se puede encontrar más información acerca de live-tools y el proyecto Debian "
+"Live en su página principal en E<lt>I<http://live.debian.net/>E<gt> y en el "
+"manual en E<lt>I<http://live.debian.net/manual/>E<gt>."
+
+#. type: SH
+#: en/live-tools.7:39
+#, no-wrap
+msgid "BUGS"
+msgstr "ERRORES"
+
+#. type: Plain text
+#: en/live-tools.7:41
+msgid ""
+"Bugs can be reported by submitting a bugreport for the live-tools package in "
+"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"debian.org>E<gt>."
+msgstr ""
+"Se puede notificar los fallos enviando un informe de errores sobre el "
+"paquete live-tools en el Debian Bug Tracking System en E<lt>I<http://bugs.";
+"debian.org/>E<gt> o escribiendo un mensaje a la lista de correo de Debian "
+"Live a la dirección E<lt>I<debian-live@lists.debian.org>E<gt>."
+
+#. type: SH
+#: en/live-tools.7:42
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTOR"
+
+#. type: Plain text
+#: en/live-tools.7:43
+msgid ""
+"live-tools was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
+msgstr ""
+"live-tools fue escrito por Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
diff -Nru live-tools-3.0.3/manpages/po/fr/live-tools.7.po live-tools-3.0.9/manpages/po/fr/live-tools.7.po
--- live-tools-3.0.3/manpages/po/fr/live-tools.7.po 1969-12-31 20:00:00.000000000 -0400
+++ live-tools-3.0.9/manpages/po/fr/live-tools.7.po 2012-08-16 07:08:58.000000000 -0300
@@ -0,0 +1,192 @@
+# French translations for live-tools
+# This file is distributed under the same license as the live-tools package.
+# Carlos Zuferri <chals@altorricon.com>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-tools 3.0.9-1\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
+"PO-Revision-Date: 2012-07-31 00:29+0100\n"
+"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
+"Language-Team: Debian Live <debian-live@lists.debian.org>\n"
+"Language: French\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "LIVE-TOOLS"
+msgstr "LIVE-TOOLS"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "2012-08-16"
+msgstr "2012-07-31"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "3.0.9-1"
+msgstr "3.0.9-1"
+
+#. type: TH
+#: en/live-tools.7:9
+#, no-wrap
+msgid "Debian Live Project"
+msgstr "Projet Debian Live"
+
+#. type: SH
+#: en/live-tools.7:11
+#, no-wrap
+msgid "NAME"
+msgstr "NOM"
+
+#. type: Plain text
+#: en/live-tools.7:13
+msgid "B<live-tools> - System Support Scripts"
+msgstr "B<live-tools> - Scripts de Support du Système"
+
+#. type: SH
+#: en/live-tools.7:14
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
+
+#. type: Plain text
+#: en/live-tools.7:16
+msgid ""
+"B<live-tools> contains additional support scripts for Debian Live systems."
+msgstr ""
+"B<live-tools> contient des scripts de support supplémentaires pour les "
+"systèmes Debian Live."
+
+#. type: SH
+#: en/live-tools.7:17
+#, no-wrap
+msgid "TOOLS"
+msgstr "OUTILS"
+
+#. type: Plain text
+#: en/live-tools.7:19
+msgid "B<live-tools> currently contains the following tools."
+msgstr "B<live-tools> contient les outils suivants."
+
+#. type: IP
+#: en/live-tools.7:20
+#, no-wrap
+msgid "B<live-update-initramfs>"
+msgstr "B<live-update-initramfs>"
+
+#. type: Plain text
+#: en/live-tools.7:22
+msgid "writes out updated initramfs images to the live media."
+msgstr "écrit des images initramfs mises à jour aux dispositifs."
+
+#. type: IP
+#: en/live-tools.7:22
+#, no-wrap
+msgid "B<live-toram>"
+msgstr "B<live-toram>"
+
+#. type: Plain text
+#: en/live-tools.7:24
+msgid "copies running system to RAM in order to eject the live media."
+msgstr "copie le système en exécution à la RAM afin d'éjecter le support."
+
+#. type: IP
+#: en/live-tools.7:24
+#, no-wrap
+msgid "B<live-system>"
+msgstr "B<live-system>"
+
+#. type: Plain text
+#: en/live-tools.7:26
+msgid "determines if running system is a debian-live based system."
+msgstr ""
+"détermine si le système en exécution est un système basé sur debian-live."
+
+#. type: IP
+#: en/live-tools.7:26
+#, no-wrap
+msgid "B<live-uptime>"
+msgstr "B<live-uptime>"
+
+#. type: Plain text
+#: en/live-tools.7:28
+msgid "tells how long the system has been running (works with LXC)."
+msgstr ""
+"indique combien de temps le système a été en cours d'exécution (fonctionne "
+"avec LXC)."
+
+#. type: SH
+#: en/live-tools.7:29
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VOIR AUSSI"
+
+#. type: Plain text
+#: en/live-tools.7:31
+msgid "I<live-boot>(7)"
+msgstr "I<live-boot>(7)"
+
+#. type: Plain text
+#: en/live-tools.7:33
+msgid "I<live-build>(7)"
+msgstr "I<live-build>(7)"
+
+#. type: Plain text
+#: en/live-tools.7:35
+msgid "I<live-config>(7)"
+msgstr "I<live-config>(7)"
+
+#. type: SH
+#: en/live-tools.7:36
+#, no-wrap
+msgid "HOMEPAGE"
+msgstr "PAGE D'ACCUEIL"
+
+#. type: Plain text
+#: en/live-tools.7:38
+msgid ""
+"More information about live-tools and the Debian Live project can be found "
+"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
+"E<lt>I<http://live.debian.net/manual/>E<gt>."
+msgstr ""
+"Plus d'informations sur live-tools et le projet Debian Live peuvent être "
+"trouvées sur la page E<lt>I<http://live.debian.net/>E<gt> et dans le manuel "
+"sur E<lt>I<http://live.debian.net/manual/>E<gt>."
+
+#. type: SH
+#: en/live-tools.7:39
+#, no-wrap
+msgid "BUGS"
+msgstr "BOGUES"
+
+#. type: Plain text
+#: en/live-tools.7:41
+msgid ""
+"Bugs can be reported by submitting a bugreport for the live-tools package in "
+"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
+"writing a mail to the Debian Live mailing list at E<lt>I<debian-live@lists."
+"debian.org>E<gt>."
+msgstr ""
+"Les bogues peuvent être signalés en soumettant un rapport de bogue à propos "
+"du paquet live-tools via le Debian Bug Tracking System sur E<lt>I<http://";
+"bugs.debian.org/>E<gt> ou en envoyant un mail à la liste de diffusion Debian "
+"Live sur E<lt>I<debian-live@lists.debian.org>E<gt>"
+
+#. type: SH
+#: en/live-tools.7:42
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTEUR"
+
+#. type: Plain text
+#: en/live-tools.7:43
+msgid ""
+"live-tools was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
+msgstr ""
+"live-tools a été conçu par Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
diff -Nru live-tools-3.0.3/manpages/po4a.cfg live-tools-3.0.9/manpages/po4a.cfg
--- live-tools-3.0.3/manpages/po4a.cfg 2012-07-05 12:06:35.000000000 -0300
+++ live-tools-3.0.9/manpages/po4a.cfg 2012-08-16 07:07:56.000000000 -0300
@@ -1,3 +1,3 @@
-[po4a_langs] de
+[po4a_langs] ca de es fr
[po4a_paths] pot/$master.pot $lang:po/$lang/$master.po
[type: man] en/live-tools.7 $lang:$lang/live-tools.$lang.7
diff -Nru live-tools-3.0.3/manpages/pot/live-tools.7.pot live-tools-3.0.9/manpages/pot/live-tools.7.pot
--- live-tools-3.0.3/manpages/pot/live-tools.7.pot 2012-07-05 12:07:04.000000000 -0300
+++ live-tools-3.0.9/manpages/pot/live-tools.7.pot 2012-08-16 07:08:58.000000000 -0300
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2012-07-05 17:06+0300\n"
+"POT-Creation-Date: 2012-08-16 12:07+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-07-05"
+msgid "2012-08-16"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.3-1"
+msgid "3.0.9-1"
msgstr ""
#. type: TH
@@ -77,65 +77,76 @@
#. type: IP
#: en/live-tools.7:20
#, no-wrap
-msgid "B<live-toram>"
+msgid "B<live-update-initramfs>"
msgstr ""
#. type: Plain text
#: en/live-tools.7:22
-msgid "copies running system to RAM in order to eject the live media."
+msgid "writes out updated initramfs images to the live media."
msgstr ""
#. type: IP
#: en/live-tools.7:22
#, no-wrap
-msgid "B<live-system>"
+msgid "B<live-toram>"
msgstr ""
#. type: Plain text
#: en/live-tools.7:24
-msgid "determines if running system is a debian-live based system."
+msgid "copies running system to RAM in order to eject the live media."
msgstr ""
#. type: IP
#: en/live-tools.7:24
#, no-wrap
-msgid "B<live-uptime>"
+msgid "B<live-system>"
msgstr ""
#. type: Plain text
#: en/live-tools.7:26
+msgid "determines if running system is a debian-live based system."
+msgstr ""
+
+#. type: IP
+#: en/live-tools.7:26
+#, no-wrap
+msgid "B<live-uptime>"
+msgstr ""
+
+#. type: Plain text
+#: en/live-tools.7:28
msgid "tells how long the system has been running (works with LXC)."
msgstr ""
#. type: SH
-#: en/live-tools.7:27
+#: en/live-tools.7:29
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:29
+#: en/live-tools.7:31
msgid "I<live-boot>(7)"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:31
+#: en/live-tools.7:33
msgid "I<live-build>(7)"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:33
+#: en/live-tools.7:35
msgid "I<live-config>(7)"
msgstr ""
#. type: SH
-#: en/live-tools.7:34
+#: en/live-tools.7:36
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:36
+#: en/live-tools.7:38
msgid ""
"More information about live-tools and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -143,13 +154,13 @@
msgstr ""
#. type: SH
-#: en/live-tools.7:37
+#: en/live-tools.7:39
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:39
+#: en/live-tools.7:41
msgid ""
"Bugs can be reported by submitting a bugreport for the live-tools package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -158,13 +169,13 @@
msgstr ""
#. type: SH
-#: en/live-tools.7:40
+#: en/live-tools.7:42
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:41
+#: en/live-tools.7:43
msgid ""
"live-tools was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt>."
msgstr ""
diff -Nru live-tools-3.0.3/scripts/live-system live-tools-3.0.9/scripts/live-system
--- live-tools-3.0.3/scripts/live-system 2012-06-28 15:17:50.000000000 -0300
+++ live-tools-3.0.9/scripts/live-system 1969-12-31 20:00:00.000000000 -0400
@@ -1,71 +0,0 @@
-#!/bin/sh
-
-## live-tools(7) - System Support Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## 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 3 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, see <http://www.gnu.org/licenses/>.
-##
-## The complete text of the GNU General Public License
-## can be found in /usr/share/common-licenses/GPL-3 file.
-
-
-# Redirect stdout to stderr
-exec 1>&2
-
-case "${1}" in
- -h|--help|-u|--usage)
- echo "live-system - determine if running system is a debian-live based system"
- echo
- echo "Usage: ${0} [-v|--verbose]"
-
- exit 2
- ;;
-
- -v|--verbose)
- _VERBOSE="true"
- ;;
-esac
-
-[ "${_VERBOSE}" ] && echo -n "Checking for debian-live based system..."
-
-if [ ! -e /proc/cmdline ]
-then
- [ "${_VERBOSE}" ] && echo
- echo "E: /proc/cmdline - No such file."
-
- exit 2
-fi
-
-if grep -qs "boot=live" /proc/cmdline
-then
- [ "${_VERBOSE}" ] && echo -n " yes, this is a debian-live based system"
-
- if [ -d /live/image/install ]
- then
- if ls /live/image/install/pool/main/l/live-installer/live-installer_*.udeb > /dev/null 2>&1
- then
- [ "${_VERBOSE}" ] && echo " with debian-installer (live) support."
- else
- [ "${_VERBOSE}" ] && echo " with debian-installer (normal) support."
- fi
- else
- [ "${_VERBOSE}" ] && echo "without debian-installer support."
- fi
-
- exit 0
-else
- [ "${_VERBOSE}" ] && echo " no, this is not a debian-live based system."
-
- exit 1
-fi
diff -Nru live-tools-3.0.3/scripts/live-toram live-tools-3.0.9/scripts/live-toram
--- live-tools-3.0.3/scripts/live-toram 2012-06-28 15:17:50.000000000 -0300
+++ live-tools-3.0.9/scripts/live-toram 1969-12-31 20:00:00.000000000 -0400
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-## live-tools(7) - System Support Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Read cmdline
-for _PARAMETER in $(cat /proc/cmdline)
-do
- case "${_PARAMETER}" in
- module=*)
- _MODULE="${_PARAMETER#module=}"
- ;;
- esac
-done
-
-# Assemble filesystems
-if [ -z "${_MODULE}" ]
-then
- _FILESYSTEMS="/live/image/live/filesystem.squashfs"
-else
- for _FILESYSTEM in _MODULE
- do
- _FILESYSTEMS="${_FILESYSTEMS} /live/image/live/${_FILESYSTEM}"
- done
-fi
-
-# Exit if system is not debian-live based system
-if [ ! -d /live/image ]
-then
- echo "E: live-toram only works on Debian Live based systems."
-
- exit 1
-fi
-
-# Exit if filesystem not accessible
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
- if [ ! -r ${_FILESYSTEM} ]
- then
- echo "E: ${_FILESYSTEM}: No such file"
- echo "I: live-toram already run?"
-
- exit 1
- fi
-done
-
-# Exit if user is unprivileged
-if [ "$(id -u)" -ne 0 ]
-then
- echo "E: need root privileges"
-
- exit 1
-fi
-
-# Exit if not enough free memory
-_SIZE=0
-
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
- _SIZE="$((${_SIZE} + $(du ${_FILESYSTEM} | awk '{ print $1 }')))"
- _MEMORY="$(awk '/MemFree/ { print $2 }' /proc/meminfo)"
-done
-
-case ${@} in
- -f|--force)
- echo "I: Ignoring memory constrains as requested"
- ;;
-
- *)
- if [ $_MEMORY -lt $_SIZE ]
- then
- echo "E: not enough free memory available."
- echo "I: images need ${_SIZE}kB, free memory is ${_MEMORY}kB."
-
- exit 1
- fi
- ;;
-esac
-
-# Copying image to memory
-echo "P: Copying images to memory."
-echo "I: This may take a while..."
-
-# FIXME: doesn't work with multiple filesystems
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
- if [ ! -x "$(which rsync 2> /dev/null)" ]
- then
- rsync -a --progress ${_FILESYSTEM} /tmp/live
- else
- cp -av ${_FILESYSTEM} /tmp/live
- fi
-
-LANGUAGE=C LANG=C LC_ALL=C perl << EOF
-open LOOP, '</dev/loop0' or die $!;
-open DEST, '</tmp/live' or die $!;
-ioctl(LOOP, 0x4C06, fileno(DEST)) or die $!
-close LOOP;
-close DEST;
-EOF
-
-done
-
-# Unmounting live media
-_DEVICE="$(awk '/\/live\/image / { print $1 }' /proc/mounts)"
-
-if [ -d /live/image ]
-then
- umount /live/image
- rmdir --ignore-fail-on-non-empty /live/image || true
-fi
-
-# Ejecting live media if it is not an optical device
-if [ "$(expr substr ${_DEVICE} 1 2)" != "sd" ] && \
- ! readlink /sys/block/$(expr substr ${_DEVICE} 6 3) | grep -q usb
-then
- if [ ! -x "$(which eject 2> /dev/null)" ]
- then
- eject -p -m ${_DEVICE} > /dev/null 2>&1
- fi
-fi
diff -Nru live-tools-3.0.3/scripts/live-uptime live-tools-3.0.9/scripts/live-uptime
--- live-tools-3.0.3/scripts/live-uptime 2012-06-28 15:17:50.000000000 -0300
+++ live-tools-3.0.9/scripts/live-uptime 1969-12-31 20:00:00.000000000 -0400
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-## live-tools(7) - System Support Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
-##
-## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-_UPTIME="$(/usr/bin/uptime.procps)"
-
-_DATE_HOST="$(date +%s)"
-
-_DATE_LXC="$(stat /dev/pts | awk '/^Change: / { print $2, $3 }')"
-_DATE_LXC="$(date +%s -d"${_DATE_LXC}")"
-
-_UPTIME_LXC="$((${_DATE_HOST} - ${_DATE_LXC}))"
-
-if [ "${_UPTIME_LXC}" -gt 172800 ]
-then
- # LXC uptime >= 2 days
- _DAYS="$((${_UPTIME_LXC} / 86400))"
-
- _UPTIME="$(echo ${_UPTIME} | sed -e "s|up .* days,|up ${_DAYS} days,|")"
-else
- # LXC uptime < 2 days
- _HOURS="$((${_UPTIME_LXC} / 3600))"
- _MINUTES="$((${_UPTIME_LXC} - ${_HOURS}))"
- _MINUTES="$((${_MINUTES} / 60))"
-
- _UPTIME="$(echo ${_UPTIME} | sed -e "s|up .*, |up ${_HOURS}:${_MINUTES}, |")"
-fi
-
-echo " ${_UPTIME}"
diff -Nru live-tools-3.0.3/VERSION live-tools-3.0.9/VERSION
--- live-tools-3.0.3/VERSION 2012-07-05 12:07:04.000000000 -0300
+++ live-tools-3.0.9/VERSION 2012-08-16 07:08:58.000000000 -0300
@@ -1 +1 @@
-3.0.3-1
+3.0.9-1
Reply to: