diff options
4 files changed, 64 insertions, 0 deletions
diff --git a/common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch b/common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch new file mode 100644 index 00000000..f593c2d6 --- /dev/null +++ b/common/recipes-core/initrdscripts/files/0012-init-install.sh-drop-all-automount-rules-whil.patch @@ -0,0 +1,31 @@ +From 88927b3293fe9829cc7a7b00ba1e5524a4337f45 Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Thu, 8 Oct 2015 18:44:27 +0500 +Subject: [PATCH] initramfs-live-install: drop all automount rules while + installing + +Different auto mount rules reside under /etc/udev/rules.d and +can cause trouble while installing on devices like mmc as +these get auto mounted and the installer script fails +to format them. + +Signed-off-by: Awais Belal <awais_belal@mentor.com> +--- + init-install.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/init-install.sh b/init-install.sh +index aa17b5f..c9a3534 100644 +--- init-install.sh ++++ init-install.sh +@@ -111,6 +111,7 @@ device=$TARGET_DEVICE_NAME + # + rm -f /etc/udev/rules.d/automount.rules + rm -f /etc/udev/scripts/mount* ++rm -f /etc/udev/rules.d/*auto-mount.rules + + # + # Unmount anything the automounter had mounted +-- +1.9.1 + diff --git a/common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch b/common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch new file mode 100644 index 00000000..4ce75482 --- /dev/null +++ b/common/recipes-core/initrdscripts/files/0013-init-install-efi.sh-drop-all-automount-rules-whil.patch @@ -0,0 +1,31 @@ +From ce5f89f08c7c929cd6d9e9b6ee065a83294e5388 Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Thu, 8 Oct 2015 18:50:11 +0500 +Subject: [PATCH] initramfs-live-install-efi: drop all automount rules while + installing + +Different auto mount rules reside under /etc/udev/rules.d and +can cause trouble while installing on devices like mmc as +these get auto mounted and the installer script fails +to format them. + +Signed-off-by: Awais Belal <awais_belal@mentor.com> +--- + init-install-efi.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/init-install-efi.sh b/init-install-efi.sh +index 4759786..3597ab1 100644 +--- init-install-efi.sh ++++ init-install-efi.sh +@@ -113,6 +113,7 @@ device=$TARGET_DEVICE_NAME + # + rm -f /etc/udev/rules.d/automount.rules + rm -f /etc/udev/scripts/mount* ++rm -f /etc/udev/rules.d/*auto-mount.rules + + # + # Unmount anything the automounter had mounted +-- +1.9.1 + diff --git a/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend b/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend index 604b73bf..afa20d41 100644 --- a/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend +++ b/common/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bbappend @@ -5,4 +5,5 @@ SRC_URI_append_amd = " \ file://0006-init-install-efi.sh-Switch-to-using-static-device-pa.patch;striplevel=0;patchdir=${WORKDIR} \ file://0009-init-install-efi.sh-uniquely-identify-boot-device.patch;striplevel=0;patchdir=${WORKDIR} \ file://0010-init-install-efi.sh-handle-mmc-device-as-installation-media.patch;striplevel=0;patchdir=${WORKDIR} \ + file://0013-init-install-efi.sh-drop-all-automount-rules-whil.patch;striplevel=0;patchdir=${WORKDIR} \ " diff --git a/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend b/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend index 76701abe..65aa87b3 100644 --- a/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend +++ b/common/recipes-core/initrdscripts/initramfs-live-install_1.0.bbappend @@ -6,4 +6,5 @@ SRC_URI_append_amd = " \ file://0007-init-install.sh-Add-extra-sync-time.patch;striplevel=0;patchdir=${WORKDIR} \ file://0008-init-install.sh-uniquely-identify-boot-device.patch;striplevel=0;patchdir=${WORKDIR} \ file://0011-init-install.sh-handle-mmc-device-as-installation-media.patch;striplevel=0;patchdir=${WORKDIR} \ + file://0012-init-install.sh-drop-all-automount-rules-whil.patch;striplevel=0;patchdir=${WORKDIR} \ " |