Drop Grml_Networking (WIP)

[live-boot-grml.git] / components / 9990-overlay.sh

diff --git a/components/9990-overlay.sh b/components/9990-overlay.sh
index 77000d1..d1b9cef 100755 (executable)
--- a/components/9990-overlay.sh
+++ b/components/9990-overlay.sh
@@ -190,7 +190,7 @@ setup_unionfs ()
 
                if is_in_comma_sep_list overlay ${PERSISTENCE_METHOD}
                then
-                       overlays="${old_root_overlay_label} ${old_home_overlay_label} ${custom_overlay_label} ${old_custom_overlay_label}"
+                       overlays="${custom_overlay_label}"
                fi
 
                local overlay_devices
@@ -202,27 +202,10 @@ setup_unionfs ()
                                media="$(echo ${media} | tr ":" " ")"
 
                                case ${media} in
-                                       ${old_root_overlay_label}=*)
-                                               device="${media#*=}"
-                                               fix_backwards_compatibility ${device} / union
-                                               overlay_devices="${overlay_devices} ${device}"
-                                               ;;
-
-                                       ${old_home_overlay_label}=*)
-                                               device="${media#*=}"
-                                               fix_backwards_compatibility ${device} /home bind
-                                               overlay_devices="${overlay_devices} ${device}"
-                                               ;;
-
                                        ${custom_overlay_label}=*)
                                                device="${media#*=}"
                                                overlay_devices="${overlay_devices} ${device}"
                                                ;;
-
-                                       ${old_custom_overlay_label}=*)
-                                               device="${media#*=}"
-                                               overlay_devices="${overlay_devices} ${device}"
-                                               ;;
                                 esac
                        done
                fi
@@ -291,7 +274,7 @@ setup_unionfs ()
                        panic "only one RO file system supported with exposedroot: ${rootfslist}"
                fi
 
-               mount --bind ${rootfs} ${rootmnt} || \
+               mount -o bind ${rootfs} ${rootmnt} || \
                        panic "bind mount of ${rootfs} failed"
 
                if [ -z "${SKIP_UNION_MOUNTS}" ]
@@ -374,8 +357,8 @@ setup_unionfs ()
                done
        fi
 
-        # ensure that a potentially stray tmpfs gets removed
-        # otherways, initramfs-tools is unable to remove /live
-        # and fails to boot
-        umount /live/overlay > /dev/null 2>&1 || true
+       # ensure that a potentially stray tmpfs gets removed
+       # otherways, initramfs-tools is unable to remove /live
+       # and fails to boot
+       umount /live/overlay > /dev/null 2>&1 || true
 }