From: Daniel Baumann Date: Wed, 16 Apr 2008 06:56:47 +0000 (+0200) Subject: Merging casper 1.129. X-Git-Tag: debian/2.0.15-1~558 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=47527b7666b1a12122a0b17098064e7af745d097 Merging casper 1.129. --- diff --git a/Makefile b/Makefile index dd0a6b9..c377644 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ install: test build # Installing executables mkdir -p $(DESTDIR)/sbin - cp bin/live-getty bin/live-login bin/live-snapshot $(DESTDIR)/sbin + cp bin/live-getty bin/live-login bin/live-new-uuid bin/live-snapshot $(DESTDIR)/sbin mkdir -p $(DESTDIR)/usr/share/live-initramfs cp bin/live-preseed bin/live-reconfigure $(DESTDIR)/usr/share/live-initramfs diff --git a/bin/live-new-uuid b/bin/live-new-uuid new file mode 100755 index 0000000..4a6afa6 --- /dev/null +++ b/bin/live-new-uuid @@ -0,0 +1,75 @@ +#!/bin/sh +# -*- coding: utf-8 -*- +# +# «casper-new-uuid» - Creates and injects new UUIDs for casper disks +# +# Create new UUIDs for disks to prevent conflicts and booting the wrong casper +# directory. Particularly useful in creating recovery disks that need to be +# able to also work with recovery partitioning schemes. +# +# Copyright (C) 2008, Dell Inc. +# +# Author: +# - Mario Limonciello +# +# This script 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 application; if not, write to the Free Software Foundation, Inc., 51 +# Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +################################################################################## + +set -e + +help() { + echo + echo "USAGE: $0 initrd.gz " + echo + echo "initrd.gz is the absolute path to the original gzipped initramfs" + echo " is the destination directory for the new gzipped initramfs" + echo " is the destination directory for the new casper-uuid-TYPE " + echo + echo "if either path is absent, they will end up in the current directory " + echo "TYPE is determined by an already existing casper-uuid-* or by 'uname -s'" +} + +if [ "$#" = "0" ] || [ "x$1" = x-h ] || [ "x$1" = x--help ]; then + help + exit 3 +fi + +CWD=`pwd` +TEMPDIR=`mktemp -d /tmp/uuid-XXXXXX` +TYPE=`uname -r | cut -d '-' -f 3` + +if [ -z "$2" ] || [ ! -d "$2" ] || [ "$2" = "." ]; then + GZIPDIR="$CWD" +else + GZIPDIR="$2" +fi + +if [ -z "$3" ] || [ ! -d "$3" ] || [ "$3" = "." ]; then + CASPERDIR="$CWD" +else + CASPERDIR="$3" +fi + +cd "$TEMPDIR" +zcat "$1" | cpio -id +uuidgen -r > conf/uuid.conf +find . | cpio --quiet --dereference -o -H newc | gzip > "$GZIPDIR/initrd.gz" +if [ "$(ls "$CASPERDIR/casper-uuid"-* >/dev/null 2>&1 | wc -l)" = 1 ]; then + cp conf/uuid.conf "$CASPERDIR/casper-uuid"-* +else + cp conf/uuid.conf "$CASPERDIR/casper-uuid-$TYPE" +fi +cd "$CWD" +rm -rf "$TEMPDIR" diff --git a/bin/live-snapshot b/bin/live-snapshot index 141d266..12c79b8 100755 --- a/bin/live-snapshot +++ b/bin/live-snapshot @@ -302,7 +302,7 @@ Do_snapshot () ext2|ext3) DU_DIM="$(du -ks ${SNAP_COW} | cut -f1)" REAL_DIM="$(expr ${DU_DIM} + ${DU_DIM} / 20)" # Just 5% more to be sure, need something more sophistcated here... - genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root="${SNAP_COW}" "${DEST}" + genext2fs --size-in-blocks=${REAL_DIM} --reserved-percentage=0 --root="${SNAP_COW}" "${DEST}" ;; jffs2) diff --git a/debian/control b/debian/control index 41e7d1b..3836a66 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Package: live-initramfs Architecture: all Depends: ${misc:Depends}, busybox, file, initramfs-tools, sudo, udev, user-setup Recommends: eject, uuid-runtime, wget -Suggests: genext2fs, squashfs-tools, mtd-tools +Suggests: genext2fs (>= 1.4.1), squashfs-tools, mtd-tools 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 diff --git a/debian/copyright b/debian/copyright index 0394d46..ca3db4d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,6 +10,7 @@ Copyright: (C) 2007-2008 Daniel Baumann (C) 2005-2008 Canonical Ltd. (C) 2006-2007 Marco Amadori + (C) 2008 Dell Inc. License: GPL-3+ 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 diff --git a/docs/ChangeLog.casper b/docs/ChangeLog.casper index 6e990b5..34e0bd0 100644 --- a/docs/ChangeLog.casper +++ b/docs/ChangeLog.casper @@ -1,3 +1,15 @@ +casper (1.129) hardy; urgency=low + + * Add COPYING file with GPL text (LP: #211923). + * Add casper-new-uuid script to simplify UUID regeneration process, + contributed by Mario Limonciello of Dell (LP: #209847). + * Update casper-snapshot for genext2fs --reserved-blocks => + --reserved-percentage option change (LP: #202048). Add a Breaks as the + most lightweight available method of documenting that we need genext2fs + >= 1.4.1 for this. + + -- Colin Watson Thu, 10 Apr 2008 01:45:47 +0100 + casper (1.128) hardy; urgency=low [ Luke Yelavich ]