diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-11-23 10:36:48 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:36 +0100 |
| commit | 813f5227ab37641926ef1669ad185376abc904de (patch) | |
| tree | 9d9718c7f3a43061cc8f1e1b1073baf13eab0a50 /scripts | |
| parent | b5c39f47ce2afe334fc7e787b651e66670d3d2ea (diff) | |
| download | vyos-live-build-813f5227ab37641926ef1669ad185376abc904de.tar.gz vyos-live-build-813f5227ab37641926ef1669ad185376abc904de.zip | |
Replacing last occurences of lh with lb.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_chroot_apt | 8 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build/lb_chroot_apt b/scripts/build/lb_chroot_apt index 3a2152594..da3b03663 100755 --- a/scripts/build/lb_chroot_apt +++ b/scripts/build/lb_chroot_apt @@ -122,7 +122,7 @@ case "${1}" in if Find_files config/chroot_local-packages/*.deb then echo >> chroot/etc/apt/preferences - echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences + echo "# Added by lb_chroot_apt ${@}" >> chroot/etc/apt/preferences echo "Package: *" >> chroot/etc/apt/preferences echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences @@ -133,7 +133,7 @@ case "${1}" in ;; install-binary) - # Ensure local packages are not re-installed during lh_binary + # Ensure local packages are not re-installed during lb_binary echo "Pin-Priority: 99" >> chroot/etc/apt/preferences echo >> chroot/etc/apt/preferences @@ -220,8 +220,8 @@ case "${1}" in then if [ -f chroot/etc/apt/preferences ] then - # delete additions from lh_chroot_apt install|install-binary to preferences - sed -i '/# Added by lh_chroot_apt/,$d' chroot/etc/apt/preferences + # delete additions from lb_chroot_apt install|install-binary to preferences + sed -i '/# Added by lb_chroot_apt/,$d' chroot/etc/apt/preferences # delete the last empty line sed -i '${/^[[:blank:]]*$/d;}' chroot/etc/apt/preferences # if the resulting preferences file is empty there was no user additions, remove it diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 257a7b6fc..6772519a7 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -946,7 +946,7 @@ GZIP_OPTIONS="${GZIP_OPTIONS}" ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}" EOF -# Creating lh_bootstrap_* configuration +# Creating lb_bootstrap_* configuration cat > config/bootstrap << EOF # config/bootstrap - options for live-build(7), bootstrap stage @@ -1023,7 +1023,7 @@ LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" EOF -# Creating lh_chroot_* configuration +# Creating lb_chroot_* configuration mkdir -p config/chroot_apt mkdir -p config/chroot_local-hooks mkdir -p config/chroot_local-includes @@ -1109,7 +1109,7 @@ LB_BACKPORTS="${LB_BACKPORTS}" LB_SYSVINIT="${LB_SYSVINIT}" EOF -# Creating lh_binary_* configuration +# Creating lb_binary_* configuration mkdir -p config/binary_debian-installer mkdir -p config/binary_debian-installer-includes mkdir -p config/binary_grub @@ -1258,7 +1258,7 @@ LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME}" LB_USERNAME="${LB_USERNAME}" EOF -# Creating lh_source_* configuration +# Creating lb_source_* configuration cat > config/source << EOF # config/source - options for live-build(7), source stage |