diff options
| -rwxr-xr-x | scripts/build/lb_chroot | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_preseed (renamed from scripts/build/lb_chroot_local-preseed) | 9 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index 072cc9885..8f28c84e5 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -53,7 +53,7 @@ lb chroot_archives chroot install ${*} # Customizing chroot lb chroot_linux-image ${*} -lb chroot_local-preseed ${*} +lb chroot_preseed ${*} for _PASS in install live do diff --git a/scripts/build/lb_chroot_local-preseed b/scripts/build/lb_chroot_preseed index d37f5ebc7..baeced847 100755 --- a/scripts/build/lb_chroot_local-preseed +++ b/scripts/build/lb_chroot_preseed @@ -30,7 +30,7 @@ Echo_message "Begin executing local preseeds..." Require_stagefile .stage/config .stage/bootstrap # Checking stage file -Check_stagefile .stage/chroot_local-preseed +Check_stagefile .stage/chroot_preseed # Checking lock file Check_lockfile .lock @@ -38,7 +38,8 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if Find_files config/chroot_local-preseed/* +if ls config/preseed/*.preseed > /dev/null 2>&1 || \ + ls config/preseed/*.preseed.chroot > /dev/null 2>&1 then # Check dependency Check_package chroot/usr/bin/debconf-set-selections debconf @@ -46,7 +47,7 @@ then # Install dependency Install_package - for PRESEED in config/chroot_local-preseed/* + for PRESEED in config/chroot_preseed/*.preseed config/chroot_preseed/*.preseed.chroot do # Copying local preseed cp "${PRESEED}" chroot/root/preseed @@ -61,5 +62,5 @@ then Remove_package # Creating stage file - Create_stagefile .stage/chroot_local-preseed + Create_stagefile .stage/chroot_preseed fi diff --git a/scripts/build/lb_config b/scripts/build/lb_config index f015fe86e..acf854973 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -198,7 +198,7 @@ Local_arguments () Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source # Dump contents of directories that contain text files - for DIRECTORY in config/package-lists config/task-lists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs + for DIRECTORY in config/package-lists config/task-lists config/chroot_apt config/chroot_local-patches config/preseed config/binary_rootfs do if Find_files "${DIRECTORY}" then @@ -1172,7 +1172,7 @@ mkdir -p config/chroot_local-patches mkdir -p config/packages mkdir -p config/packages.chroot mkdir -p config/package-lists -mkdir -p config/chroot_local-preseed +mkdir -p config/preseed mkdir -p config/task-lists cat > config/chroot << EOF @@ -1422,7 +1422,7 @@ then then Echo_warning "Please install 'debconf-utils' in order to use this feature." else - debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system + debconf-get-selections | grep -v deinstall | cut -f1 > config/preseed/local.preseed.chroot fi fi |