diff --git a/debian/changelog b/debian/changelog index ccd6ad4..5bc1c74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ubuntu-dev-tools (0.156) unstable; urgency=medium [ Luke Faraone ] * mk-sbuild: Pass in arguments via --debootstrap-opts (LP: #1366723) + * mk-sbuild: Add --skip-security, like --skip-updates (LP: #1366721) -- Adam Conrad Sun, 08 May 2016 23:06:34 -0600 diff --git a/mk-sbuild b/mk-sbuild index b957862..80f11ee 100755 --- a/mk-sbuild +++ b/mk-sbuild @@ -51,6 +51,7 @@ function usage() echo " --vg=VG use LVM snapshots, with group VG" echo " --debug Turn on script debugging" echo " --skip-updates Do not include -updates pocket in sources.list" + echo " --skip-security Do not include -security pocket in sources.list" echo " --skip-proposed Do not include -proposed pocket in sources.list" echo " --source-template=FILE Use FILE as the sources.list template" echo " --debootstrap-mirror=URL Use URL as the debootstrap source" @@ -80,6 +81,7 @@ function usage() echo " SCHROOT_PROFILE Profile to use with schroot (default ${SCHROOT_PROFILE})" echo " SKIP_UPDATES Enable --skip-updates" echo " SKIP_PROPOSED Enable --skip-proposed" + echo " SKIP_SECURITY Enable --skip-security" echo " DEBOOTSTRAP_MIRROR Mirror location (same as --debootstrap-mirror)" echo " DEBOOTSTRAP_INCLUDE Included packages (same as --debootstrap-include)" echo " DEBOOTSTRAP_EXCLUDE Excluded packages (same as --debootstrap-exclude)" @@ -100,7 +102,7 @@ function usage() if [ -z "$1" ]; then usage fi -OPTS=`getopt -o 'h' --long "help,debug,skip-updates,skip-proposed,eatmydata,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,debootstrap-opts:,debootstrap-proxy:,debootstrap-no-check-gpg,debootstrap-keyring:,personality:,distro:,vg:,type:,target:" -- "$@"` +OPTS=`getopt -o 'h' --long "help,debug,skip-updates,skip-security,skip-proposed,eatmydata,arch:,name:,source-template:,debootstrap-mirror:,debootstrap-include:,debootstrap-exclude:,debootstrap-opts:,debootstrap-proxy:,debootstrap-no-check-gpg,debootstrap-keyring:,personality:,distro:,vg:,type:,target:" -- "$@"` eval set -- "$OPTS" VG="" @@ -136,6 +138,10 @@ while :; do SKIP_PROPOSED="1" shift ;; + --skip-security) + SKIP_SECURITY="1" + shift + ;; --name) name="$2" shift 2