[Debian-live-changes] r1039 - dists/trunk/live-helper/helpers
Daniel Baumann
daniel at alioth.debian.org
Thu Apr 12 08:04:55 UTC 2007
Author: daniel
Date: 2007-04-12 08:04:54 +0000 (Thu, 12 Apr 2007)
New Revision: 1039
Modified:
dists/trunk/live-helper/helpers/lh_binary_chroot
dists/trunk/live-helper/helpers/lh_binary_encryption
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_hdd
dists/trunk/live-helper/helpers/lh_binary_includes
dists/trunk/live-helper/helpers/lh_binary_iso
dists/trunk/live-helper/helpers/lh_binary_linuximage
dists/trunk/live-helper/helpers/lh_binary_localincludes
dists/trunk/live-helper/helpers/lh_binary_manifest
dists/trunk/live-helper/helpers/lh_binary_md5sum
dists/trunk/live-helper/helpers/lh_binary_memtest86
dists/trunk/live-helper/helpers/lh_binary_net
dists/trunk/live-helper/helpers/lh_binary_rootfs
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/helpers/lh_binary_usb
dists/trunk/live-helper/helpers/lh_binary_yaboot
dists/trunk/live-helper/helpers/lh_chroot_apt
dists/trunk/live-helper/helpers/lh_chroot_debianchroot
dists/trunk/live-helper/helpers/lh_chroot_hosts
dists/trunk/live-helper/helpers/lh_chroot_interactive
dists/trunk/live-helper/helpers/lh_chroot_linuximage
dists/trunk/live-helper/helpers/lh_chroot_proc
dists/trunk/live-helper/helpers/lh_chroot_resolv
dists/trunk/live-helper/helpers/lh_chroot_sources
dists/trunk/live-helper/helpers/lh_chroot_symlinks
dists/trunk/live-helper/helpers/lh_chroot_sysfs
dists/trunk/live-helper/helpers/lh_chroot_sysvinit
dists/trunk/live-helper/helpers/lh_chroot_sysvrc
dists/trunk/live-helper/helpers/lh_source_config
dists/trunk/live-helper/helpers/lh_source_download
dists/trunk/live-helper/helpers/lh_source_generic
dists/trunk/live-helper/helpers/lh_source_hdd
dists/trunk/live-helper/helpers/lh_source_iso
dists/trunk/live-helper/helpers/lh_source_md5sum
dists/trunk/live-helper/helpers/lh_source_net
dists/trunk/live-helper/helpers/lh_source_usb
Log:
Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_chroot
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_chroot
-
# Removing old chroot
rm -rf chroot/chroot
rm -rf chroot.tmp
Modified: dists/trunk/live-helper/helpers/lh_binary_encryption
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_encryption 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_encryption 2007-04-12 08:04:54 UTC (rev 1039)
@@ -42,15 +42,15 @@
Require_stagefile .stage/bootstrap
Require_stagefile .stage/binary_rootfs
+# Checking stage file
+Check_stagefile .stage/binary_encryption
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_encryption
-
case "${LIVE_FILESYSTEM}" in
ext2)
ROOTFS="ext2"
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
then
Echo_warning "skipping binary_grub, foreign architecture."
Modified: dists/trunk/live-helper/helpers/lh_binary_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_hdd 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_hdd 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+ # Checking stage file
+ Check_stagefile .stage/binary_hdd
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/binary_hdd
-
# Remove old binary
if [ -f binary-hdd.tar.gz ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_includes 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
# Check includes
if [ ! -d "${LIVE_INCLUDES}" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_iso 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_iso 2007-04-12 08:04:54 UTC (rev 1039)
@@ -40,15 +40,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+ # Checking stage file
+ Check_stagefile .stage/binary_iso
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/binary_iso
-
if [ ! -f chroot/usr/bin/"${LH_GENISOIMAGE}" ]
then
PACKAGES="${PACKAGES} ${LH_GENISOIMAGE}"
Modified: dists/trunk/live-helper/helpers/lh_binary_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linuximage 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_linuximage 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_linuximage
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_linuximage
-
# Removing initrd backup files
rm -f chroot/boot/initrd*bak*
Modified: dists/trunk/live-helper/helpers/lh_binary_localincludes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_localincludes 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_localincludes 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_localincludes
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_localincludes
-
if ls config/binary_localincludes/* &> /dev/null
then
# Copying includes
Modified: dists/trunk/live-helper/helpers/lh_binary_manifest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_manifest 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_manifest 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_manifest
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_manifest
-
# Add filesystem.manifest
Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/casper/filesystem.manifest
Modified: dists/trunk/live-helper/helpers/lh_binary_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_md5sum 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_md5sum 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_md5sum
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_md5sum
-
# Remove old md5sums
if [ -f binary/md5sum.txt ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest86
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest86 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest86 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_memtest86
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_memtest86
-
if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
then
echo "W: skipping binary_memtest86, foreign architecture."
Modified: dists/trunk/live-helper/helpers/lh_binary_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_net 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_net 2007-04-12 08:04:54 UTC (rev 1039)
@@ -40,15 +40,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+ # Checking stage file
+ Check_stagefile .stage/binary_net
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/binary_net
-
# Remove old binary
if [ -f binary-net.tar.gz ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs 2007-04-12 08:04:54 UTC (rev 1039)
@@ -37,15 +37,15 @@
Require_stagefile .stage/bootstrap
Require_stagefile .stage/binary_chroot
+# Checking stage file
+Check_stagefile .stage/binary_rootfs
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_rootfs
-
# Creating directory
if [ ! -d binary/casper ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_syslinux
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_syslinux
-
if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
then
echo "W: skipping binary_syslinux, foreign architecture."
Modified: dists/trunk/live-helper/helpers/lh_binary_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
Require_stagefile .stage/bootstrap
Require_stagefile .stage/chroot_proc
+ # Checking stage file
+ Check_stagefile .stage/binary_usb
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/binary_usb
-
if [ ! -f chroot/sbin/mkdosfs ]
then
PACKAGES="${PACKAGES} dosfstools"
Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/binary_yaboot
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/binary_yaboot
-
if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
then
echo "W: skipping binary_yaboot, foreign architecture."
Modified: dists/trunk/live-helper/helpers/lh_chroot_apt
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_apt 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_apt 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_apt
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ ! -d chroot/etc/apt/apt.conf.d ]
then
mkdir -p chroot/etc/apt/apt.conf.d
@@ -105,6 +105,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
# Deconfiguring aptitude ftp proxy
rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
Modified: dists/trunk/live-helper/helpers/lh_chroot_debianchroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_debianchroot 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_debianchroot 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_debianchroot
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/debian_chroot ]
then
# Save chroot file
@@ -61,6 +61,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/debian_chroot.orig ]
then
# Restore chroot file
Modified: dists/trunk/live-helper/helpers/lh_chroot_hosts
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hosts 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_hosts 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_hosts
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/hosts ]
then
# Save hosts file
@@ -64,6 +64,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/hosts.orig ]
then
# Restore hosts file
Modified: dists/trunk/live-helper/helpers/lh_chroot_interactive
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_interactive 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_interactive 2007-04-12 08:04:54 UTC (rev 1039)
@@ -33,40 +33,37 @@
Breakpoint "chroot_interactive: Init"
-if [ "${LIVE_INTERACTIVE}" != "disabled" ]
+if [ "${LIVE_INTERACTIVE}" = "disabled" ]
then
- # Requiring stage file
- Require_stagefile .stage/bootstrap
+ exit 0
+fi
- # Checking lock file
- Check_lockfile .lock
+# Requiring stage file
+Require_stagefile .stage/bootstrap
- # Creating lock file
- Create_lockfile .lock
+# Checking stage file
+Check_stagefile .stage/chroot_interactive
- # Checking stage file
- Check_stagefile .stage/chroot_interactive
+# Checking lock file
+Check_lockfile .lock
- case "${LIVE_INTERACTIVE}" in
- enabled|shell)
- echo "Pausing build: starting interactive shell..."
+# Creating lock file
+Create_lockfile .lock
+case "${LIVE_INTERACTIVE}" in
+ enabled|shell)
+ echo "Pausing build: starting interactive shell..."
Chroot "/bin/bash --login"
- ;;
-
+ ;;
x11)
- echo "Pausing build: starting interactive X11..."
-
+ echo "Pausing build: starting interactive X11..."
Chroot "startx"
- ;;
-
+ ;;
xnest)
- echo "Pausing build: starting interactive Xnest..."
-
+ echo "Pausing build: starting interactive Xnest..."
#Chroot "" # FIXME
- ;;
- esac
+ ;;
+esac
- # Creating stage file
- Create_stagefile .stage/chroot_symlinks
-fi
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
Modified: dists/trunk/live-helper/helpers/lh_chroot_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_linuximage 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_linuximage 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_linuximage
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/kernel-img.conf ]
then
# Saving kernel-img.conf
@@ -89,6 +89,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/kernel-img.conf.old ]
then
# Restoring kernel-img.conf file
Modified: dists/trunk/live-helper/helpers/lh_chroot_proc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_proc 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_proc 2007-04-12 08:04:54 UTC (rev 1039)
@@ -39,17 +39,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_proc
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ ! -d chroot/proc ]
then
# Creating mountpoint
@@ -64,6 +64,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
# Workaround binfmt-support /proc locking
if [ -e chroot/proc/sys/fs/binftm_misc/status ]
then
Modified: dists/trunk/live-helper/helpers/lh_chroot_resolv
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_resolv 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_resolv
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/resolv.conf ]
then
# Save resolv file
@@ -64,6 +64,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/etc/resolv.conf.orig ]
then
# Restore resolv file
Modified: dists/trunk/live-helper/helpers/lh_chroot_sources
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sources 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_sources 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_sources
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
# Configure custom sources.list
echo "deb ${LIVE_MIRROR_BUILD} ${LIVE_DISTRIBUTION} ${LIVE_SECTIONS}" > chroot/etc/apt/sources.list
@@ -129,6 +129,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
# Configure generic indices
if [ "${LH_APT_GENERIC}" = "enabled" ]
then
Modified: dists/trunk/live-helper/helpers/lh_chroot_symlinks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_symlinks 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/chroot_symlinks
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/chroot_symlinks
-
if [ "${LIVE_SYMLINKS}" = "enabled" ]
then
if [ -f chroot/usr/bin/symlinks ]
Modified: dists/trunk/live-helper/helpers/lh_chroot_sysfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysfs 2007-04-12 08:04:54 UTC (rev 1039)
@@ -39,17 +39,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_sysfs
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ ! -d chroot/sys ]
then
# Create mountpoint
@@ -64,6 +64,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
# Unmounting /sys
#fuser -km chroot/sys
umount chroot/sys > /dev/null 2>&1
Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvinit
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvinit 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvinit 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,15 +36,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/chroot_sysvinit
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/chroot_sysvinit
-
if [ "${LIVE_SYSVINIT}" = "enabled" ]
then
# Disable all
Modified: dists/trunk/live-helper/helpers/lh_chroot_sysvrc
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_sysvrc 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_chroot_sysvrc 2007-04-12 08:04:54 UTC (rev 1039)
@@ -36,17 +36,17 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
case "${1}" in
install)
# Checking stage file
Check_stagefile .stage/chroot_sysvrc
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/usr/sbin/policy-rc.d ]
then
# Save policy-rc.d file
@@ -70,6 +70,12 @@
;;
remove)
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
if [ -f chroot/usr/sbin/policy-rc.d.orig ]
then
# Restore policy-rc.d file
Modified: dists/trunk/live-helper/helpers/lh_source_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_config 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_config 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/source_config
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/source_config
-
# Remove old sources
if [ -d source/debian-live ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_download
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_download 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_download 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/bootstrap
+# Checking stage file
+Check_stagefile .stage/source_download
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/source_download
-
# Remove old sources
if [ -d source/debian ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_generic
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_generic 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_generic 2007-04-12 08:04:54 UTC (rev 1039)
@@ -45,15 +45,15 @@
# Requiring stage file
Require_stagefile .stage/source_download
+ # Checking stage file
+ Check_stagefile .stage/source_generic
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/source_generic
-
# Remove old source
if [ -f source.tar ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_hdd
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_hdd 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_hdd 2007-04-12 08:04:54 UTC (rev 1039)
@@ -45,15 +45,15 @@
# Requiring stage file
Require_stagefile .stage/source_download
+ # Checking stage file
+ Check_stagefile .stage/source_hdd
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/source_hdd
-
# Remove old source
if [ -f source-hdd.tar.gz ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_iso
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_iso 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_iso 2007-04-12 08:04:54 UTC (rev 1039)
@@ -45,15 +45,15 @@
# Requiring stage file
Require_stagefile .stage/source_download
+ # Checking stage file
+ Check_stagefile .stage/source_iso
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/source_iso
-
# Remove old source
if [ -f source.iso ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_md5sum
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_md5sum 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_md5sum 2007-04-12 08:04:54 UTC (rev 1039)
@@ -41,15 +41,15 @@
# Requiring stage file
Require_stagefile .stage/source_download
+# Checking stage file
+Check_stagefile .stage/source_md5sum
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Checking stage file
-Check_stagefile .stage/source_md5sum
-
# Remove old md5sums
if [ -f source/md5sum.txt ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_net
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_net 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_net 2007-04-12 08:04:54 UTC (rev 1039)
@@ -45,15 +45,15 @@
# Requiring stage file
Require_stagefile .stage/source_download
+ # Checking stage file
+ Check_stagefile .stage/source_net
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/source_net
-
# Remove old source
if [ -f source-net.tar.gz ]
then
Modified: dists/trunk/live-helper/helpers/lh_source_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb 2007-04-12 07:47:55 UTC (rev 1038)
+++ dists/trunk/live-helper/helpers/lh_source_usb 2007-04-12 08:04:54 UTC (rev 1039)
@@ -45,15 +45,15 @@
# Requiring stage file
Require_stagefile .stage/source_download
+ # Checking stage file
+ Check_stagefile .stage/source_usb
+
# Checking lock file
Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
- # Checking stage file
- Check_stagefile .stage/source_usb
-
if [ ! -f chroot/sbin/mkdosfs ]
then
PACKAGES="${PACKAGES} dosfstools"
More information about the Debian-live-changes
mailing list