diff options
| author | Dmitry Bogatov <KAction@debian.org> | 2019-01-03 10:48:38 +0000 |
|---|---|---|
| committer | Dmitry Bogatov <KAction@debian.org> | 2019-01-05 10:50:00 +0000 |
| commit | 6adacd8cbe0e603d81e4f14bb54c461b3a8b6b4a (patch) | |
| tree | f607f37c46c28a4602c43f15284142517719541c | |
| parent | 0766e7195229ee5563bc4ff3b6bf0a4b350c780d (diff) | |
Do not mount gfs, ocfs2 and gfs2 in mountall.sh script (Closes: #504748)
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rwxr-xr-x | debian/src/initscripts/etc/init.d/mountnfs.sh | 2 | ||||
| -rwxr-xr-x | debian/src/initscripts/etc/init.d/umountnfs.sh | 10 | ||||
| -rw-r--r-- | debian/src/initscripts/etc/network/if-up.d/mountnfs | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 72a029cb..08adb325 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ sysvinit (2.93-3) UNRELEASED; urgency=medium + Thanks: Frans Spiesschaert <Frans.Spiesschaert@yucom.be> * Move /etc/init.d/{rc,rcS} scripts out of /etc, retaining symbolic link for compatibility (Closes: #132542) + * Do not mount gfs, ocfs2 and gfs2 in mountall.sh script (Closes: #504748) -- Dmitry Bogatov <KAction@debian.org> Thu, 27 Dec 2018 10:06:16 +0000 diff --git a/debian/src/initscripts/etc/init.d/mountnfs.sh b/debian/src/initscripts/etc/init.d/mountnfs.sh index 6b1b09cc..00ac7572 100755 --- a/debian/src/initscripts/etc/init.d/mountnfs.sh +++ b/debian/src/initscripts/etc/init.d/mountnfs.sh @@ -37,7 +37,7 @@ do_wait_async_mount() { ;; esac case "$FSTYPE" in - nfs|nfs4|smbfs|cifs|coda|ncp|ncpfs|ocfs2|gfs|ceph) + nfs|nfs4|smbfs|cifs|coda|ncp|ncpfs|ceph) ;; *) continue diff --git a/debian/src/initscripts/etc/init.d/umountnfs.sh b/debian/src/initscripts/etc/init.d/umountnfs.sh index d33a3d5c..f761b8db 100755 --- a/debian/src/initscripts/etc/init.d/umountnfs.sh +++ b/debian/src/initscripts/etc/init.d/umountnfs.sh @@ -51,7 +51,7 @@ do_stop () { ;; esac case "$FSTYPE" in - nfs|nfs4|smbfs|ncp|ncpfs|cifs|coda|ocfs2|gfs|ceph) + nfs|nfs4|smbfs|ncp|ncpfs|cifs|coda|ceph) DIRS="$MTPT $DIRS" ;; proc|procfs|linprocfs|devpts|usbfs|usbdevfs|sysfs) @@ -60,7 +60,13 @@ do_stop () { esac case "$OPTS" in _netdev|*,_netdev|_netdev,*|*,_netdev,*) - DIRS="$MTPT $DIRS" + case "$FSTYPE" in + ocfs2|gfs) + ;; + *) + DIRS="$MTPT $DIRS" + ;; + esac ;; esac done < /etc/mtab diff --git a/debian/src/initscripts/etc/network/if-up.d/mountnfs b/debian/src/initscripts/etc/network/if-up.d/mountnfs index 78474a64..267c32f0 100644 --- a/debian/src/initscripts/etc/network/if-up.d/mountnfs +++ b/debian/src/initscripts/etc/network/if-up.d/mountnfs @@ -84,7 +84,7 @@ set_env() { # what the options are. start_nfs=yes ;; - smbfs|cifs|coda|ncp|ncpfs|ocfs2|gfs|ceph) + smbfs|cifs|coda|ncp|ncpfs|ceph) ;; *) FSTYPE= |