summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-10-28 09:40:35 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:27 +0100
commitbd7ecce4cb2a66482a3f80ba8934a10f1f7510b7 (patch)
tree1ca5b2c66418b1a4749b42f7150a00f90290205b
parentde295056af76fe9b9158668493e8b25f8c63a647 (diff)
downloadlive-build-bd7ecce4cb2a66482a3f80ba8934a10f1f7510b7.zip
live-build-bd7ecce4cb2a66482a3f80ba8934a10f1f7510b7.tar.gz
Removing dpkg-tmpfs hack, this is too intrusive atm.
-rwxr-xr-xscripts/build/lb_chroot2
-rwxr-xr-xscripts/build/lb_chroot_dpkg_tmpfs75
2 files changed, 0 insertions, 77 deletions
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 09e1875..aedfc5f 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -42,7 +42,6 @@ lb chroot_selinuxfs install ${*}
lb chroot_sysfs install ${*}
lb chroot_debianchroot install ${*}
lb chroot_dpkg install ${*}
-lb chroot_dpkg_tmpfs install ${*}
lb chroot_sysv-rc install ${*}
lb chroot_upstart install ${*}
lb chroot_hosts install ${*}
@@ -80,7 +79,6 @@ lb chroot_resolv remove ${*}
lb chroot_hosts remove ${*}
lb chroot_sysv-rc remove ${*}
lb chroot_upstart remove ${*}
-lb chroot_dpkg_tmpfs remove ${*}
lb chroot_dpkg remove ${*}
lb chroot_debianchroot remove ${*}
lb chroot_sysfs remove ${*}
diff --git a/scripts/build/lb_chroot_dpkg_tmpfs b/scripts/build/lb_chroot_dpkg_tmpfs
deleted file mode 100755
index db3b8bf..0000000
--- a/scripts/build/lb_chroot_dpkg_tmpfs
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-##
-## live-build comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-# Including common functions
-. "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /var/lib/dpkg')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
- install)
- Echo_message "Configuring tmpfs for /var/lib/dpkg"
-
- # Checking stage file
- Check_stagefile .stage/chroot_dpkg_tmpfs
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- mv chroot/var/lib/dpkg chroot/var/lib/dpkg.tmp
- mkdir chroot/var/lib/dpkg
- mount -t tmpfs tmpfs chroot/var/lib/dpkg
- mv chroot/var/lib/dpkg.tmp/* chroot/var/lib/dpkg
- rm -rf chroot/var/lib/dpkg.tmp
-
- # Creating stage file
- Create_stagefile .stage/chroot_dpkg_tmpfs
- ;;
-
- remove)
- Echo_message "Deconfiguring tmpfs for /var/lib/dpkg"
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- mkdir -p chroot/var/lib/dpkg.tmp
- mv chroot/var/lib/dpkg/* chroot/var/lib/dpkg.tmp
- umount chroot/var/lib/dpkg
- rm -rf chroot/var/lib/dpkg
- mv chroot/var/lib/dpkg.tmp chroot/var/lib/dpkg
-
- # Removing stage file
- rm -f .stage/chroot_dpkg_tmpfs
- ;;
-
- *)
- Usage
- ;;
-esac