diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-08-03 12:17:24 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-08-07 07:19:54 +0200 |
| commit | c258d199b505b6c31a907a3935230b94039be3ba (patch) | |
| tree | 7ea314d9465704327ec8c2f657fd6288e35fcb02 | |
| parent | 9101f6c022c8fa02f21464d4d37417f683ab5cf7 (diff) | |
| download | live-boot-c258d199b505b6c31a907a3935230b94039be3ba.tar.gz live-boot-c258d199b505b6c31a907a3935230b94039be3ba.zip | |
Removing live-new-uuid, a rewritten one goes to live-tools.
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | bin/live-new-uuid | 86 | ||||
| -rw-r--r-- | debian/copyright | 1 | ||||
| -rw-r--r-- | debian/live-boot.install | 1 |
4 files changed, 0 insertions, 91 deletions
@@ -46,9 +46,6 @@ install: cp -r scripts/boot.sh scripts/boot $(DESTDIR)/lib/live # Installing executables - mkdir -p $(DESTDIR)/sbin - cp bin/live-new-uuid bin/live-swapfile $(DESTDIR)/sbin - mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts diff --git a/bin/live-new-uuid b/bin/live-new-uuid deleted file mode 100755 index 2e29f6a..0000000 --- a/bin/live-new-uuid +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# -*- coding: utf-8 -*- -# -# «live-new-uuid» - Creates and injects new UUIDs for live disks -# -# Create new UUIDs for disks to prevent conflicts and booting the wrong live -# 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 <Mario_Limonciello@Dell.com> -# -# 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.{l,g}z <path-to-new-initrd> <path-to-new-live-uuid> " - echo - echo "initrd.{l,g}z is the absolute path to the original gzipped or lzmaed initramfs" - echo "<path-to-new-initrd> is the destination directory for the new compressed initramfs" - echo "<path-to-new-live-uuid> is the destination directory for the new live-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 live-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 echo "$1" | grep ".lz$" >/dev/null; then - COMPRESSOR="lzma" - SUFFIX=".lz" -elif echo "$1" | grep ".gz$" >/dev/null; then - COMPRESSOR="gzip" - SUFFIX=".gz" -else - echo "Unsupported archive type." - exit 2 -fi - -if [ -z "$2" ] || [ ! -d "$2" ] || [ "$2" = "." ]; then - COMPRESS_DIR="$CWD" -else - COMPRESS_DIR="$2" -fi - -if [ -z "$3" ] || [ ! -d "$3" ] || [ "$3" = "." ]; then - LIVEDIR="$CWD" -else - LIVEDIR="$3" -fi - -cd "$TEMPDIR" -$COMPRESSOR -cd "$1" -S "$SUFFIX" | cpio -id -uuidgen -r > conf/uuid.conf -find . | cpio --quiet --dereference -o -H newc | $COMPRESSOR -9c > "$COMPRESS_DIR/initrd$SUFFIX" -if [ "$(ls "$LIVEDIR/live-uuid"-* >/dev/null 2>&1 | wc -l)" = 1 ]; then - cp conf/uuid.conf "$LIVEDIR/live-uuid"-* -else - cp conf/uuid.conf "$LIVEDIR/live-uuid-$TYPE" -fi -cd "$CWD" -rm -rf "$TEMPDIR" diff --git a/debian/copyright b/debian/copyright index 5b5eee8..9687245 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,6 @@ Copyright: 2006-2012 Daniel Baumann <daniel@debian.org> 2005-2008 Canonical Ltd. <http://www.cannonical.com/> 2008 Chris Lamb <chris@debian.org> 2006-2007 Marco Amadori <marco.amadori@gmail.com> - 2008 Dell Inc. <http://www.dell.com/> License: GPL-3+ License: GPL-3+ diff --git a/debian/live-boot.install b/debian/live-boot.install index bf90b05..a65b417 100644 --- a/debian/live-boot.install +++ b/debian/live-boot.install @@ -1,2 +1 @@ lib -sbin |