build/install/apt-ftparchive-release.conf | 2 +-
build/install/apt-ftparchive-udeb.conf | 7 ++++++-
build/install/install.sh | 22 ++++++++++++++++++----
- build/install/uninstall.sh | 20 +++++++++++---------
- 6 files changed, 44 insertions(+), 16 deletions(-)
+ build/install/uninstall.sh | 18 ++++++++++--------
+ 6 files changed, 43 insertions(+), 15 deletions(-)
-diff --git a/build/f_isoroot/f_kscfg/ks.cfg b/build/f_isoroot/f_kscfg/ks.cfg
-index c93babe..30bad1d 100644
---- a/build/f_isoroot/f_kscfg/ks.cfg
-+++ b/build/f_isoroot/f_kscfg/ks.cfg
-@@ -448,6 +448,7 @@ cp -r ${SOURCE}/extra-repos ${repodir}/
- cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64
-
- # Copying Ubuntu files
-+# FIXME: This is missleading as dist/pool may contain multiple arch!
- mkdir -p ${repodir}/ubuntu/x86_64/images
- cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64
- cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64
+diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch
+index a6840e4..e1ae8fc 100644
+--- a/build/f_isoroot/f_kscfg/ks.cfg.patch
++++ b/build/f_isoroot/f_kscfg/ks.cfg.patch
+@@ -1,6 +1,16 @@
+ *** /dev/null 2016-04-26 10:10:11.481587709 +0200
+ --- ks.cfg 2016-04-26 10:10:11.481587709 +0200
+ ***************
++*** 448,453 ****
++--- 448,454 ----
++ cp ${SOURCE}/.treeinfo ${repodir}/centos/x86_64
++
++ # Copying Ubuntu files
+++ # FIXME: This is missleading as dist/pool may contain multiple arch!
++ mkdir -p ${repodir}/ubuntu/x86_64/images
++ cp -r ${SOURCE}/ubuntu/dists ${repodir}/ubuntu/x86_64
++ cp -r ${SOURCE}/ubuntu/pool ${repodir}/ubuntu/x86_64
++***************
+ *** 579,584 ****
+ --- 579,592 ----
+
diff --git a/build/install/apt-ftparchive-deb.conf b/build/install/apt-ftparchive-deb.conf
index 0d15aec..e6392f8 100644
--- a/build/install/apt-ftparchive-deb.conf
cp -Rvp $DEST/etc/puppet $DEST/etc/puppet.backup
}
diff --git a/build/install/uninstall.sh b/build/install/uninstall.sh
-index a9e74bc..0266e17 100755
+index a9e74bc..e90c632 100755
--- a/build/install/uninstall.sh
+++ b/build/install/uninstall.sh
@@ -31,15 +31,17 @@ DEST=$MOUNT
- echo "Error - didn't find backup file for Packages!"
- exit 1
-fi
--
--if [ ! -f $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
-- echo "Error - didn't find backup file for Packages.gz!"
-- exit 1
--fi
+for arch in arm64 amd64; do
+ if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.backup ]; then
+ echo "Error - didn't find backup file for Packages for ${arch}!"
+ exit 1
+ fi
-+
+
+-if [ ! -f $REPO/dists/trusty/main/binary-amd64/Packages.gz.backup ]; then
+- echo "Error - didn't find backup file for Packages.gz!"
+- exit 1
+-fi
+ if [ ! -f $REPO/dists/trusty/main/binary-${arch}/Packages.gz.backup ]; then
+ echo "Error - didn't find backup file for Packages.gz for ${arch}!"
+ exit 1