17 files changed, 85 insertions, 843 deletions

diff --git a/Makefile b/Makefile
index c481eef..73f8d63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # Makefile
 
-CFLAGS = -Wall -g -O2
 BUILD_SYSTEM := $(shell lsb_release --short --id)
 
 TRANSLATIONS="it"
@@ -17,16 +16,10 @@ build:
 	# Setting BUILD_SYSTEM
 	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
-	# Building live-md5check
-	CFLAGS="$(CFLAGS)" $(MAKE) -C bin/live-md5check
-
 install: test build
 	# Installing configuration
 	install -D -m 0644 live.conf $(DESTDIR)/etc/live.conf
 
-	# Installing live-md5check
-	install -D -m 0755 bin/live-md5check/live-md5check $(DESTDIR)/usr/lib/live-initramfs/live-md5check
-
 	# Installing executables
 	mkdir -p $(DESTDIR)/sbin
 	cp bin/live-getty bin/live-login bin/live-snapshot $(DESTDIR)/sbin
@@ -75,9 +68,6 @@ uninstall:
 	# Uninstalling configuration
 	rm -f $(DESTDIR)/etc/live.conf
 
-	# Uninstalling live-md5check
-	rm -rf $(DESTDIR)/usr/lib/live-initramfs
-
 	# Uninstalling executables
 	rm -f $(DESTDIR)/sbin/live-getty $(DESTDIR)/sbin/live-login $(DESTDIR)/sbin/live-snapshot
 	rm -rf $(DESTDIR)/usr/share/live-initramfs
