Dropping lb prefix from live-build scripts, not needed anymore.

Previously, we needed to keep the lb_* prefix as the scripts
could also be executed standalone. Since the lb wrapper is
mandatory since squeeze, we can drop this now.

1 files changed, 100 insertions, 0 deletions

diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
new file mode 100755
index 000000000..b82e3667a
--- /dev/null
+++ b/scripts/build/chroot_resolv
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+##
+## This program 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
+[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
+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 .build/config .build/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/resolv.conf"
+
+		# Checking stage file
+		Check_stagefile .build/chroot_resolv
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -e chroot/etc/resolv.conf ]
+		then
+			# Save resolv file or symlink
+			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+
+			# Also truncate it, otherwise we'll end up with the one
+			# created by debootstrap in the final image.
+			#
+			# If you want to have a custom resolv.conf, please
+			# overwrite it with normal local_includes mechanism.
+			Truncate chroot/etc/resolv.conf.orig
+		elif [ -L chroot/etc/resolv.conf ]
+		then
+			# Move resolv.conf aside if it's a symlink (likely resolvconf)
+			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+		fi
+
+		if [ -f /etc/resolv.conf ]
+		then
+			# Copy resolv file
+			cp /etc/resolv.conf chroot/etc/resolv.conf
+		fi
+
+		# Creating stage file
+		Create_stagefile .build/chroot_resolv
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/resolv.conf"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -e config/includes.chroot/etc/resolv.conf ]
+		then
+			# Copying local resolv.conf
+			cp -a config/includes.chroot/etc/resolv.conf chroot/etc/resolv.conf
+			rm -f chroot/etc/resolv.conf.orig
+		elif [ -e chroot/etc/resolv.conf.orig ] || [ -L chroot/etc/resolv.conf.orig ]
+		then
+			# Restoring resolv file or symlink
+			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
+		else
+			# Truncating resolv file
+			Truncate chroot/etc/resolv.conf
+		fi
+
+		# Removing stage file
+		rm -f .build/chroot_resolv
+		;;
+
+	*)
+		Usage
+		;;
+esac