修改向get-udeb传递apt选项的方式

debian/changelog

@@ -1,3 +1,10 @@
+live-build (3.0~a57-1ubuntu38k59) focal; urgency=medium
+
+  [ 谢炜 ]
+  * 修改向get-udeb传递apt选项的方式
+
+ -- Xie Wei <xiewei@kylinos.cn>  Wed, 02 Sep 2020 11:18:52 +0800
+
 live-build (3.0~a57-1ubuntu38k58) focal; urgency=medium
 
   [ 谢炜 ]

debian/patches/0089-use-APT_OPTIONS-in-get-udeb.patch

@@ -4,11 +4,11 @@ Subject: use APT_OPTIONS in get-udeb
 
 ---
  scripts/build/lb_binary_debian-installer | 2 +-
- share/bin/get-udeb                       | 2 +-
+ share/bin/get-udeb                       | 3 ++-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
-index 78b313a..89bfe2c 100755
+index 78b313a..79e9822 100755
 --- a/scripts/build/lb_binary_debian-installer
 +++ b/scripts/build/lb_binary_debian-installer
 @@ -647,7 +647,7 @@ EOF
@@ -16,15 +16,23 @@ index 78b313a..89bfe2c 100755
  		cp /usr/share/live/build/bin/get-udeb chroot/bin
  		cp config/package-lists/*.list.udeb chroot/root/
 -		Chroot chroot "/bin/get-udeb"
-+		Chroot chroot "APT_OPTIONS='${APT_OPTIONS}' /bin/get-udeb"
++		Chroot chroot "/bin/get-udeb ${APT_OPTIONS}"
  		rm -f chroot/bin/get-udeb
  		rm -f chroot/root/*.list.udeb
  		mv chroot/root/binary.udeb ./
 diff --git a/share/bin/get-udeb b/share/bin/get-udeb
-index b65bfef..79a80c9 100755
+index b65bfef..87a0ef6 100755
 --- a/share/bin/get-udeb
 +++ b/share/bin/get-udeb
-@@ -17,7 +17,7 @@ APT_GET="apt-get --assume-yes \
+@@ -2,6 +2,7 @@
+ 
+ cd /root
+ APTDIR="`pwd`/udeb_tmp"
++APT_OPTIONS=$*
+ 
+ rm -rf ${APTDIR}
+ 
+@@ -17,7 +18,7 @@ APT_GET="apt-get --assume-yes \
          -o Dir::Cache=$APTDIR/cache \
          -o Acquire::Retries=3 \
          -o Dir::State::Status=$APTDIR/state/status \