@@ -118,15 +108,14 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt manpages/*.en.*; \
 	do \
-		sed -i	-e 's/2007\\-07\\-16/2007\\-07\\-23/' \
-			-e 's/16.07.2007/23.07.2007/' \
-			-e 's/1.91.5/1.91.6/' \
+		sed -i	-e 's/2007\\-07\\-23/2007\\-07\\-30/' \
+			-e 's/23.07.2007/30.07.2007/' \
+			-e 's/1.91.6/1.91.7/' \
 		$$FILE; \
 	done
 
 clean:
 	rm -f live.conf
-	$(MAKE) -C bin/live-md5check clean
 
 distclean:
 
diff --git a/bin/live-md5check/Makefile b/bin/live-md5check/Makefile
deleted file mode 100644
index 51e42b9..0000000
--- a/bin/live-md5check/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-
-CC=gcc
-LDFLAGS=-lm
-CFLAGS=$(getconf LFS_CFLAGS) -Wall -O2
-
-live-md5check: live-md5check.c md5.c
-
-clean:
-	rm -f *.o live-md5check
diff --git a/bin/live-md5check/live-md5check.c b/bin/live-md5check/live-md5check.c
deleted file mode 100644
index 8bac6a0..0000000
--- a/bin/live-md5check/live-md5check.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/* casper-md5check - a tool to check md5sums and talk to usplash
-   (C) Canonical Ltd 2006
-   Written by Tollef Fog Heen <tfheen@ubuntu.com>
-
-   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 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 program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-   USA. */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/reboot.h>
-#include <linux/reboot.h>
-#include <string.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <math.h>
-#include <termios.h>
-
-#define USPLASH_FIFO "/dev/.initramfs/usplash_fifo"
-#define MAXTRIES 5
-#include "md5.h"
-#define DEBUG
-
-int write_and_retry(int fd, char *s) {
-  int try = 0, ret = 0;
-  char *end;
-
-#ifdef DEBUG
-  fprintf(stderr, "-> %s\n", s);
-#endif
-
-  end = s + strlen(s)+1;
-
-  ret = write(fd, s, end - s);
-  while (s + ret < end && try < MAXTRIES) {
-    sleep(1);
-    s += ret;
-    ret = write(fd, s, strlen(s)+1);
-    try++;
-  }
-  return (s+ret == end ? 0 : 1);
-}
-
-void usplash_timeout(int fd, int timeout) {
-  char *s;
-
-  asprintf(&s, "TIMEOUT %d", timeout);
-
-  write_and_retry(fd, s);
-
-  free(s);
-
-}
-
-void usplash_failure(int fd, char *format, ...) {
-  char *s, *s1;
-  va_list argp;
-
-  va_start(argp, format);
-  vasprintf(&s, format, argp);
-  va_end(argp);
-
-  asprintf(&s1, "FAILURE %s", s);
-
-  write_and_retry(fd, s1);
-
-  free(s);
-  free(s1);
-}
-
-void usplash_text(int fd, char *format, ...) {
-  char *s, *s1;
-  va_list argp;
-
-  va_start(argp, format);
-  vasprintf(&s, format, argp);
-  va_end(argp);
-
-  asprintf(&s1, "TEXT %s", s);
-
-  write_and_retry(fd, s1);
-
-  free(s);
-  free(s1);
-}
-
-void usplash_urgent(int fd, char *format, ...) {
-  char *s, *s1;
-  va_list argp;
-
-  va_start(argp, format);
-  vasprintf(&s, format, argp);
-  va_end(argp);
-
-  asprintf(&s1, "TEXT-URGENT %s", s);
-
-  write_and_retry(fd, s1);
-
-  free(s);
-  free(s1);
-}
-
-
-void usplash_success(int fd, char *format, ...) {
-  char *s, *s1;
-  va_list argp;
-
-  va_start(argp, format);
-  vasprintf(&s, format, argp);
-  va_end(argp);
-
-  asprintf(&s1, "SUCCESS %s", s);
-
-  write_and_retry(fd, s1);
-
-  free(s);
-  free(s1);
-}
-
-void usplash_progress(int fd, int progress) {
-  static int prevprogress = -1;
-  char *s;
-
-  if (progress == prevprogress)
-    return;
-  prevprogress = progress;
-
-  asprintf(&s, "PROGRESS %d", progress);
-
-  write_and_retry(fd, s);
-
-  free(s);
-}
-
-int set_nocanonical_tty(int fd) {
-  struct termios t;
-
-  if (tcgetattr(fd, &t) == -1) {
-    perror("tcgetattr");
-  }
-  t.c_lflag &= ~ICANON;
-  t.c_cc[VMIN] = 1;
-  t.c_cc[VTIME] = 0;
-  return tcsetattr(fd, TCSANOW, &t);
-}
-
-int main(int argc, char **argv) {
-
-  int pipe_fd, check_fd;
-  int failed = 0;
-
-  FILE *md5_file;
-  md5_state_t state;
-  md5_byte_t digest[16];
-  char hex_output[16*2 + 1];
-  char *checksum, *checkfile;
-  ssize_t tsize, csize;
-
-  tsize = 0;
-  csize = 0;
-
-  if (argc != 3) {
-    fprintf(stderr,"Wrong number of arguments\n");
-    fprintf(stderr,"%s <root directory> <md5sum file>\n", argv[0]);
-    exit(1);
-  }
-
-  if (chdir(argv[1]) != 0) {
-    perror("chdir");
-    exit(1);
-  }
-
-  pipe_fd = open(USPLASH_FIFO, O_WRONLY|O_NONBLOCK);
-
-  if (pipe_fd == -1) {
-    /* We can't really do anything useful here */
-    perror("Opening pipe");
-    exit(1);
-  }
-
-
-  usplash_progress(pipe_fd, 0);
-  usplash_urgent(pipe_fd, "Checking integrity, this may take some time");
-  md5_file = fopen(argv[2], "r");
-  if (!md5_file) {
-          perror("fopen md5_file");
-          exit(1);
-  }
-  while (fscanf(md5_file, "%as %as", &checksum, &checkfile) == 2) {
-    struct stat statbuf;
-
-    if (stat(checkfile, &statbuf) == 0) {
-      tsize += statbuf.st_size;
-    }
-
-    free(checksum);
-    free(checkfile);
-  }
-
-  rewind(md5_file);
-  while (fscanf(md5_file, "%as %as", &checksum, &checkfile) == 2) {
-    char buf[BUFSIZ];
-    ssize_t rsize;
-    int i;
-
-    md5_init(&state);
-
-    usplash_text(pipe_fd, "Checking %s", checkfile);
-
-    check_fd = open(checkfile, O_RDONLY);
-    if (check_fd < 0) {
-      usplash_timeout(pipe_fd, 300);
-      usplash_failure(pipe_fd, "%s", strerror(errno));
-      sleep(10);
-    }
-
-    rsize = read(check_fd, buf, sizeof(buf));
-
-    while (rsize > 0) {
-      csize += rsize;
-      usplash_progress(pipe_fd, floorl(100*((long double)csize)/tsize));
-
-      md5_append(&state, (const md5_byte_t *)buf, rsize);
-      rsize = read(check_fd, buf, sizeof(buf));
-    }
-
-    close(check_fd);
-    md5_finish(&state, digest);
-
-    for (i = 0; i < 16; i++)
-      sprintf(hex_output + i * 2, "%02x", digest[i]);
-
-    if (strncmp(hex_output, checksum, strlen(hex_output)) == 0) {
-      usplash_success(pipe_fd, "OK");
-    } else {
-      usplash_failure(pipe_fd, "mismatch");
-      failed++;
-    }
-    free(checksum);
-    free(checkfile);
-  }
-  if (failed) {
-    usplash_urgent(pipe_fd, "Check finished: errors found in %d files!", failed);
-  } else {
-    usplash_urgent(pipe_fd, "Check finished: no errors found");
-  }
-  usplash_urgent(pipe_fd, "Press any key to reboot your system");
-  usplash_timeout(pipe_fd, 86400);
-  set_nocanonical_tty(0);
-  getchar();
-  reboot(LINUX_REBOOT_CMD_RESTART);
-  return 0;
-
-}
diff --git a/bin/live-md5check/md5.c b/bin/live-md5check/md5.c
deleted file mode 100644
index c35d96c..0000000
--- a/bin/live-md5check/md5.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.c,v 1.6 2002/04/13 19:20:28 lpd Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
-	either statically or dynamically; added missing #include <string.h>
-	in library.
-  2002-03-11 lpd Corrected argument list for main(), and added int return
-	type, in test program and T value program.
-  2002-02-21 lpd Added missing #include <stdio.h> in test program.
-  2000-07-03 lpd Patched to eliminate warnings about "constant is
-	unsigned in ANSI C, signed in traditional"; made test program
-	self-checking.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
- */
-
-#include "md5.h"
-#include <string.h>
-
-#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
-#else
-#  define BYTE_ORDER 0
-#endif
-
-#define T_MASK ((md5_word_t)~0)
-#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
-#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3    0x242070db
-#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
-#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6    0x4787c62a
-#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
-#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9    0x698098d8
-#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
-#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
-#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13    0x6b901122
-#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
-#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16    0x49b40821
-#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
-#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19    0x265e5a51
-#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
-#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22    0x02441453
-#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
-#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25    0x21e1cde6
-#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
-#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28    0x455a14ed
-#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
-#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31    0x676f02d9
-#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
-#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
-#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35    0x6d9d6122
-#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
-#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38    0x4bdecfa9
-#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
-#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41    0x289b7ec6
-#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
-#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44    0x04881d05
-#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
-#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47    0x1fa27cf8
-#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
-#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50    0x432aff97
-#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
-#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53    0x655b59c3
-#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
-#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
-#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57    0x6fa87e4f
-#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
-#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60    0x4e0811a1
-#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
-#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63    0x2ad7d2bb
-#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
-
-static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-{
-    md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
-#if BYTE_ORDER > 0
-    /* Define storage only for big-endian CPUs. */
-    md5_word_t X[16];
-#else
-    /* Define storage for little-endian or both types of CPUs. */
-    md5_word_t xbuf[16];
-    const md5_word_t *X;
-#endif
-
-    {
-#if BYTE_ORDER == 0
-	/*
-	 * Determine dynamically whether this is a big-endian or
-	 * little-endian machine, since we can use a more efficient
-	 * algorithm on the latter.
-	 */
-	static const int w = 1;
-
-	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
-#endif
-#if BYTE_ORDER <= 0		/* little-endian */
-	{
-	    /*
-	     * On little-endian machines, we can process properly aligned
-	     * data without copying it.
-	     */
-	    if (!((data - (const md5_byte_t *)0) & 3)) {
-		/* data are properly aligned */
-		X = (const md5_word_t *)data;
-	    } else {
-		/* not aligned */
-		memcpy(xbuf, data, 64);
-		X = xbuf;
-	    }
-	}
-#endif
-#if BYTE_ORDER == 0
-	else			/* dynamic big-endian */
-#endif
-#if BYTE_ORDER >= 0		/* big-endian */
-	{
-	    /*
-	     * On big-endian machines, we must arrange the bytes in the
-	     * right order.
-	     */
-	    const md5_byte_t *xp = data;
-	    int i;
-
-#  if BYTE_ORDER == 0
-	    X = xbuf;		/* (dynamic only) */
-#  else
-#    define xbuf X		/* (static only) */
-#  endif
-	    for (i = 0; i < 16; ++i, xp += 4)
-		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-	}
-#endif
-    }
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
-}
-
-void
-md5_init(md5_state_t *pms)
-{
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
-    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
-    pms->abcd[3] = 0x10325476;
-}
-
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
-{
-    const md5_byte_t *p = data;
-    int left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
-}
-
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
-{
-    static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
-}
diff --git a/bin/live-md5check/md5.h b/bin/live-md5check/md5.h
deleted file mode 100644
index 3baa4dc..0000000
--- a/bin/live-md5check/md5.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Removed support for non-ANSI compilers; removed
-	references to Ghostscript; clarified derivation from RFC 1321;
-	now handles byte order either statically or dynamically.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-	added conditionalization for C++ compilation from Martin
-	Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-#ifndef md5_INCLUDED
-#  define md5_INCLUDED
-
-/*
- * This package supports both compile-time and run-time determination of CPU
- * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
- * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
- * defined as non-zero, the code will be compiled to run only on big-endian
- * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
- * run on either big- or little-endian CPUs, but will run slightly less
- * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
- */
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
-} md5_state_t;
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/* Initialize the algorithm. */
-void md5_init(md5_state_t *pms);
-
-/* Append a string to the message. */
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
-
-/* Finish the message and return the digest. */
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* md5_INCLUDED */
diff --git a/debian/changelog b/debian/changelog
index 17adc0b..6ca89ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-initramfs (1.91.6-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 23 Jul 2007 00:00:00 +0200
+
 live-initramfs (1.91.5-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 1d3d3cd..bb6fef5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ 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}, file, initramfs-tools, sudo, user-setup
+Architecture: all
+Depends: ${misc:Depends}, file, initramfs-tools, sudo, user-setup
 Recommends: eject, live-initscripts
 Suggests: genext2fs, squashfs-tools
 Conflicts: casper
diff --git a/debian/copyright b/debian/copyright
index 792ac76..e5c0890 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,29 +36,5 @@ License:
 On Debian systems, the complete text of the GNU General Public License
 can be found in /usr/share/common-licenses/GPL-2 file.
 
-License (live-md5check/md5.c, live-md5check/md5,h):
-
-	Copyright (C) 1999-2002 Aladdin Enterprises
-	All rights reserved.
-
-	This software is provided 'as-is', without any express or implied
-	warranty.  In no event will the authors be held liable for any damages
-	arising from the use of this software.
-
-	Permission is granted to anyone to use this software for any purpose,
-	including commercial applications, and to alter it and redistribute it
-	freely, subject to the following restrictions:
-
-	1. The origin of this software must not be misrepresented; you must not
-	claim that you wrote the original software. If you use this software in
-	a product, an acknowledgment in the product documentation would be
-	appreciated but is not required.
-
-	2. Altered source versions must be plainly marked as such, and must not
-	be misrepresented as being the original software.
-
-	3. This notice may not be removed or altered from any source
-	distribution.
-
 The Debian packaging is (C) 2007, Daniel Baumann <daniel@debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/rules b/debian/rules
index 0e8bbc7..b1801be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 upstream:
 	# Needs: subversion
 	cd .. && svn co svn://svn.debian.org/debian-live/dists/trunk/live-initramfs || true
@@ -21,7 +13,7 @@ build-stamp:
 	dh_testdir
 
 	# Building package
-	CFLAGS="$(CFLAGS)" $(MAKE)
+	$(MAKE)
 
 	touch build-stamp
 
@@ -49,34 +41,21 @@ install: build
 	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
-	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 -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-indep: 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_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 933ad53..55401ac 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,20 @@
+2007-07-26  Daniel Baumann  <daniel@debian.org>
+
+	* bin/live-md5check:
+	  - Removed, using standard md5sum which makes the md5 check slower,
+	    doesn't integrate well with usplash yet, but it makes live-initramfs
+	    architecture independent now.
+	* scripts/live:
+	  - Fixed typo.
+	  - Added live-media-path as suggested by Jordi Pujol
+	    <jordi_pujol@telefonica.net>.
+
+2007-07-19  Daniel Baumann  <daniel@debian.org>
+
+	* scripts/live, scripts/live-bottom/02_timezone:
+	  - Added utc boot parameter as suggested by Vladimir Stavrinov
+	    <vs@inist.ru>
+
 2007-07-18  Daniel Baumann  <daniel@debian.org>
 
 	* docs/parameters.txt:
diff --git a/docs/parameters.txt b/docs/parameters.txt
index 2399772..cde3d94 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.91.5-1 on 2007-07-23.
+Updated for live-initramfs 1.91.6-1 on 2007-07-23.
 
 These options (can be combined) work from the syslinux bootprompt:
 
@@ -43,6 +43,7 @@ live timezone=TIMEZONE
 live todisk=DEVICE
 live toram
 live union=unionfs|aufs
+live utc=yes|no
 live xdebconf
 live xvideomode=RESOLUTION
 
diff --git a/hooks/live b/hooks/live
index 0ed58d8..5e8bdc7 100755
--- a/hooks/live
+++ b/hooks/live
@@ -39,7 +39,6 @@ fi
 mkdir -p "${DESTDIR}"/lib/live-initramfs
 
 # Executables
-copy_exec /usr/lib/live-initramfs/live-md5check /bin
 copy_exec /usr/share/live-initramfs/live-reconfigure /bin
 copy_exec /usr/share/live-initramfs/live-preseed /bin
 
@@ -99,6 +98,9 @@ then
 	copy_exec /usr/bin/eject /bin
 fi
 
+# Program: md5sum
+copy_exec /usr/bin/md5sum /bin
+
 # Program: udev
 if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 then
diff --git a/manpages/live-initramfs.en.7 b/manpages/live-initramfs.en.7
index ddcaccb..5fe0cec 100644
--- a/manpages/live-initramfs.en.7
+++ b/manpages/live-initramfs.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-INITRAMFS 7 "2007\-07\-16" "1.91.5" "live\-initramfs"
+.TH LIVE\-INITRAMFS 7 "2007\-07\-23" "1.91.6" "live\-initramfs"
 
 .SH NAME
 live\-initramfs \- Debian Live initramfs hook
@@ -42,6 +42,8 @@ If you specify one of this two equivalent forms, live\-initramfs will first try
 live\-initramfs will mount the encrypted rootfs TYPE, asking the passphrase, useful to build paranoid live systems :\-). TYPE supported so far are "aes" for loop\-aes encryption type.
 .IP "\fBlive\-media\-offset=\fR\fIBYTES\fR" 4
 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\-path=\fR\fIPATH\fR" 4
