[OE-core] [PATCH] Copy hidden files too
Lorenz Kofler
lorenz at sigma-star.at
Thu Sep 19 09:49:54 UTC 2019
From: Lorenz <lorenz at sigma-star.at>
The install scripts did not copy hidden files to the
new rootfs. Changed the cp command that it copies
them too.
Signed-off-by: Lorenz <lorenz at sigma-star.at>
---
.../recipes-core/initrdscripts/files/init-install-efi-testfs.sh | 2 +-
meta/recipes-core/initrdscripts/files/init-install-efi.sh | 2 +-
meta/recipes-core/initrdscripts/files/init-install-testfs.sh | 2 +-
meta/recipes-core/initrdscripts/files/init-install.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
index b351985a61..e28785df1d 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
@@ -131,7 +131,7 @@ mount $rootfs /ssd
mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /rootmnt
echo "Copying rootfs files..."
-cp -a /rootmnt/* /ssd
+cp -a /rootmnt/. /ssd/
touch /ssd/etc/masterimage
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index b6855b5aac..c2ceb6d7cf 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -221,7 +221,7 @@ mkdir -p /boot
mount $rootfs /tgt_root
mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
+cp -a /src_root/. /tgt_root/
if [ -d /tgt_root/etc/ ] ; then
boot_uuid=$(blkid -o value -s UUID ${bootfs})
swap_part_uuid=$(blkid -o value -s PARTUUID ${swap})
diff --git a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
index ac62160528..ed746925c1 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-testfs.sh
@@ -156,7 +156,7 @@ mount $rootfs /tgt_root
mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
+cp -a /src_root/. /tgt_root/
touch /tgt_root/etc/masterimage
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index e71579631b..4b7c3726d8 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -246,7 +246,7 @@ mkdir -p /boot
mount $rootfs /tgt_root
mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root
echo "Copying rootfs files..."
-cp -a /src_root/* /tgt_root
+cp -a /src_root/. /tgt_root/
if [ -d /tgt_root/etc/ ] ; then
if [ $grub_version -ne 0 ] ; then
boot_uuid=$(blkid -o value -s UUID ${bootfs})
--
2.23.0
More information about the Openembedded-core
mailing list