[SCM] live-helper branch, debian-next, updated. debian/2.0_a11-1-2-gec572c7
Daniel Baumann
daniel at debian.org
Sat May 1 05:45:28 UTC 2010
The following commit has been merged in the debian-next branch:
commit ec572c7d15a50c0d5051ba72ec34515105be3d9b
Author: Daniel Baumann <daniel at debian.org>
Date: Sat May 1 07:39:49 2010 +0200
Renaming md5sum helpers to checksums.
diff --git a/helpers/binary b/helpers/binary
index 35c74de..9b15189 100755
--- a/helpers/binary
+++ b/helpers/binary
@@ -65,7 +65,7 @@ lh binary_win32-loader ${*}
lh binary_includes ${*}
lh binary_local-includes ${*}
lh binary_local-hooks ${*}
-lh binary_md5sum ${*}
+lh binary_checksums ${*}
if [ "${LH_CHROOT_BUILD}" != "true" ]
then
diff --git a/helpers/binary_md5sum b/helpers/binary_checksums
similarity index 89%
rename from helpers/binary_md5sum
rename to helpers/binary_checksums
index e9376c0..2c507ad 100755
--- a/helpers/binary_md5sum
+++ b/helpers/binary_checksums
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_binary_md5sum(1) - create binary md5sums
+# lh_binary_checksums(1) - create binary checksums
# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -13,7 +13,7 @@ set -e
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
-DESCRIPTION="$(Echo 'create binary md5sums')"
+DESCRIPTION="$(Echo 'create binary checksums')"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -34,7 +34,7 @@ Echo_message "Begin creating binary md5sum.txt..."
Require_stagefile .stage/config .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/binary_md5sum
+Check_stagefile .stage/binary_checksums
# Checking lock file
Check_lockfile .lock
@@ -70,4 +70,4 @@ find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.list
cd "${OLDPWD}"
# Creating stage file
-Create_stagefile .stage/binary_md5sum
+Create_stagefile .stage/binary_checksums
diff --git a/helpers/source b/helpers/source
index 512a923..8ba066b 100755
--- a/helpers/source
+++ b/helpers/source
@@ -38,7 +38,7 @@ lh chroot_sources install ${*}
lh source_debian-live ${*}
lh source_debian ${*}
lh source_disk ${*}
-lh source_md5sum ${*}
+lh source_checksums ${*}
# Building images
lh source_iso ${*}
diff --git a/helpers/source_md5sum b/helpers/source_checksums
similarity index 89%
rename from helpers/source_md5sum
rename to helpers/source_checksums
index 0a543e7..31895db 100755
--- a/helpers/source_md5sum
+++ b/helpers/source_checksums
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_md5sum(1) - create source md5sums
+# lh_source_checksums(1) - create source checksumss
# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -13,7 +13,7 @@ set -e
. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
# Setting static variables
-DESCRIPTION="$(Echo 'create source md5sums')"
+DESCRIPTION="$(Echo 'create source checksums')"
HELP=""
USAGE="${PROGRAM} [--force]"
@@ -39,7 +39,7 @@ Echo_message "Begin creating source md5sum.txt..."
Require_stagefile .stage/config .stage/source_debian
# Checking stage file
-Check_stagefile .stage/source_md5sum
+Check_stagefile .stage/source_checksums
# Checking lock file
Check_lockfile .lock
@@ -75,4 +75,4 @@ find . | sed -e 's|^.||g' | grep "^/" | sort > ../source.list
cd "${OLDPWD}"
# Creating stage file
-Create_stagefile .stage/source_md5sum
+Create_stagefile .stage/source_checksums
diff --git a/manpages/lh_chroot_selinuxfs.en.1 b/manpages/lh_binary_checksums.en.1
similarity index 65%
copy from manpages/lh_chroot_selinuxfs.en.1
copy to manpages/lh_binary_checksums.en.1
index 589fa4f..96c6c63 100644
--- a/manpages/lh_chroot_selinuxfs.en.1
+++ b/manpages/lh_binary_checksums.en.1
@@ -1,19 +1,19 @@
-.TH LH_CHROOT_COPY 1 "2009\-06\-14" "1.0.5" "live\-helper"
+.TH LH_BINARY_CHECKSUMS 1 "2009\-06\-14" "1.0.5" "live\-helper"
.SH NAME
-lh_chroot_selinuxfs \- mount /selinux
+lh_binary_checksums \- create binary checksums
.SH SYNOPSIS
-\fBlh_chroot_selinuxfs\fR [\fIlive\-helper options\fR]
+\fBlh_binary_checksums\fR [\fIlive\-helper options\fR]
.SH DESCRIPTION
-lh_chroot_selinuxfs is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It mounts /selinux.
+lh_binary_checksums is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It creates binary checksums (md5, sha1, and/or sha256).
.SH OPTIONS
-lh_chroot_selinuxfs has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
+lh_binary_checksums has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
.SH SEE ALSO
-\fIlh_chroot\fR(1)
+\fIlh_binary\fR(1)
.br
\fIlive\-helper\fR(7)
.PP
diff --git a/manpages/lh_binary_md5sum.en.1 b/manpages/lh_binary_md5sum.en.1
deleted file mode 100644
index e8304f2..0000000
--- a/manpages/lh_binary_md5sum.en.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH LH_BINARY_MD5SUM 1 "2009\-06\-14" "1.0.5" "live\-helper"
-
-.SH NAME
-lh_binary_md5sum \- create binary md5sums
-
-.SH SYNOPSIS
-\fBlh_binary_md5sum\fR [\fIlive\-helper options\fR]
-
-.SH DESCRIPTION
-lh_binary_md5sum is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It creates binary md5sums.
-
-.SH OPTIONS
-lh_binary_md5sum has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
-
-.SH SEE ALSO
-\fIlh_binary\fR(1)
-.br
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
-
-.SH BUGS
-Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.
diff --git a/manpages/lh_config.en.1 b/manpages/lh_config.en.1
index b4c0ef9..1d5985d 100644
--- a/manpages/lh_config.en.1
+++ b/manpages/lh_config.en.1
@@ -258,8 +258,8 @@ defines if downloaded package indices and lists should be cached which is false
defines if downloaded packages files should be cached which is true by default. Disabling it does save space consumtion in your build directory, but remember that you will cause much unnecessary traffic if you do a couple of rebuilds. In general you should always leave it true, however, in some particular rare build setups, it can be faster to refetch packages from the local network mirror rather than to utilize the local disk.
.IP "\fB\-\-cache\-stages\fR true|false|\fISTAGE\fR|""\fISTAGES\fR""" 4
sets which stages should be cached. By default set to bootstrap. As an exception to the normal stage names, also rootfs can be used here which does only cache the generated root filesystem in filesystem.{dir,ext*,squashfs}. This is useful during development if you want to rebuild the binary stage but not regenerate the root filesystem all the time.
-.IP "\fB\-\-checksums\fR true|false" 4
-defines if the binary image should contain a file called md5sums.txt that lists all files on the image together with their md5 checksums. This in turn can be used by live-initramfs' built-in integrity-check to verify the medium if specified at boot prompt. In general, this should not be false and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums.
+.IP "\fB\-\-checksums\fR true|false|md5|sha1|sha256" 4
+defines if the binary image should contain a file called md5sums.txt, sha1sums.txt or sha256sums.txt. These lists all files on the image together with their checksums. This in turn can be used by live-initramfs' built-in integrity-check to verify the medium if specified at boot prompt. In general, this should not be false and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums.
.IP "\fB\-\-chroot\-build\fR true|false" 4
defines whetever live-helper should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|squashfs|plain|jffs2" 4
diff --git a/manpages/lh_binary_debian-installer.en.1 b/manpages/lh_source_checksums.en.1
similarity index 64%
copy from manpages/lh_binary_debian-installer.en.1
copy to manpages/lh_source_checksums.en.1
index c3d20b0..5985c47 100644
--- a/manpages/lh_binary_debian-installer.en.1
+++ b/manpages/lh_source_checksums.en.1
@@ -1,19 +1,19 @@
-.TH LH_BINARY_DEBIAN_INSTALLER 1 "2009\-06\-14" "1.0.5" "live\-helper"
+.TH LH_SOURCE_CHECKSUMS 1 "2009\-06\-14" "1.0.5" "live\-helper"
.SH NAME
-lh_binary_debian\-installer \- install debian-installer into binary
+lh_source_checksums \- create source checksums
.SH SYNOPSIS
-\fBlh_binary_debian\-installer\fR [\fIlive\-helper options\fR]
+\fBlh_source_checksums\fR [\fIlive\-helper options\fR]
.SH DESCRIPTION
-lh_binary_debian\-installer is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It installs debian-installer into binary.
+lh_source_checksums is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It creates source checksums (md5, sha1, and/or sha256).
.SH OPTIONS
-lh_binary_debian\-installer has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
+lh_source_checksums sources has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
.SH SEE ALSO
-\fIlh_binary\fR(1)
+\fIlh_source\fR(1)
.br
\fIlive\-helper\fR(7)
.PP
diff --git a/manpages/lh_source_md5sum.en.1 b/manpages/lh_source_md5sum.en.1
deleted file mode 100644
index ac6d295..0000000
--- a/manpages/lh_source_md5sum.en.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH LH_SOURCE_MD5SUM 1 "2009\-06\-14" "1.0.5" "live\-helper"
-
-.SH NAME
-lh_source_md5sum \- create source md5sum
-
-.SH SYNOPSIS
-\fBlh_source_md5sum\fR [\fIlive\-helper options\fR]
-
-.SH DESCRIPTION
-lh_source_md5sum is a low\-level command (plumbing) of live\-helper, the Debian Live tool suite. It creates source md5sum.
-
-.SH OPTIONS
-lh_source_md5sum sources has no specific options but understands all generic live\-helper options. See \fIlive\-helper\fR(7) for a complete list of all generic live\-helper options.
-
-.SH SEE ALSO
-\fIlh_source\fR(1)
-.br
-\fIlive\-helper\fR(7)
-.PP
-This program is a part of live\-helper.
-
-.SH HOMEPAGE
-More information about live\-helper and the Debian Live project can be found in the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
-
-.SH BUGS
-Report bugs by submitting a bugreport for the live\-helper package in the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fR> or write a mail to the mailinglist at <\fIdebian-live at lists.debian.org\fR>.
-
-.SH AUTHOR
-live\-helper was written by Daniel Baumann <\fIdaniel at debian.org\fR> for the Debian project.
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index f119dfa..32365dd 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -175,8 +175,8 @@ copy files into binary
install local packages lists into binary
.IP "\fBlh_binary_manifest\fR(1)" 4
create manifest
-.IP "\fBlh_binary_md5sum\fR(1)" 4
-create binary md5sums
+.IP "\fBlh_binary_checksums\fR(1)" 4
+create binary checksums (md5, sha1, and/or sha256)
.IP "\fBlh_binary_memtest\fR(1)" 4
installs a memtest into binary
.IP "\fBlh_binary_net\fR(1)" 4
@@ -206,8 +206,8 @@ copy debian-live config into source
install disk information into source
.IP "\fBlh_source_iso\fR(1)" 4
build iso source image
-.IP "\fBlh_source_md5sum\fR(1)" 4
-create source md5sum
+.IP "\fBlh_source_checksums\fR(1)" 4
+create source checksums (md5, sha1, and/or sha256)
.IP "\fBlh_source_net\fR(1)" 4
build source net image
.IP "\fBlh_source_tar\fR(1)" 4
diff --git a/manpages/po4a/de/lh_binary_md5sum.en.1.po b/manpages/po4a/de/lh_binary_checksums.en.1.po
similarity index 100%
rename from manpages/po4a/de/lh_binary_md5sum.en.1.po
rename to manpages/po4a/de/lh_binary_checksums.en.1.po
diff --git a/manpages/po4a/de/lh_source_md5sum.en.1.po b/manpages/po4a/de/lh_source_checksums.en.1.po
similarity index 100%
rename from manpages/po4a/de/lh_source_md5sum.en.1.po
rename to manpages/po4a/de/lh_source_checksums.en.1.po
diff --git a/manpages/po4a/fr/lh_binary_md5sum.en.1.po b/manpages/po4a/fr/lh_binary_checksums.en.1.po
similarity index 100%
rename from manpages/po4a/fr/lh_binary_md5sum.en.1.po
rename to manpages/po4a/fr/lh_binary_checksums.en.1.po
diff --git a/manpages/po4a/fr/lh_source_md5sum.en.1.po b/manpages/po4a/fr/lh_source_checksums.en.1.po
similarity index 100%
rename from manpages/po4a/fr/lh_source_md5sum.en.1.po
rename to manpages/po4a/fr/lh_source_checksums.en.1.po
diff --git a/manpages/po4a/pot/lh_binary_md5sum.en.1.pot b/manpages/po4a/pot/lh_binary_checksums.en.1.pot
similarity index 100%
rename from manpages/po4a/pot/lh_binary_md5sum.en.1.pot
rename to manpages/po4a/pot/lh_binary_checksums.en.1.pot
diff --git a/manpages/po4a/pot/lh_source_md5sum.en.1.pot b/manpages/po4a/pot/lh_source_checksums.en.1.pot
similarity index 100%
rename from manpages/po4a/pot/lh_source_md5sum.en.1.pot
rename to manpages/po4a/pot/lh_source_checksums.en.1.pot
--
live-helper
More information about the debian-live-changes
mailing list