+Sets the path to the live filesystem on the medium. By default, it is set to '/live' and you should not change that unless you have customized your media accordingly.
 .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 "\fB{locale|debian\-installer/locale}=\fR\fILOCALE\fR" 4
@@ -82,6 +84,8 @@ Adding this parameter, live\-initramfs will try to copy the entire read\-only me
 Adding this parameter, live\-initramfs will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media.
 .IP "\fBunion=\fRunionfs|aufs" 4
 By default, live-initramfs uses unionfs. With this parameter, you can switch to aufs.
+.IP "\fButc=\fRyes|no" 4
+By default, Debian systems do assume that the hardware clock is set to UTC. You can change or explicitly set it with this parameter.
 .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
diff --git a/manpages/live-snapshot.en.1 b/manpages/live-snapshot.en.1
index f4d7078..8380c0a 100644
--- a/manpages/live-snapshot.en.1
+++ b/manpages/live-snapshot.en.1
@@ -1,4 +1,4 @@
-.TH LIVE\-SNAPSHOT 1 "2007\-07\-16" "1.91.5" "live\-initramfs"
+.TH LIVE\-SNAPSHOT 1 "2007\-07\-23" "1.91.6" "live\-initramfs"
 
 .SH NAME
 live\-snapshot \- a simple script to ease persistence usage
