summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-02-24 21:27:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 23:25:53 +0000
commite894f0e71cbea6f1ca4216f692df2833708080b3 (patch)
treed8b76ba10282944fbbaebef5334e4c8688b57cc7
parentee86f899e131469a220eb4ad2239f796f82cee5c (diff)
downloadpoky-e894f0e71cbea6f1ca4216f692df2833708080b3.tar.gz
initscripts: mount and unmount cifs network filesystems
* Added cifs to mountnfs.sh and umountnfs.sh. (From OE-Core rev: c44e51f281101c8933679f679e3d4a75a41bedf7) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh8
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh2
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
3 files changed, 9 insertions, 3 deletions
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
index 859fc9eb21..82ec7f66eb 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/mountnfs.sh
@@ -23,6 +23,7 @@ portmap=no
23mount_nfs=no 23mount_nfs=no
24mount_smb=no 24mount_smb=no
25mount_ncp=no 25mount_ncp=no
26mount_cifs=no
26while read device mountpt fstype options 27while read device mountpt fstype options
27do 28do
28 case "$device" in 29 case "$device" in
@@ -56,6 +57,10 @@ do
56 then 57 then
57 mount_ncp=yes 58 mount_ncp=yes
58 fi 59 fi
60 if test "$fstype" = cifs
61 then
62 mount_cifs=yes
63 fi
59done 64done
60 65
61exec 0>&1 66exec 0>&1
@@ -70,12 +75,13 @@ then
70 fi 75 fi
71fi 76fi
72 77
73if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes 78if test "$mount_nfs" = yes || test "$mount_smb" = yes || test "$mount_ncp" = yes || test "$mount_cifs" = yes
74then 79then
75 echo "Mounting remote filesystems..." 80 echo "Mounting remote filesystems..."
76 test "$mount_nfs" = yes && mount -a -t nfs 81 test "$mount_nfs" = yes && mount -a -t nfs
77 test "$mount_smb" = yes && mount -a -t smbfs 82 test "$mount_smb" = yes && mount -a -t smbfs
78 test "$mount_ncp" = yes && mount -a -t ncpfs 83 test "$mount_ncp" = yes && mount -a -t ncpfs
84 test "$mount_cifs" = yes && mount -a -t cifs
79fi 85fi
80 86
81) < /etc/fstab 87) < /etc/fstab
diff --git a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
index 15d1f73131..af075407fd 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/umountnfs.sh
@@ -23,7 +23,7 @@ test -f /etc/fstab && (
23# 23#
24while read device mountpt fstype options 24while read device mountpt fstype options
25do 25do
26 if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs 26 if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs || test "$fstype" = cifs
27 then 27 then
28 umount -f $mountpt 28 umount -f $mountpt
29 fi 29 fi
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index b56c55c8a5..e16f19f1ad 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
3SECTION = "base" 3SECTION = "base"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6PR = "r130" 6PR = "r131"
7 7
8INHIBIT_DEFAULT_DEPS = "1" 8INHIBIT_DEFAULT_DEPS = "1"
9 9