From 4e47dac7f9f4f9f8a1ef9495fb0a2b863fd76a98 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Tue, 22 Dec 2020 21:39:25 +0000
Subject: Mount /{proc,sys,dev} earlier

This fixes many errors in scriptlets while installing basesystem
(for example due to missing /dev/null).
---
 platforms/rpi1/specialFunctions.sh    | 4 ++--
 platforms/rpi2/specialFunctions.sh    | 4 ++--
 platforms/rpi3+/specialFunctions.sh   | 4 ++--
 platforms/rpi3+64/specialFunctions.sh | 4 ++--
 platforms/rpi3/specialFunctions.sh    | 4 ++--
 platforms/rpi4/specialFunctions.sh    | 4 ++--
 platforms/xu4/specialFunctions.sh     | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'platforms')

diff --git a/platforms/rpi1/specialFunctions.sh b/platforms/rpi1/specialFunctions.sh
index 3d09d3f..40e7124 100755
--- a/platforms/rpi1/specialFunctions.sh
+++ b/platforms/rpi1/specialFunctions.sh
@@ -141,7 +141,7 @@ function copyingCustomSystem()
     fi
 
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ARM_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ARM_BOOT}/" "${BOOT}/"
     return 0
 }
diff --git a/platforms/rpi2/specialFunctions.sh b/platforms/rpi2/specialFunctions.sh
index b63fa2a..472a06f 100755
--- a/platforms/rpi2/specialFunctions.sh
+++ b/platforms/rpi2/specialFunctions.sh
@@ -140,7 +140,7 @@ function copyingCustomSystem()
     fi
 
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ARM_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ARM_BOOT}/" "${BOOT}/"
     return 0
 }
diff --git a/platforms/rpi3+/specialFunctions.sh b/platforms/rpi3+/specialFunctions.sh
index 2dc08f5..83c62ee 100755
--- a/platforms/rpi3+/specialFunctions.sh
+++ b/platforms/rpi3+/specialFunctions.sh
@@ -141,7 +141,7 @@ function copyingCustomSystem()
     fi
 
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ARM_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ARM_BOOT}/" "${BOOT}/"
     return 0
 }
diff --git a/platforms/rpi3+64/specialFunctions.sh b/platforms/rpi3+64/specialFunctions.sh
index a62c794..ba54564 100755
--- a/platforms/rpi3+64/specialFunctions.sh
+++ b/platforms/rpi3+64/specialFunctions.sh
@@ -149,7 +149,7 @@ function copyingCustomSystem()
     fi
 
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ARM_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ARM_BOOT}/" "${BOOT}/"
     return 0
 }
diff --git a/platforms/rpi3/specialFunctions.sh b/platforms/rpi3/specialFunctions.sh
index b63fa2a..472a06f 100755
--- a/platforms/rpi3/specialFunctions.sh
+++ b/platforms/rpi3/specialFunctions.sh
@@ -140,7 +140,7 @@ function copyingCustomSystem()
     fi
 
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ARM_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ARM_BOOT}/" "${BOOT}/"
     return 0
 }
diff --git a/platforms/rpi4/specialFunctions.sh b/platforms/rpi4/specialFunctions.sh
index a5d6101..581baa5 100755
--- a/platforms/rpi4/specialFunctions.sh
+++ b/platforms/rpi4/specialFunctions.sh
@@ -153,7 +153,7 @@ function copyingCustomSystem()
     fi
 
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ARM_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ARM_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ARM_BOOT}/" "${BOOT}/"
     return 0
 }
diff --git a/platforms/xu4/specialFunctions.sh b/platforms/xu4/specialFunctions.sh
index 9860735..f0e8bbb 100755
--- a/platforms/xu4/specialFunctions.sh
+++ b/platforms/xu4/specialFunctions.sh
@@ -96,8 +96,8 @@ function copyingCustomSystem()
     info "Copying extlinux.conf on ${ODROID_BOOT}"
     cp --preserve=mode -R "${BUILD_PATH}/boot/extlinux" "${ODROID_BOOT}/"
     info "copying Mageia image to root partition"
-    /bin/rsync -rlptogDH --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
-    /bin/rsync -rlptogDH "${ODROID_BOOT}/" "${BOOT}/"
+    /bin/rsync -rlptogDHx --exclude "${ODROID_BOOT}/" --exclude "qemu-arm-static*" "${BUILD_PATH}/" "${ROOT}/"
+    /bin/rsync -rlptogDHx "${ODROID_BOOT}/" "${BOOT}/"
     return 0
 }
 
-- 
cgit v1.2.1