From 94c5d1ca56fe3ccf39f41cd48ad2167675b8de1b Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Wed, 12 Oct 2016 12:46:20 +0200
Subject: [PATCH] initcpio: rm overlayfs code from aufs; confused files

---
 initcpio/hooks/.miso.kate-swp | Bin 0 -> 104 bytes
 initcpio/hooks/miso           |  63 ++++++++++++++++++----------------
 initcpio/hooks/miso_overlayfs |   5 ---
 initcpio/install/miso         |   4 +--
 4 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 initcpio/hooks/.miso.kate-swp

diff --git a/initcpio/hooks/.miso.kate-swp b/initcpio/hooks/.miso.kate-swp
new file mode 100644
index 0000000000000000000000000000000000000000..4210a068301c5dce46b1f40c543b672a717e3662
GIT binary patch
literal 104
zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn@qMW_&o)m+Ews1g&-sbDj`?qP+Xe>#
jWk9kZAP3^;gP9Br@*s{Ll%o|2WEg-5eb-<RrRNF&6Sfow

literal 0
HcmV?d00001

diff --git a/initcpio/hooks/miso b/initcpio/hooks/miso
index 8380a6c..9fa3a1f 100644
--- a/initcpio/hooks/miso
+++ b/initcpio/hooks/miso
@@ -42,10 +42,10 @@ _mnt_overlayfs() {
     local src="${1}"
     local newroot="${2}"
     local mnt="${3}"
-    local work_dir=/run/miso/cowspace/${cow_directory}/aufs
-    mkdir -p ${work_dir}
+#     msg "::: Adding new aufs branch: ${src} to ${newroot}${mnt}"
+#     mount -t aufs aufs -o remount,append:"${src}"=ro "${newroot}${mnt}"
 
-    mount -t aufs -o br=${work_dir}=rw:"${src}"=ro none "${newroot}${mnt}"
+    mount -t aufs aufs -o remount,append:"${src}"=ro "${newroot}${mnt}"
 }
 
 # args: /path/to/image_file, mountpoint
@@ -154,34 +154,38 @@ miso_mount_handler() {
     fi
 
     if [[ "${checksum}" == "y" ]]; then
-        if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/airootfs.md5" ]]; then
-            msg -n ":: Self-test requested, please wait..."
-            if _verify_checksum; then
-                msg "done. Checksum is OK, continue booting."
+        for fs in rootfs desktopfs mhwdfs livefs;do
+            if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.md5" ]]; then
+                msg -n ":: Self-test requested, please wait..."
+                if _verify_checksum "${fs}"; then
+                    msg "done. Checksum is OK, continue booting."
+                else
+                    echo "ERROR: one or more files are corrupted"
+                    echo "see /tmp/checksum.log for details"
+                    launch_interactive_shell
+                fi
             else
-                echo "ERROR: one or more files are corrupted"
-                echo "see /tmp/checksum.log for details"
+                echo "ERROR: checksum=y option specified but ${misobasedir}/${arch}/${fs}.md5 not found"
                 launch_interactive_shell
             fi
-        else
-            echo "ERROR: checksum=y option specified but ${misobasedir}/${arch}/airootfs.md5 not found"
-            launch_interactive_shell
-        fi
+        done
     fi
 
     if [[ "${verify}" == "y" ]]; then
-        if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/airootfs.sfs.sig" ]]; then
-            msg -n ":: Signature verification requested, please wait..."
-            if _verify_signature; then
-                msg "done. Signature is OK, continue booting."
+        for fs in rootfs desktopfs mhwdfs livefs;do
+            if [[ -f "/run/miso/bootmnt/${misobasedir}/${arch}/${fs}.sfs.sig" ]]; then
+                msg -n ":: Signature verification requested, please wait..."
+                if _verify_signature; then
+                    msg "done. Signature is OK, continue booting."
+                else
+                    echo "ERROR: one or more files are corrupted"
+                    launch_interactive_shell
+                fi
             else
-                echo "ERROR: one or more files are corrupted"
+                echo "ERROR: verify=y option specified but ${misobasedir}/${arch}/${fs}.sfs.sig not found"
                 launch_interactive_shell
             fi
-        else
-            echo "ERROR: verify=y option specified but ${misobasedir}/${arch}/airootfs.sfs.sig not found"
-            launch_interactive_shell
-        fi
+        done
     fi
 
     if [[ "${copytoram}" == "y" ]]; then
@@ -201,15 +205,16 @@ miso_mount_handler() {
     fi
     mkdir -p -m 0700 "/run/miso/cowspace/${cow_directory}"
 
-    local _src=/run/miso/bootmnt/${misobasedir}/${arch}
+    local _src="/run/miso/bootmnt/${misobasedir}/${arch}"
+    local _dest="/run/miso/sfs"
 
-    for fs in livefs mhwdfs desktopfs rootfs;do
-        if [[ -f "${_src}/${fs}.sfs" ]]; then
-            _mnt_sfs "${_src}/${fs}.sfs" "/run/miso/sfs/${fs}"
-            if [[ -f "/run/miso/sfs/${fs}/${fs}.img" ]]; then
-                _mnt_dmsnapshot "/run/miso/sfs/${fs}/${fs}.img" "${newroot}" "/"
+    for sfs in livefs mhwdfs desktopfs rootfs;do
+        if [[ -f "${_src}/${sfs}.sfs" ]]; then
+            _mnt_sfs "${_src}/${sfs}.sfs" "${_dest}/${sfs}"
+            if [[ -f "${_dest}/${sfs}/${sfs}.img" ]]; then
+                _mnt_dmsnapshot "${_dest}/${sfs}/${sfs}.img" "${newroot}" "/"
             else
-                _mnt_overlayfs "/run/miso/sfs/${fs}" "${newroot}" "/"
+                _mnt_overlayfs "${_dest}/${sfs}" "${newroot}" "/"
             fi
         fi
     done
diff --git a/initcpio/hooks/miso_overlayfs b/initcpio/hooks/miso_overlayfs
index 5c83c39..4172e6e 100644
--- a/initcpio/hooks/miso_overlayfs
+++ b/initcpio/hooks/miso_overlayfs
@@ -44,11 +44,6 @@ _mnt_overlayfs() {
     local mnt="${3}"
     local work_dir="/run/miso/cowspace/${cow_directory}/workdir"
     local upper_dir="/run/miso/cowspace/${cow_directory}/upperdir"
-    local tmp_mnt="/ro_branch/${img_name}"
-    mkdir -p "/rw_branch/upper"
-    mkdir -p "/rw_branch/work"
-
-mount -t overlay overlay -olowerdir="/ro_branch/${img_name}",upperdir="/rw_branch/upper",workdir="/rw_branch/work" "${newroot}/"
 
     mkdir -p "${upper_dir}" "${work_dir}"
     mount -t overlay overlay -o lowerdir="${lower_dir}",upperdir="${upper_dir}",workdir="${work_dir}" "${newroot}${mnt}"
diff --git a/initcpio/install/miso b/initcpio/install/miso
index 8647aee..a64f080 100644
--- a/initcpio/install/miso
+++ b/initcpio/install/miso
@@ -21,9 +21,9 @@ build() {
     add_file /usr/lib/udev/rules.d/10-dm.rules
     add_file /usr/lib/udev/rules.d/95-dm-notify.rules
     add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
-    if [[ $miso_GNUPG_FD ]]; then
+    if [[ $MISO_GNUPG_FD ]]; then
         mkdir -p "$BUILDROOT$dest"/gpg
-        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$miso_GNUPG_FD
+        gpg --homedir "$BUILDROOT$dest"/gpg --import <&$MISO_GNUPG_FD
     fi
 }