Rebase debian/patches/06_support_fromiso_isofrom.dpatch
authorMichael Prokop <mika@grml.org>
Fri, 4 Sep 2009 22:36:01 +0000 (00:36 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 4 Sep 2009 22:36:01 +0000 (00:36 +0200)
debian/patches/06_support_fromiso_isofrom.dpatch

index 1710a3a..ee8bad9 100755 (executable)
@@ -20,7 +20,7 @@
                        username=*)
                                USERNAME="${ARGUMENT#username=}"
                                LIVECONF="changed"
                        username=*)
                                USERNAME="${ARGUMENT#username=}"
                                LIVECONF="changed"
-@@ -1339,6 +1344,17 @@ check_dev ()
+@@ -1361,6 +1366,17 @@ check_dev ()
        devname="${2}"
        skip_uuid_check="${3}"
  
        devname="${2}"
        skip_uuid_check="${3}"
  
@@ -38,7 +38,7 @@
        if [ -z "${devname}" ]
        then
                devname=$(sys2dev "${sysdev}")
        if [ -z "${devname}" ]
        then
                devname=$(sys2dev "${sysdev}")
-@@ -1609,6 +1625,15 @@ mountroot ()
+@@ -1632,6 +1648,15 @@ mountroot ()
                log_end_msg
        fi
  
                log_end_msg
        fi
  
@@ -51,6 +51,6 @@
 +        grep -q /isofrom /proc/mounts && umount /isofrom
 +      fi
 +
 +        grep -q /isofrom /proc/mounts && umount /isofrom
 +      fi
 +
-       if [ -n "${MODULETORAMFILE}" ]
+       if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
        then
                setup_unionfs "${livefs_root}" "${rootmnt}"
        then
                setup_unionfs "${livefs_root}" "${rootmnt}"