Replacing lb_chroot_symlinks with a hook, that's more approriate.

4 files changed, 2 insertions, 72 deletions

diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index 09e18757a..2fe7283a9 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -67,7 +67,6 @@ lb chroot_local-patches ${*}
 lb chroot_sysvinit ${*}
 lb chroot_local-hooks ${*}
 lb chroot_hooks ${*}
-lb chroot_symlinks ${*}
 lb chroot_hacks ${*}
 lb chroot_interactive ${*}
 
diff --git a/scripts/build/lb_chroot_interactive b/scripts/build/lb_chroot_interactive
index 82e5a6c4b..7fd5cd4ab 100755
--- a/scripts/build/lb_chroot_interactive
+++ b/scripts/build/lb_chroot_interactive
@@ -59,4 +59,4 @@ case "${LB_INTERACTIVE}" in
 esac
 
 # Creating stage file
-Create_stagefile .stage/chroot_symlinks
+Create_stagefile .stage/chroot_interactive
diff --git a/scripts/build/lb_chroot_symlinks b/scripts/build/lb_chroot_symlinks
deleted file mode 100755
index b9150bbe5..000000000
--- a/scripts/build/lb_chroot_symlinks
+++ /dev/null
@@ -1,59 +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 'convert symlinks')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LB_SYMLINKS}" != "true" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin converting symlinks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_symlinks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/symlinks symlinks
-
-# Installing depends
-Install_package
-
-# Converting symlinks
-Chroot chroot "symlinks -c -r -s /"
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index f46b82932..3d0583ea5 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -121,7 +121,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--security true|false]\n\
 \t    [--source true|false]\n\
 \t    [-s|--source-images iso|net|tar|usb-hdd]\n\
-\t    [--symlinks true|false]\n\
 \t    [--syslinux-splash FILE]\n\
 \t    [--syslinux-timeout SECONDS]\n\
 \t    [--syslinux-menu true|false]\n\
@@ -147,7 +146,7 @@ Local_arguments ()
 		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-chroot-backports:,mirror-binary:,
 		mirror-binary-security:,mirror-binary-volatile:,mirror-binary-backports:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
 		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
-		packages:,packages-lists:,tasks:,security:,volatile:,backports:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
+		packages:,packages-lists:,tasks:,security:,volatile:,backports:,sysvinit:,binary-filesystem:,binary-images:,
 		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
@@ -522,11 +521,6 @@ Local_arguments ()
 				shift 2
 				;;
 
-			--symlinks)
-				LB_SYMLINKS="${2}"
-				shift 2
-				;;
-
 			--sysvinit)
 				LB_SYSVINIT="${2}"
 				shift 2
@@ -1122,10 +1116,6 @@ LB_VOLATILE="${LB_VOLATILE}"
 # (Default: ${LB_BACKPORTS})
 LB_BACKPORTS="${LB_BACKPORTS}"
 
-# \$LB_SYMLINKS: enable symlink convertion
-# (Default: ${LB_SYMLINKS})
-LB_SYMLINKS="${LB_SYMLINKS}"
-
 # \$LB_SYSVINIT: enable sysvinit
 # (Default: ${LB_SYSVINIT})
 LB_SYSVINIT="${LB_SYSVINIT}"