diff options
| author | Colin Watson <cjwatson@canonical.com> | 2011-06-08 11:30:29 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-13 20:08:34 +0200 |
| commit | abcc4ca9bfc0ca22ce0294616088256062a971fe (patch) | |
| tree | 6853d3604638162e2cbaa03ebd6b788a28c1178e /scripts | |
| parent | f342cd85b8bd0ea30544c429752e0e5b1b09ef7a (diff) | |
| download | vyos-live-build-abcc4ca9bfc0ca22ce0294616088256062a971fe.tar.gz vyos-live-build-abcc4ca9bfc0ca22ce0294616088256062a971fe.zip | |
Add --swap-file-path and --swap-file-size options (Closes: #629637).
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_chroot_hacks | 5 | ||||
| -rwxr-xr-x | scripts/build/lb_config | 22 |
2 files changed, 26 insertions, 1 deletions
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks index ab5e3ab04..33c24d679 100755 --- a/scripts/build/lb_chroot_hacks +++ b/scripts/build/lb_chroot_hacks @@ -273,6 +273,11 @@ then ln -s /proc/mounts chroot/etc/mtab fi +if [ "${LB_SWAP_FILE_PATH}" ]; then + dd if=/dev/zero of="chroot/${LB_SWAP_FILE_PATH}" bs=1024k count="${LB_SWAP_FILE_SIZE}" + mkswap "chroot/${LB_SWAP_FILE_PATH}" +fi + # Show popular warnings if [ -e chroot/etc/init.d/resolvconf ] then diff --git a/scripts/build/lb_config b/scripts/build/lb_config index 1ca34f876..c9c60bebd 100755 --- a/scripts/build/lb_config +++ b/scripts/build/lb_config @@ -131,6 +131,8 @@ 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 [--swap-file-path PATH]\n\ +\t [--swap-file-size MB]\n\ \t [--syslinux-theme THEME_SUFFIX]\n\ \t [--tasksel apt|aptitude|tasksel]\n\ \t [--tasks TASK|\"TASKS\"]\n\ @@ -162,7 +164,7 @@ Local_arguments () grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:, iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:, net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:, - net-cow-server:,net-tarball:,syslinux-theme:, + net-cow-server:,net-tarball:,swap-file-path:,swap-file-size:,syslinux-theme:, username:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force, help,ignore-system-defaults,quiet,usage,verbose,version" # Remove spaces added by indentation @@ -730,6 +732,16 @@ Local_arguments () shift 2 ;; + --swap-file-path) + LB_SWAP_FILE_PATH="${2}" + shift 2 + ;; + + --swap-file-size) + LB_SWAP_FILE_SIZE="${2}" + shift 2 + ;; + --syslinux-theme) LB_SYSLINUX_THEME="${2}" shift 2 @@ -1336,6 +1348,14 @@ LB_NET_COW_SERVER="${LB_NET_COW_SERVER}" # (Default: ${LB_NET_TARBALL}) LB_NET_TARBALL="${LB_NET_TARBALL}" +# \$LB_SWAP_FILE_PATH: set swap file path +# (Default: ${LB_SWAP_FILE_PATH}) +LB_SWAP_FILE_PATH="${LB_SWAP_FILE_PATH}" + +# \$LB_SWAP_FILE_SIZE: set swap file size +# (Default: ${LB_SWAP_FILE_SIZE}) +LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE}" + # \$LB_SYSLINUX_THEME: set syslinux theme package # (Default: ${LB_SYSLINUX_THEME}) LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME}" |