diff --git a/scripts/live b/scripts/live
index 5b70b6a..d52ae7c 100755
--- a/scripts/live
+++ b/scripts/live
@@ -8,6 +8,7 @@ echo "/root/lib" >> /etc/ld.so.conf
 echo "/root/usr/lib" >> /etc/ld.so.conf
 
 mountpoint=/live/image
+LIVE_MEDIA_PATH="/live"
 
 root_persistence="live-rw"
 home_persistence="home-rw"
@@ -74,7 +75,7 @@ parse_cmdline ()
 				export USERFULLNAME LIVECONF
 				;;
 
-			ip*)
+			ip=*)
 				STATICIP=${x#ip=}
 
 				if [ -z "${STATICIP}" ]
@@ -130,6 +131,11 @@ parse_cmdline ()
 				export LIVE_MEDIA_OFFSET
 				;;
 
+			live-media-path=*)
+				LIVE_MEDIA_PATH="${x#live-media-path=}"
+				export LIVE_MEDIA_PATH
+				;;
+
 			live-media-timeout=*)
 				LIVE_MEDIA_TIMEOUT=${x#live-media-timeout=}
 				export LIVE_MEDIA_TIMEOUT
@@ -145,7 +151,7 @@ parse_cmdline ()
 				export MODULE
 				;;
 
-			netboot*)
+			netboot=*)
 				NETBOOT=${x#netboot=}
 				export NETBOOT
 				;;
@@ -228,6 +234,11 @@ parse_cmdline ()
 				export UNIONTYPE
 				;;
 
+			utc=*)
+				UTC="${x#utc=}"
+				export UTC
+				;;
+
 			xdebconf)
 				XDEBCONF="Yes"
 				export XDEBCONF
