Resync with Debian's 1.139.1-1 version
[live-initramfs-grml.git] / debian / patches / 03_fix_cow_tmpfs_mount.dpatch
1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 03_fix_cow_tmpfs_mount.dpatch by  <mika@grml.org>
3 ##
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Fix cow tmpfs mount option handling
6
7 @DPATCH@
8
9 From afccb65c91dcf8a04f2c8a4969d3e7799087bfc6 Mon Sep 17 00:00:00 2001
10 From: Michael Prokop <mika@grml.org>
11 Date: Thu, 17 Jul 2008 11:28:30 +0200
12 Subject: [PATCH 1/1] Make sure mounting /cow-tmpfs provides mount options
13
14
15 Signed-off-by: Michael Prokop <mika@grml.org>
16
17 diff --git a/scripts/live b/scripts/live
18 index 15710c2..22d2210 100755
19 --- a/scripts/live
20 +++ b/scripts/live
21 @@ -1118,6 +1118,8 @@ setup_unionfs ()
22                 nfsmount ${nfs_cow_opts} ${cowdevice} /cow || \
23                         panic "Can not mount ${cowdevice} (n: ${cow_fstype}) on /cow"
24         else
25 +               # make sure cow_mountopt is set:
26 +               [ -n "$cow_mountopt" ] || cow_mountopt="rw,noatime,mode=755"
27                 mount -t ${cow_fstype} -o ${cow_mountopt} ${cowdevice} /cow || \
28                         panic "Can not mount ${cowdevice} (o: ${cow_fstype}) on /cow"
29         fi
30 -- 
31 1.5.5.4
32