diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-15 22:01:17 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-15 22:01:51 +0200 |
| commit | cfb6ecedfa5f923296c6ab23b7d1e8ec60f0f156 (patch) | |
| tree | 67598786284987d2be9a4b8cd9fccf773f7aa75f /scripts | |
| parent | e26d3be01aed013cd9a439240c28fa16c8bb272d (diff) | |
| download | vyos-live-build-cfb6ecedfa5f923296c6ab23b7d1e8ec60f0f156.tar.gz vyos-live-build-cfb6ecedfa5f923296c6ab23b7d1e8ec60f0f156.zip | |
Since we don't have global tasks anymore, renaming lb_chroot_local-tasklists to lb_chroot_task-lists.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_chroot | 2 | ||||
| -rwxr-xr-x | scripts/build/lb_chroot_task-lists (renamed from scripts/build/lb_chroot_local-tasklists) | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot index b7c27139e..b112b3d43 100755 --- a/scripts/build/lb_chroot +++ b/scripts/build/lb_chroot @@ -62,7 +62,7 @@ do lb chroot_local-packagelists ${_PASS} ${*} lb chroot_local-packages ${_PASS} ${*} lb chroot_install-packages ${_PASS} ${*} - lb chroot_local-tasklists ${_PASS} ${*} + lb chroot_task-lists ${_PASS} ${*} if [ "${_PASS}" = install ] then diff --git a/scripts/build/lb_chroot_local-tasklists b/scripts/build/lb_chroot_task-lists index 8291395b6..82aa225ea 100755 --- a/scripts/build/lb_chroot_local-tasklists +++ b/scripts/build/lb_chroot_task-lists @@ -14,7 +14,7 @@ set -e . "${LB_BASE:-/usr/share/live/build}"/scripts/build.sh # Setting static variables -DESCRIPTION="$(Echo 'install local task lists into chroot')" +DESCRIPTION="$(Echo 'install task lists into chroot')" HELP="" USAGE="${PROGRAM} {install|live} [--force]" @@ -27,13 +27,13 @@ Arguments "${@}" Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source Set_defaults -Echo_message "Begin installation of local task lists (${_PASS} pass)..." +Echo_message "Begin installation of task lists (${_PASS} pass)..." # Requiring stage file Require_stagefile .stage/config .stage/bootstrap # Checking stage file -Check_stagefile .stage/chroot_local-tasklists.${_PASS} +Check_stagefile .stage/chroot_task-lists.${_PASS} # Checking lock file Check_lockfile .lock @@ -48,7 +48,7 @@ then do if [ -e "${LIST}" ] then - # Generating local task list + # Generating task list Expand_packagelist "$(basename ${LIST})" "config/task-lists" \ >> chroot/root/chroot_tasks fi @@ -144,5 +144,5 @@ then Save_cache cache/packages_chroot # Creating stage file - Create_stagefile .stage/chroot_local-tasklists.${_PASS} + Create_stagefile .stage/chroot_task-lists.${_PASS} fi |