@@ -271,11 +282,11 @@ is_live_path()
 {
 	DIRECTORY="${1}"
 
-	if [ -d "${DIRECTORY}"/live ]
+	if [ -d "${DIRECTORY}"/"${LIVE_MEDIA_PATH}" ]
 	then
 		for FILESYSTEM in squashfs ext2 ext3 xfs dir
 		do
-			if [ "`echo ${DIRECTORY}/live/*.${FILESYSTEM}`" != "${DIRECTORY}/live/*.${FILESYSTEM}" ]
+			if [ "`echo ${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}`" != "${DIRECTORY}/${LIVE_MEDIA_PATH}/*.${FILESYSTEM}" ]
 			then
 				return 0
 			fi
@@ -312,11 +323,11 @@ match_files_in_dir() {
 mount_images_in_directory() {
     directory="$1"
     rootmnt="$2"
-    if match_files_in_dir "$directory/live/*.squashfs" ||
-        match_files_in_dir "$directory/live/*.ext2" ||
-        match_files_in_dir "$directory/live/*.ext3" ||
-        match_files_in_dir "$directory/live/*.dir"; then
-        setup_unionfs "$directory/live" "$rootmnt"
+    if match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.squashfs" ||
+        match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.ext2" ||
+        match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.ext3" ||
+        match_files_in_dir "$directory/${LIVE_MEDIA_PATH}/*.dir"; then
+        setup_unionfs "$directory/${LIVE_MEDIA_PATH}" "$rootmnt"
     else
         :
     fi
@@ -401,7 +412,7 @@ do_netmount() {
     . /tmp/net-${DEVICE}.conf
     export HOSTNAME
 
-    if [ "${NFSROOT#*:}" = "$NFSROOT" ]; then
+    if [ "${NFSROOT#*:}" = "$NFSROOT" ] && [ "$NETBOOT" != "cifs" ]; then
 	NFSROOT=${ROOTSERVER}:${NFSROOT}
     fi
 
diff --git a/scripts/live-bottom/01integrity_check b/scripts/live-bottom/01integrity_check
index b855b62..4ac847f 100755
--- a/scripts/live-bottom/01integrity_check
+++ b/scripts/live-bottom/01integrity_check
@@ -20,4 +20,7 @@ esac
 
 # live-initramfs script
 
-grep integrity-check /proc/cmdline && live-md5check /live/image /live/image/md5sum.txt < /dev/tty8
+grep -qs integrity-check /proc/cmdline || exit 0
+
+cd /live/image
+md5sum -c md5sum.txt < /dev/tty8
diff --git a/scripts/live-bottom/02_timezone b/scripts/live-bottom/02_timezone
index 10b634e..dad3cad 100755
--- a/scripts/live-bottom/02_timezone
+++ b/scripts/live-bottom/02_timezone
@@ -40,6 +40,11 @@ set tzdata/Areas Etc
 set tzdata/Zones/Etc UTC
 EOF
     cp -f /root/usr/share/zoneinfo/UTC /root/etc/localtime
-fi   
+fi
+
+if [ -n "${UTC}" ]
+then
+	sed -i -e "s/UTC=.*/UTC=${UTC}/" /root/etc/default/rcS
+fi
 
 log_end_msg